X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=configure.ac;h=92560e00ec50b7fa7ae4fcfd7d8966bdca2c63bf;hb=2934ee80367ee9d50b99ed8d7f672d1a397b4ce0;hp=b817979f39ec79c141cd67eaaef6f49f559b5d21;hpb=2bad70d84e763b4d866d7b97dbc1cdc8e030bd45;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index b817979f..92560e00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,9 +102,14 @@ if test $HAVE_OPENSSL = yes; then
 	if test "$ac_cv_have_decl_RSA_set0_key" != "$ac_cv_lib_crypto_RSA_set0_key"; then
 		AC_MSG_ERROR([openssl header/library mismatch])
 	fi
-	test "$ac_cv_have_decl_RSA_set0_key" = yes &&
+	if test "$ac_cv_have_decl_RSA_set0_key" = yes; then
 		AC_DEFINE([HAVE_RSA_SET0_KEY], [1], [openssl >= 1.1])
-
+	else
+		AC_MSG_WARN([
+	Old openssl library detected. Support for openssl-1.0 and earlier
+	will be removed in the next major paraslash release. Please upgrade
+	your openssl installation.])
+	fi
 	HAVE_CRYPTO_CLEANUP_ALL_EX_DATA=yes
 	AC_CHECK_DECL([CRYPTO_cleanup_all_ex_data], [],
 		[HAVE_CRYPTO_CLEANUP_ALL_EX_DATA=no],
@@ -291,12 +296,10 @@ AC_DEFUN([NEED_FLAC_OBJECTS], [{
 }])
 ########################################################################### faad
 STASH_FLAGS
-LIB_ARG_WITH([faad], [-lfaad -lmp4ff])
+LIB_ARG_WITH([faad], [-lfaad])
 HAVE_FAAD=yes
 AC_CHECK_HEADER(neaacdec.h, [], HAVE_FAAD=no)
-AC_CHECK_HEADER(mp4ff.h, [], HAVE_FAAD=no)
 AC_CHECK_LIB([faad], [NeAACDecOpen], [], HAVE_FAAD=no)
-AC_CHECK_LIB([mp4ff], [mp4ff_meta_get_artist], [], HAVE_FAAD=no)
 LIB_SUBST_FLAGS(faad)
 UNSTASH_FLAGS
 ########################################################################### mad
@@ -434,7 +437,7 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes && test -n "$BISON" && \
 	NEED_OPUS_OBJECTS() && server_errlist_objs="$server_errlist_objs opus_afh opus_common"
 	NEED_FLAC_OBJECTS && server_errlist_objs="$server_errlist_objs flac_afh"
 	if test $HAVE_FAAD = yes; then
-		server_errlist_objs="$server_errlist_objs aac_afh"
+		server_errlist_objs="$server_errlist_objs aac_afh mp4"
 	fi
 	server_objs="$server_errlist_objs"
 	AC_SUBST(server_objs, add_dot_o($server_objs))
@@ -586,7 +589,7 @@ fi
 if test $HAVE_OSS = yes -o $HAVE_ALSA = yes; then
 	build_mixer="yes"
 	executables="$executables mixer"
-	mixer_errlist_objs="mixer exec string fd lsu version"
+	mixer_errlist_objs="mixer exec string fd time lsu version"
 	if test $HAVE_OSS = yes; then
 		mixer_errlist_objs="$mixer_errlist_objs oss_mix"
 	fi
@@ -693,7 +696,7 @@ NEED_OPUS_OBJECTS && recv_errlist_objs="$recv_errlist_objs opus_afh opus_common"
 NEED_FLAC_OBJECTS && recv_errlist_objs="$recv_errlist_objs flac_afh"
 
 if test $HAVE_FAAD = yes; then
-	recv_errlist_objs="$recv_errlist_objs aac_afh"
+	recv_errlist_objs="$recv_errlist_objs aac_afh mp4"
 fi
 recv_objs="$recv_errlist_objs"
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
@@ -728,7 +731,7 @@ NEED_FLAC_OBJECTS && {
 	audio_format_handlers="$audio_format_handlers flac"
 }
 if test $HAVE_FAAD = yes; then
-	afh_errlist_objs="$afh_errlist_objs aac_afh"
+	afh_errlist_objs="$afh_errlist_objs aac_afh mp4"
 	audio_format_handlers="$audio_format_handlers aac"
 fi
 
@@ -786,7 +789,7 @@ NEED_FLAC_OBJECTS && {
 	play_errlist_objs="$play_errlist_objs flacdec_filter flac_afh"
 }
 if test $HAVE_FAAD = yes; then
-	play_errlist_objs="$play_errlist_objs aac_afh aacdec_filter"
+	play_errlist_objs="$play_errlist_objs aac_afh aacdec_filter mp4"
 fi
 if test $HAVE_MAD = yes; then
 	play_errlist_objs="$play_errlist_objs mp3dec_filter"
@@ -842,6 +845,7 @@ audioc_errlist_objs="
 	lsu
 	net
 	fd
+	time
 	version
 "
 if test $HAVE_READLINE = yes; then
@@ -849,7 +853,6 @@ if test $HAVE_READLINE = yes; then
 		buffer_tree
 		interactive
 		sched
-		time
 	"
 fi
 audioc_objs="$audioc_errlist_objs"