X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=configure.ac;h=3489670cbce6c562956aef8855f577df54d0d4d9;hb=929a67dd8f243686fb5928d175b00937446ffda5;hp=ffb06934439b807d7e8a49551e65c73e313d23ed;hpb=a775408e5d2e3b21dff741b89ff5330b397b5138;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index ffb06934..3489670c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,6 +99,10 @@ LIB_ARG_WITH([openssl], [-lssl -lcrypto])
 AC_CHECK_HEADER(openssl/ssl.h, [], [HAVE_OPENSSL=no])
 AC_CHECK_LIB([crypto], [RAND_bytes], [], [HAVE_OPENSSL=no])
 LIB_SUBST_FLAGS(openssl)
+if test $HAVE_OPENSSL = yes; then
+	AC_CHECK_LIB([crypto], [RSA_set0_key],
+		AC_DEFINE([HAVE_RSA_SET0_KEY], [1], [openssl-1.1]))
+fi
 UNSTASH_FLAGS
 ######################################################################### gcrypt
 STASH_FLAGS
@@ -293,10 +297,12 @@ AC_DEFUN([NEED_FLAC_OBJECTS], [{
 }])
 ########################################################################### faad
 STASH_FLAGS
-LIB_ARG_WITH([faad], [-lfaad])
+LIB_ARG_WITH([faad], [-lfaad -lmp4ff])
 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
@@ -373,14 +379,6 @@ AC_CHECK_HEADER(samplerate.h, [], HAVE_SAMPLERATE=no)
 AC_CHECK_LIB([samplerate], [src_process], [], HAVE_SAMPLERATE=no)
 LIB_SUBST_FLAGS(samplerate)
 UNSTASH_FLAGS
-########################################################################## mp4v2
-STASH_FLAGS
-LIB_ARG_WITH([mp4v2], [-lmp4v2])
-HAVE_MP4V2=yes
-AC_CHECK_HEADER([mp4v2/mp4v2.h], [], [HAVE_MP4V2=no])
-AC_CHECK_LIB([mp4v2], [MP4Read], [], [HAVE_MP4V2=no])
-LIB_SUBST_FLAGS(mp4v2)
-UNSTASH_FLAGS
 ######################################################################### server
 if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
 	build_server="yes"
@@ -436,8 +434,8 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
 	NEED_SPEEX_OBJECTS() && server_errlist_objs="$server_errlist_objs spx_afh spx_common"
 	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 && test $HAVE_MP4V2 = yes; then
-		server_errlist_objs="$server_errlist_objs aac_afh aac_common"
+	if test $HAVE_FAAD = yes; then
+		server_errlist_objs="$server_errlist_objs aac_afh"
 	fi
 	server_objs="add_cmdline($server_cmdline_objs) $server_errlist_objs"
 	AC_SUBST(server_objs, add_dot_o($server_objs))
@@ -561,7 +559,7 @@ if test -n "$CRYPTOLIB"; then
 		audiod_audio_formats="$audiod_audio_formats flac"
 	}
 	if test $HAVE_FAAD = yes; then
-		audiod_errlist_objs="$audiod_errlist_objs aacdec_filter aac_common"
+		audiod_errlist_objs="$audiod_errlist_objs aacdec_filter"
 		audiod_audio_formats="$audiod_audio_formats aac"
 	fi
 	if test $HAVE_MAD = yes; then
@@ -722,7 +720,7 @@ NEED_FLAC_OBJECTS && {
 	filters="$filters flacdec"
 }
 if test $HAVE_FAAD = yes; then
-	filter_errlist_objs="$filter_errlist_objs aacdec_filter aac_common"
+	filter_errlist_objs="$filter_errlist_objs aacdec_filter"
 	filters="$filters aacdec"
 fi
 if test $HAVE_MAD = yes; then
@@ -784,8 +782,8 @@ NEED_SPEEX_OBJECTS && recv_errlist_objs="$recv_errlist_objs spx_afh spx_common"
 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 -a $HAVE_MP4V2 = yes; then
-	recv_errlist_objs="$recv_errlist_objs aac_afh aac_common"
+if test $HAVE_FAAD = yes; then
+	recv_errlist_objs="$recv_errlist_objs aac_afh"
 fi
 recv_objs="add_cmdline($recv_cmdline_objs) $recv_errlist_objs"
 AC_SUBST(receivers, "http dccp udp afh")
@@ -822,8 +820,8 @@ NEED_FLAC_OBJECTS && {
 	afh_errlist_objs="$afh_errlist_objs flac_afh"
 	audio_format_handlers="$audio_format_handlers flac"
 }
-if test $HAVE_FAAD = yes -a $HAVE_MP4V2 = yes; then
-	afh_errlist_objs="$afh_errlist_objs aac_afh aac_common"
+if test $HAVE_FAAD = yes; then
+	afh_errlist_objs="$afh_errlist_objs aac_afh"
 	audio_format_handlers="$audio_format_handlers aac"
 fi
 
@@ -897,13 +895,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 aacdec_filter"
-fi
-if test $HAVE_MP4V2 = yes; then
-	play_errlist_objs="$play_errlist_objs aac_afh"
-fi
-if test $HAVE_MP4V2 = yes || test $HAVE_FAAD = yes; then
-	play_errlist_objs="$play_errlist_objs aac_common"
+	play_errlist_objs="$play_errlist_objs aac_afh aacdec_filter"
 fi
 if test $HAVE_MAD = yes; then
 	play_cmdline_objs="$play_cmdline_objs mp3dec_filter"
@@ -1018,7 +1010,7 @@ attributes_txt decoder_flags audiod_status play_time attributes_bitmap
 offset seconds_total stream_start current_time audiod_uptime image_id
 lyrics_id duration directory lyrics_name image_name path hash channels
 last_played num_chunks chunk_time amplification artist title year album
-comment"
+comment max_chunk_size"
 
 result=
 for i in $status_items; do
@@ -1048,7 +1040,6 @@ unix socket credentials: $have_ucred
 readline (interactive CLIs): $HAVE_READLINE
 id3 version 2 support: $HAVE_ID3TAG
 faad: $HAVE_FAAD
-mp4v2: $HAVE_MP4V2
 
 audio format handlers: $audio_format_handlers
 filters: $(echo $filters)