X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=configure.ac;h=3d85f30c49dc906327c6a9362c5e6d15f238c067;hb=9734df36c2e18e0906a30ed621daf46351670013;hp=9f63bc1043c66e2b1046d2c606bf95736f475e51;hpb=bfd5b598e02e63d5c6e316525fe6d435eadeb42e;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index 9f63bc10..3d85f30c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,38 +92,6 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
 executables="recv filter audioc write afh play"
 audio_format_handlers="mp3 wma"
 
-recv_cmdline_objs="
-	recv
-	http_recv
-	dccp_recv
-	udp_recv
-	afh_recv
-"
-
-recv_errlist_objs="
-	http_recv
-	recv_common
-	recv
-	time
-	string
-	net
-	dccp_recv
-	fd
-	sched
-	stdout
-	ggo
-	udp_recv
-	buffer_tree
-	afh_recv
-	afh_common
-	wma_afh
-	wma_common
-	mp3_afh
-	version
-"
-
-recv_ldflags=""
-
 audioc_cmdline_objs="audioc"
 audioc_errlist_objs="
 	audioc
@@ -135,21 +103,6 @@ audioc_errlist_objs="
 "
 audioc_ldflags=""
 
-afh_cmdline_objs="afh"
-afh_errlist_objs="
-	afh
-	string
-	fd
-	mp3_afh
-	afh_common
-	time
-	wma_afh
-	wma_common
-	version
-	ggo
-"
-afh_ldflags=""
-
 write_cmdline_objs="
 	write
 	file_write
@@ -172,50 +125,6 @@ write_ldflags=""
 writers="file"
 default_writer="FILE_WRITE"
 
-play_errlist_objs="
-	play
-	fd
-	sched
-	ggo
-	buffer_tree
-	time
-	string
-	net
-	afh_recv
-	afh_common
-	wma_afh
-	wma_common
-	mp3_afh
-	recv_common
-	udp_recv
-	http_recv
-	dccp_recv
-	filter_common
-	fec
-	bitstream
-	imdct
-	wav_filter
-	compress_filter
-	amp_filter
-	prebuffer_filter
-	fecdec_filter
-	wmadec_filter
-	write_common
-	file_write
-	version
-"
-play_cmdline_objs="
-	http_recv
-	dccp_recv
-	udp_recv
-	afh_recv
-	compress_filter
-	amp_filter
-	prebuffer_filter
-	file_write
-	play
-"
-play_ldflags="-lm"
 ################################################################## clock_gettime
 clock_gettime_lib=
 AC_CHECK_LIB([c], [clock_gettime], [clock_gettime_lib=c], [
@@ -470,9 +379,6 @@ if test ${have_core_audio} = yes; then
 	audiod_errlist_objs="$audiod_errlist_objs osx_write ipc"
 	audiod_cmdline_objs="$audiod_cmdline_objs osx_write.cmdline"
 
-	play_errlist_objs="$play_errlist_objs osx_write ipc"
-	play_cmdline_objs="$play_cmdline_objs osx_write.cmdline"
-
 	write_errlist_objs="$write_errlist_objs osx_write ipc"
 	write_cmdline_objs="$write_cmdline_objs osx_write.cmdline"
 	writers="$writers osx"
@@ -568,10 +474,7 @@ if test "$have_vorbis" = "yes" || \
 		ogg_ldflags="-Wl,-bind_at_load $ogg_ldflags"
 	fi
 	AC_SUBST(ogg_ldflags)
-	afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
-	recv_errlist_objs="$recv_errlist_objs ogg_afh_common"
 	server_errlist_objs="$server_errlist_objs ogg_afh_common"
-	play_errlist_objs="$play_errlist_objs ogg_afh_common"
 fi
 if test "$have_vorbis" = "yes"; then
 	AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg/vorbis support)
@@ -580,9 +483,6 @@ if test "$have_vorbis" = "yes"; then
 
 	server_errlist_objs="$server_errlist_objs ogg_afh"
 	audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
-	play_errlist_objs="$play_errlist_objs oggdec_filter ogg_afh"
-	afh_errlist_objs="$afh_errlist_objs ogg_afh"
-	recv_errlist_objs="$recv_errlist_objs ogg_afh"
 
 	audiod_audio_formats="$audiod_audio_formats ogg"
 	audio_format_handlers="$audio_format_handlers ogg"
@@ -596,9 +496,6 @@ if test "$have_speex" = "yes"; then
 
 	server_errlist_objs="$server_errlist_objs spx_afh spx_common"
 	audiod_errlist_objs="$audiod_errlist_objs spxdec_filter spx_common"
-	play_errlist_objs="$play_errlist_objs spxdec_filter spx_afh spx_common"
-	afh_errlist_objs="$afh_errlist_objs spx_afh spx_common"
-	recv_errlist_objs="$recv_errlist_objs spx_afh spx_common"
 
 	audiod_audio_formats="$audiod_audio_formats spx"
 	audio_format_handlers="$audio_format_handlers spx"
@@ -614,9 +511,6 @@ if test "$have_opus" = "yes"; then
 
 	server_errlist_objs="$server_errlist_objs opus_afh opus_common"
 	audiod_errlist_objs="$audiod_errlist_objs opusdec_filter opus_common"
-	afh_errlist_objs="$afh_errlist_objs opus_afh opus_common"
-	play_errlist_objs="$play_errlist_objs opusdec_filter opus_afh opus_common"
-	recv_errlist_objs="$recv_errlist_objs opus_afh opus_common"
 
 	audiod_audio_formats="$audiod_audio_formats opus"
 	audio_format_handlers="$audio_format_handlers opus"
@@ -651,11 +545,8 @@ if test "$have_faad" = "yes"; then
 	faad_ldflags="$faad_libs -lfaad"
 	AC_SUBST(faad_ldflags)
 
-	afh_errlist_objs="$afh_errlist_objs aac_common aac_afh"
 	audiod_errlist_objs="$audiod_errlist_objs aacdec_filter aac_common"
-	play_errlist_objs="$play_errlist_objs aacdec_filter aac_afh aac_common"
 	server_errlist_objs="$server_errlist_objs aac_afh aac_common"
-	recv_errlist_objs="$recv_errlist_objs aac_afh aac_common"
 
 	audiod_audio_formats="$audiod_audio_formats aac"
 	audio_format_handlers="$audio_format_handlers aac"
@@ -693,9 +584,7 @@ if test "$have_mad" = "yes"; then
 	mad_ldflags="$mad_libs -lmad"
 	AC_SUBST(mad_ldflags)
 	audiod_cmdline_objs="$audiod_cmdline_objs mp3dec_filter"
-	play_cmdline_objs="$play_cmdline_objs mp3dec_filter"
 	audiod_errlist_objs="$audiod_errlist_objs mp3dec_filter"
-	play_errlist_objs="$play_errlist_objs mp3dec_filter"
 	audiod_audio_formats="$audiod_audio_formats mp3"
 else
 	AC_MSG_WARN([no mp3dec support in para_audiod/para_filter])
@@ -765,10 +654,7 @@ if test "$have_flac" = "yes"; then
 	AC_SUBST(flac_ldflags)
 
 	audiod_errlist_objs="$audiod_errlist_objs flacdec_filter"
-	play_errlist_objs="$play_errlist_objs flacdec_filter flac_afh"
-	afh_errlist_objs="$afh_errlist_objs flac_afh"
 	server_errlist_objs="$server_errlist_objs flac_afh"
-	recv_errlist_objs="$recv_errlist_objs flac_afh"
 	audio_format_handlers="$audio_format_handlers flac"
 	audiod_audio_formats="$audiod_audio_formats flac"
 else
@@ -787,9 +673,7 @@ msg="=> will not build oss writer"
 
 AC_CHECK_HEADER(sys/soundcard.h, [
 	audiod_errlist_objs="$audiod_errlist_objs oss_write"
-	play_errlist_objs="$play_errlist_objs oss_write"
 	audiod_cmdline_objs="$audiod_cmdline_objs oss_write"
-	play_cmdline_objs="$play_cmdline_objs oss_write"
 
 	write_errlist_objs="$write_errlist_objs oss_write"
 	write_cmdline_objs="$write_cmdline_objs oss_write"
@@ -845,8 +729,6 @@ if test "$have_alsa" = "yes"; then
 	AC_SUBST(alsa_ldflags)
 	audiod_errlist_objs="$audiod_errlist_objs alsa_write"
 	audiod_cmdline_objs="$audiod_cmdline_objs alsa_write"
-	play_errlist_objs="$play_errlist_objs alsa_write"
-	play_cmdline_objs="$play_cmdline_objs alsa_write"
 
 	write_errlist_objs="$write_errlist_objs alsa_write"
 	write_cmdline_objs="$write_cmdline_objs alsa_write"
@@ -912,9 +794,6 @@ if test "$have_ao" = "yes"; then
 	audiod_errlist_objs="$audiod_errlist_objs ao_write"
 	audiod_cmdline_objs="$audiod_cmdline_objs ao_write"
 
-	play_errlist_objs="$play_errlist_objs ao_write"
-	play_cmdline_objs="$play_cmdline_objs ao_write"
-
 	write_errlist_objs="$write_errlist_objs ao_write"
 	write_cmdline_objs="$write_cmdline_objs ao_write"
 	writers="$writers ao"
@@ -983,7 +862,6 @@ if test "$have_readline" = "yes"; then
 	AC_SUBST(readline_ldflags)
 	client_errlist_objs="$client_errlist_objs interactive"
 	audioc_errlist_objs="$audioc_errlist_objs buffer_tree interactive sched time"
-	play_errlist_objs="$play_errlist_objs interactive"
 	AC_DEFINE(HAVE_READLINE, 1, define to 1 to turn on readline support)
 else
 	AC_MSG_WARN([libreadline not found or unusable])
@@ -1020,8 +898,6 @@ if test "$have_samplerate" = "yes"; then
 
 	audiod_errlist_objs="$audiod_errlist_objs resample_filter check_wav"
 	audiod_cmdline_objs="$audiod_cmdline_objs resample_filter"
-	play_errlist_objs="$play_errlist_objs resample_filter check_wav"
-	play_cmdline_objs="$play_cmdline_objs resample_filter"
 else
 	AC_MSG_WARN([no resample support in para_audiod/para_filter])
 fi
@@ -1289,7 +1165,196 @@ if test "$have_samplerate" = "yes"; then
 	filter_cmdline_objs="$filter_cmdline_objs resample_filter"
 	filters="$filters resample"
 fi
+########################################################################## recv
+recv_cmdline_objs="
+	recv
+	http_recv
+	dccp_recv
+	udp_recv
+	afh_recv
+"
+
+recv_errlist_objs="
+	http_recv
+	recv_common
+	recv
+	time
+	string
+	net
+	dccp_recv
+	fd
+	sched
+	stdout
+	ggo
+	udp_recv
+	buffer_tree
+	afh_recv
+	afh_common
+	wma_afh
+	wma_common
+	mp3_afh
+	version
+"
+if test "$have_vorbis" = "yes" || \
+		test "$have_speex" = "yes" || \
+		test "$have_opus" = "yes"; then
+	recv_errlist_objs="$recv_errlist_objs ogg_afh_common"
+fi
+if test "$have_vorbis" = "yes"; then
+	recv_errlist_objs="$recv_errlist_objs ogg_afh"
+fi
+if test "$have_speex" = "yes"; then
+	recv_errlist_objs="$recv_errlist_objs spx_afh spx_common"
+fi
+if test "$have_opus" = "yes"; then
+	recv_errlist_objs="$recv_errlist_objs opus_afh opus_common"
+fi
+if test "$have_faad" = "yes"; then
+	recv_errlist_objs="$recv_errlist_objs aac_afh aac_common"
+fi
+if test "$have_flac" = "yes"; then
+	recv_errlist_objs="$recv_errlist_objs flac_afh"
+fi
+recv_objs="add_cmdline($recv_cmdline_objs) $recv_errlist_objs"
+AC_SUBST(recv_objs, add_dot_o($recv_objs))
+AC_DEFINE_UNQUOTED(INIT_RECV_ERRLISTS, objlist_to_errlist($recv_errlist_objs),
+	errors used by para_recv)
+########################################################################### afh
+afh_cmdline_objs="afh"
+afh_errlist_objs="
+	afh
+	string
+	fd
+	mp3_afh
+	afh_common
+	time
+	wma_afh
+	wma_common
+	version
+	ggo
+"
+if test "$have_vorbis" = "yes" || \
+		test "$have_speex" = "yes" || \
+		test "$have_opus" = "yes"; then
+	afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
+fi
+if test "$have_vorbis" = "yes"; then
+	afh_errlist_objs="$afh_errlist_objs ogg_afh"
+fi
+if test "$have_speex" = "yes"; then
+	afh_errlist_objs="$afh_errlist_objs spx_afh spx_common"
+fi
+if test "$have_opus" = "yes"; then
+	afh_errlist_objs="$afh_errlist_objs opus_afh opus_common"
+fi
+if test "$have_faad" = "yes"; then
+	afh_errlist_objs="$afh_errlist_objs aac_common aac_afh"
+fi
+if test "$have_flac" = "yes"; then
+	afh_errlist_objs="$afh_errlist_objs flac_afh"
+fi
+
+afh_objs="add_cmdline($afh_cmdline_objs) $afh_errlist_objs"
+
+AC_SUBST(afh_objs, add_dot_o($afh_objs))
+AC_DEFINE_UNQUOTED(INIT_AFH_ERRLISTS,
+	objlist_to_errlist($afh_errlist_objs), errors used by para_afh)
+########################################################################## play
+play_errlist_objs="
+	play
+	fd
+	sched
+	ggo
+	buffer_tree
+	time
+	string
+	net
+	afh_recv
+	afh_common
+	wma_afh
+	wma_common
+	mp3_afh
+	recv_common
+	udp_recv
+	http_recv
+	dccp_recv
+	filter_common
+	fec
+	bitstream
+	imdct
+	wav_filter
+	compress_filter
+	amp_filter
+	prebuffer_filter
+	fecdec_filter
+	wmadec_filter
+	write_common
+	file_write
+	version
+"
+play_cmdline_objs="
+	http_recv
+	dccp_recv
+	udp_recv
+	afh_recv
+	compress_filter
+	amp_filter
+	prebuffer_filter
+	file_write
+	play
+"
+if test "$have_core_audio" = "yes"; then
+	play_errlist_objs="$play_errlist_objs osx_write ipc"
+	play_cmdline_objs="$play_cmdline_objs osx_write.cmdline"
+fi
+if test "$have_vorbis" = "yes" || \
+		test "$have_speex" = "yes" || \
+		test "$have_opus" = "yes"; then
+	play_errlist_objs="$play_errlist_objs ogg_afh_common"
+fi
+if test "$have_vorbis" = "yes"; then
+	play_errlist_objs="$play_errlist_objs oggdec_filter ogg_afh"
+fi
+if test "$have_speex" = "yes"; then
+	play_errlist_objs="$play_errlist_objs spxdec_filter spx_afh spx_common"
+fi
+if test "$have_opus" = "yes"; then
+	play_errlist_objs="$play_errlist_objs opusdec_filter opus_afh opus_common"
+fi
+if test "$have_faad" = "yes"; then
+	play_errlist_objs="$play_errlist_objs aacdec_filter aac_afh aac_common"
+fi
+if test "$have_mad" = "yes"; then
+	play_cmdline_objs="$play_cmdline_objs mp3dec_filter"
+	play_errlist_objs="$play_errlist_objs mp3dec_filter"
+fi
+if test "$have_flac" = "yes"; then
+	play_errlist_objs="$play_errlist_objs flacdec_filter flac_afh"
+fi
+if test "$have_oss" = "yes"; then
+	play_errlist_objs="$play_errlist_objs oss_write"
+	play_cmdline_objs="$play_cmdline_objs oss_write"
+fi
+if test "$have_alsa" = "yes"; then
+	play_errlist_objs="$play_errlist_objs alsa_write"
+	play_cmdline_objs="$play_cmdline_objs alsa_write"
+fi
+if test "$have_ao" = "yes"; then
+	play_errlist_objs="$play_errlist_objs ao_write"
+	play_cmdline_objs="$play_cmdline_objs ao_write"
+fi
+if test "$have_readline" = "yes"; then
+	play_errlist_objs="$play_errlist_objs interactive"
+fi
+if test "$have_samplerate" = "yes"; then
+	play_errlist_objs="$play_errlist_objs resample_filter check_wav"
+	play_cmdline_objs="$play_cmdline_objs resample_filter"
+fi
 
+play_objs="add_cmdline($play_cmdline_objs) $play_errlist_objs"
+AC_SUBST(play_objs, add_dot_o($play_objs))
+AC_DEFINE_UNQUOTED(INIT_PLAY_ERRLISTS,
+	objlist_to_errlist($play_errlist_objs), errors used by para_play)
 ############################################################# error2.h
 # these are always built
 all_errlist_objs="
@@ -1364,21 +1429,12 @@ AC_DEFINE_UNQUOTED(AUDIO_FORMAT_HANDLERS, "$audio_format_handlers",
 
 AC_SUBST(executables)
 
-recv_objs="add_cmdline($recv_cmdline_objs) $recv_errlist_objs"
 filter_objs="add_cmdline($filter_cmdline_objs) $filter_errlist_objs"
 audiod_objs="add_cmdline($audiod_cmdline_objs) $audiod_errlist_objs"
 server_objs="add_cmdline($server_cmdline_objs) $server_errlist_objs"
 write_objs="add_cmdline($write_cmdline_objs) $write_errlist_objs"
 client_objs="add_cmdline($client_cmdline_objs) $client_errlist_objs"
 audioc_objs="add_cmdline($audioc_cmdline_objs) $audioc_errlist_objs"
-afh_objs="add_cmdline($afh_cmdline_objs) $afh_errlist_objs"
-play_objs="add_cmdline($play_cmdline_objs) $play_errlist_objs"
-gui_objs="add_cmdline($gui_cmdline_objs) $gui_errlist_objs"
-
-AC_SUBST(recv_objs, add_dot_o($recv_objs))
-AC_SUBST(recv_ldflags, $recv_ldflags)
-AC_DEFINE_UNQUOTED(INIT_RECV_ERRLISTS, objlist_to_errlist($recv_errlist_objs),
-	errors used by para_recv)
 
 AC_SUBST(filter_objs, add_dot_o($filter_objs))
 AC_DEFINE_UNQUOTED(INIT_FILTER_ERRLISTS,
@@ -1394,11 +1450,6 @@ AC_SUBST(server_ldflags, $server_ldflags)
 AC_DEFINE_UNQUOTED(INIT_SERVER_ERRLISTS,
 	objlist_to_errlist($server_errlist_objs), errors used by para_server)
 
-AC_SUBST(afh_objs, add_dot_o($afh_objs))
-AC_SUBST(afh_ldflags, $afh_ldflags)
-AC_DEFINE_UNQUOTED(INIT_AFH_ERRLISTS,
-	objlist_to_errlist($afh_errlist_objs), errors used by para_afh)
-
 AC_SUBST(write_objs, add_dot_o($write_objs))
 AC_SUBST(write_ldflags, $write_ldflags)
 AC_DEFINE_UNQUOTED(INIT_WRITE_ERRLISTS,
@@ -1418,11 +1469,6 @@ AC_SUBST(gui_objs, add_dot_o($gui_objs))
 AC_DEFINE_UNQUOTED(INIT_GUI_ERRLISTS,
 	objlist_to_errlist($gui_errlist_objs), errors used by para_gui)
 
-AC_SUBST(play_objs, add_dot_o($play_objs))
-AC_SUBST(play_ldflags, $play_ldflags)
-AC_DEFINE_UNQUOTED(INIT_PLAY_ERRLISTS,
-	objlist_to_errlist($play_errlist_objs), errors used by para_play)
-
 enum="$(for i in $filters; do printf "${i}_FILTER, " | tr '[a-z]' '[A-Z]'; done)"
 AC_DEFINE_UNQUOTED(FILTER_ENUM, $enum NUM_SUPPORTED_FILTERS,
 	enum of supported filters)