X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=a589613b5ad5f000edb65f77e6f73101f1d34ae2;hp=b2ea0a72b2eda4548189d189c50ed24320002da9;hb=8d106ca317a2c42f35a86ba244f843688f6939e6;hpb=e413873ec15efc84366e747d3c5d48293b959c1f

diff --git a/configure.ac b/configure.ac
index b2ea0a72..a589613b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,10 +55,6 @@ AC_PATH_PROG([M4], [m4])
 test -z "$M4" && AC_MSG_ERROR(
 	[The m4 macro processor is required to build this package])
 
-AC_PATH_PROG([INSTALL], [install])
-test -z "$INSTALL" && AC_MSG_ERROR(
-	[The install program is required to build this package])
-
 AC_PATH_PROG([lopsubgen], [lopsubgen])
 test -z "$lopsubgen" && AC_MSG_ERROR(
 	[lopsubgen is required to build this package])
@@ -67,19 +63,6 @@ AC_PROG_CC
 AC_PROG_CPP
 
 executables="recv filter audioc write afh play"
-################################################################## clock_gettime
-clock_gettime_lib=
-AC_CHECK_LIB([c], [clock_gettime], [clock_gettime_lib=c], [
-	AC_CHECK_LIB([rt], [clock_gettime], [clock_gettime_lib=rt], [], [])
-])
-if test -n "$clock_gettime_lib"; then
-	AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [
-		define to 1 if clock_gettime() is supported])
-fi
-if test "$clock_gettime_lib" = "rt"; then
-	AC_SUBST(clock_gettime_ldflags, -lrt)
-fi
-
 ########################################################################### osl
 STASH_FLAGS
 LIB_ARG_WITH([osl], [-losl])
@@ -216,24 +199,6 @@ AC_MSG_RESULT($have_ip_mreqn)
 if test ${have_ip_mreqn} = yes; then
 	AC_DEFINE(HAVE_IP_MREQN, 1, define to 1 you have struct ip_mreqn)
 fi
-########################################################################### osx
-
-AC_MSG_CHECKING(for CoreAudio (MacOs))
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-	#include <CoreAudio/CoreAudio.h>
-]], [[
-	AudioDeviceID id;
-]])],[have_core_audio=yes],[have_core_audio=no])
-AC_MSG_RESULT($have_core_audio)
-if test ${have_core_audio} = yes; then
-	f1="-framework CoreAudio"
-	f2="-framework AudioToolbox"
-	f3="-framework AudioUnit"
-	f4="-framework CoreServices"
-	core_audio_ldflags="$f1 $f2 $f3 $f4"
-	AC_SUBST(core_audio_ldflags)
-	AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X)
-fi
 ########################################################################### ogg
 STASH_FLAGS
 LIB_ARG_WITH([ogg], [-logg])
@@ -300,10 +265,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
@@ -380,14 +347,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"
@@ -441,8 +400,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="$server_errlist_objs"
 	AC_SUBST(server_objs, add_dot_o($server_objs))
@@ -530,9 +489,6 @@ if test -n "$CRYPTOLIB"; then
 	else
 		audiod_errlist_objs="$audiod_errlist_objs gcrypt"
 	fi
-	if test "$have_core_audio" = "yes"; then
-		audiod_errlist_objs="$audiod_errlist_objs osx_write ipc"
-	fi
 	NEED_VORBIS_OBJECTS && {
 		audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
 		audiod_audio_formats="$audiod_audio_formats ogg"
@@ -550,7 +506,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
@@ -650,7 +606,7 @@ NEED_SPEEX_OBJECTS && filter_errlist_objs="$filter_errlist_objs spxdec_filter sp
 NEED_OPUS_OBJECTS && filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common"
 NEED_FLAC_OBJECTS && filter_errlist_objs="$filter_errlist_objs flacdec_filter"
 if test $HAVE_FAAD = yes; then
-	filter_errlist_objs="$filter_errlist_objs aacdec_filter aac_common"
+	filter_errlist_objs="$filter_errlist_objs aacdec_filter"
 fi
 if test $HAVE_MAD = yes; then
 	filter_errlist_objs="$filter_errlist_objs mp3dec_filter"
@@ -688,8 +644,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="$recv_errlist_objs"
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
@@ -723,8 +679,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
 
@@ -764,9 +720,6 @@ play_errlist_objs="
 	version
 	sync_filter
 "
-if test "$have_core_audio" = "yes"; then
-	play_errlist_objs="$play_errlist_objs osx_write ipc"
-fi
 NEED_OGG_OBJECTS && play_errlist_objs="$play_errlist_objs ogg_afh_common"
 NEED_VORBIS_OBJECTS && {
 	play_errlist_objs="$play_errlist_objs oggdec_filter ogg_afh"
@@ -784,13 +737,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_errlist_objs="$play_errlist_objs mp3dec_filter"
@@ -828,9 +775,6 @@ write_errlist_objs="
 	version
 "
 
-if test "$have_core_audio" = "yes"; then
-	write_errlist_objs="$write_errlist_objs osx_write ipc"
-fi
 NEED_AO_OBJECTS && {
 	write_errlist_objs="$write_errlist_objs ao_write"
 }
@@ -868,7 +812,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
@@ -898,7 +842,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
 
 para_server: $build_server