X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=a290c22be2c85a54d577aa73f22a8b8bd4f81d81;hb=15d4c69ddcf88dd9046ed8d2847a428145a32045;hp=6087bac4334f3e1950e880adbca594993da77214;hpb=4d5282b4e53213c89359e4c60568c37119ab34fb;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index 6087bac4..a290c22b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -472,7 +472,6 @@ fi
 if test -n "$CRYPTOLIB"; then
 	build_client="yes"
 	executables="$executables client"
-	client_cmdline_objs="client"
 	client_errlist_objs="
 		client
 		net
@@ -488,7 +487,6 @@ if test -n "$CRYPTOLIB"; then
 		crypt_common
 		base64
 		version
-		ggo
 	"
 	if test "$CRYPTOLIB" = openssl; then
 		client_errlist_objs="$client_errlist_objs crypt"
@@ -498,8 +496,8 @@ if test -n "$CRYPTOLIB"; then
 	if test $HAVE_READLINE = yes; then
 		client_errlist_objs="$client_errlist_objs interactive"
 	fi
-	client_objs="add_cmdline($client_cmdline_objs) $client_errlist_objs"
-	AC_SUBST(client_objs, add_dot_o($client_objs))
+	client_objs="$client_errlist_objs"
+	AC_SUBST(client_objs, add_dot_o($client_errlist_objs))
 else
 	build_client="no"
 fi
@@ -508,18 +506,6 @@ if test -n "$CRYPTOLIB"; then
 	build_audiod="yes"
 	executables="$executables audiod"
 	audiod_audio_formats="wma"
-	audiod_cmdline_objs="$audiod_cmdline_objs
-		audiod
-		compress_filter
-		http_recv
-		dccp_recv
-		file_write
-		client
-		amp_filter
-		udp_recv
-		prebuffer_filter
-		sync_filter
-	"
 	audiod_errlist_objs="$audiod_errlist_objs
 		audiod
 		signal
@@ -546,7 +532,6 @@ if test -n "$CRYPTOLIB"; then
 		audiod_command
 		fecdec_filter
 		client_common
-		ggo
 		udp_recv
 		color
 		fec
@@ -566,7 +551,6 @@ if test -n "$CRYPTOLIB"; then
 	fi
 	if test "$have_core_audio" = "yes"; then
 		audiod_errlist_objs="$audiod_errlist_objs osx_write ipc"
-		audiod_cmdline_objs="$audiod_cmdline_objs osx_write"
 	fi
 	NEED_VORBIS_OBJECTS && {
 		audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
@@ -590,26 +574,21 @@ if test -n "$CRYPTOLIB"; then
 	fi
 	if test $HAVE_MAD = yes; then
 		audiod_audio_formats="$audiod_audio_formats mp3"
-		audiod_cmdline_objs="$audiod_cmdline_objs mp3dec_filter"
 		audiod_errlist_objs="$audiod_errlist_objs mp3dec_filter"
 	fi
 	if test $HAVE_OSS = yes; then
 		audiod_errlist_objs="$audiod_errlist_objs oss_write"
-		audiod_cmdline_objs="$audiod_cmdline_objs oss_write"
 	fi
 	if test $HAVE_ALSA = yes; then
 		audiod_errlist_objs="$audiod_errlist_objs alsa_write"
-		audiod_cmdline_objs="$audiod_cmdline_objs alsa_write"
 	fi
 	NEED_AO_OBJECTS && {
 		audiod_errlist_objs="$audiod_errlist_objs ao_write"
-		audiod_cmdline_objs="$audiod_cmdline_objs ao_write"
 	}
 	if test $HAVE_SAMPLERATE = yes; then
 		audiod_errlist_objs="$audiod_errlist_objs resample_filter check_wav"
-		audiod_cmdline_objs="$audiod_cmdline_objs resample_filter"
 	fi
-	audiod_objs="add_cmdline($audiod_cmdline_objs) $audiod_errlist_objs"
+	audiod_objs="$audiod_errlist_objs"
 	AC_SUBST(audiod_objs, add_dot_o($audiod_objs))
 
 	enum="$(for i in $audiod_audio_formats; do printf "AUDIO_FORMAT_${i}, " | tr '[a-z]' '[A-Z]'; done)"
@@ -624,8 +603,7 @@ fi
 if test $HAVE_OSS = yes -o $HAVE_ALSA = yes; then
 	build_fade="yes"
 	executables="$executables fade"
-	fade_cmdline_objs="fade"
-	fade_errlist_objs="fade exec string fd version ggo"
+	fade_errlist_objs="fade exec string fd version"
 	if test $HAVE_OSS = yes; then
 		fade_errlist_objs="$fade_errlist_objs oss_mix"
 		mixers="${mixers}oss "
@@ -636,7 +614,7 @@ if test $HAVE_OSS = yes -o $HAVE_ALSA = yes; then
 		mixers="${mixers}alsa "
 		default_mixer="ALSA_MIX"
 	fi
-	fade_objs="add_cmdline($fade_cmdline_objs) $fade_errlist_objs"
+	fade_objs="$fade_errlist_objs"
 	AC_SUBST(fade_objs, add_dot_o($fade_objs))
 	enum="$(
 		for i in $mixers; do
@@ -666,7 +644,6 @@ fi
 if test $HAVE_CURSES = yes; then
 	build_gui="yes"
 	executables="$executables gui"
-	gui_cmdline_objs="gui"
 	gui_errlist_objs="
 		exec
 		signal
@@ -679,24 +656,14 @@ if test $HAVE_CURSES = yes; then
 		time
 		sched
 		version
-		ggo
 	"
-	gui_objs="add_cmdline($gui_cmdline_objs) $gui_errlist_objs"
+	gui_objs="$gui_errlist_objs"
 	AC_SUBST(gui_objs, add_dot_o($gui_objs))
 else
 	build_gui="no"
 	AC_MSG_WARN([no curses lib, cannot build para_gui])
 fi
 ######################################################################## filter
-filters="
-	compress
-	wav
-	amp
-	fecdec
-	wmadec
-	prebuffer
-	sync
-"
 filter_errlist_objs="
 	filter_common
 	wav_filter
@@ -708,7 +675,6 @@ filter_errlist_objs="
 	sched
 	fd
 	amp_filter
-	ggo
 	fecdec_filter
 	fec
 	version
@@ -722,65 +688,23 @@ filter_errlist_objs="
 	net
 	sync_filter
 "
-filter_cmdline_objs="
-	filter
-	compress_filter
-	amp_filter
-	prebuffer_filter
-	sync_filter
-"
-NEED_VORBIS_OBJECTS && {
-	filters="$filters oggdec"
-	filter_errlist_objs="$filter_errlist_objs oggdec_filter"
-}
-NEED_SPEEX_OBJECTS && {
-	filters="$filters spxdec"
-	filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common"
-}
-NEED_OPUS_OBJECTS && {
-	filters="$filters opusdec"
-	filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common"
-}
-NEED_FLAC_OBJECTS && {
-	filter_errlist_objs="$filter_errlist_objs flacdec_filter"
-	filters="$filters flacdec"
-}
+NEED_VORBIS_OBJECTS && filter_errlist_objs="$filter_errlist_objs oggdec_filter"
+NEED_SPEEX_OBJECTS && filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common"
+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"
-	filters="$filters aacdec"
 fi
 if test $HAVE_MAD = yes; then
-	filter_cmdline_objs="$filter_cmdline_objs mp3dec_filter"
 	filter_errlist_objs="$filter_errlist_objs mp3dec_filter"
-	filters="$filters mp3dec"
 fi
 if test $HAVE_SAMPLERATE = yes; then
 	filter_errlist_objs="$filter_errlist_objs resample_filter check_wav"
-	filter_cmdline_objs="$filter_cmdline_objs resample_filter"
-	filters="$filters resample"
 fi
-filters="$(echo $filters)"
-AC_SUBST(filters)
-filter_objs="add_cmdline($filter_cmdline_objs) $filter_errlist_objs"
+filter_objs="$filter_errlist_objs"
 
 AC_SUBST(filter_objs, add_dot_o($filter_objs))
-
-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)
-inits="$(for i in $filters; do printf 'extern void '$i'_filter_init(struct filter *f); '; done)"
-AC_DEFINE_UNQUOTED(DECLARE_FILTER_INITS, $inits, init functions of the supported filters)
-array="$(for i in $filters; do printf '{.name = "'$i'", .init = '$i'_filter_init},'; done)"
-AC_DEFINE_UNQUOTED(FILTER_ARRAY, $array, array of supported filters)
 ########################################################################## recv
-recv_cmdline_objs="
-	recv
-	http_recv
-	dccp_recv
-	udp_recv
-	afh_recv
-"
-
 recv_errlist_objs="
 	http_recv
 	recv_common
@@ -792,7 +716,6 @@ recv_errlist_objs="
 	fd
 	sched
 	stdout
-	ggo
 	udp_recv
 	buffer_tree
 	afh_recv
@@ -811,12 +734,10 @@ 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"
 fi
-recv_objs="add_cmdline($recv_cmdline_objs) $recv_errlist_objs"
-AC_SUBST(receivers, "http dccp udp afh")
+recv_objs="$recv_errlist_objs"
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
 ########################################################################### afh
 audio_format_handlers="mp3 wma"
-afh_cmdline_objs="afh"
 afh_errlist_objs="
 	afh
 	string
@@ -827,7 +748,6 @@ afh_errlist_objs="
 	wma_afh
 	wma_common
 	version
-	ggo
 "
 NEED_OGG_OBJECTS && afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
 NEED_VORBIS_OBJECTS && {
@@ -851,7 +771,7 @@ if test $HAVE_FAAD = yes -a $HAVE_MP4V2 = yes; then
 	audio_format_handlers="$audio_format_handlers aac"
 fi
 
-afh_objs="add_cmdline($afh_cmdline_objs) $afh_errlist_objs"
+afh_objs="$afh_errlist_objs"
 
 AC_SUBST(afh_objs, add_dot_o($afh_objs))
 ########################################################################## play
@@ -859,7 +779,6 @@ play_errlist_objs="
 	play
 	fd
 	sched
-	ggo
 	buffer_tree
 	time
 	string
@@ -888,21 +807,8 @@ play_errlist_objs="
 	version
 	sync_filter
 "
-play_cmdline_objs="
-	http_recv
-	dccp_recv
-	udp_recv
-	afh_recv
-	compress_filter
-	amp_filter
-	prebuffer_filter
-	file_write
-	play
-	sync_filter
-"
 if test "$have_core_audio" = "yes"; then
 	play_errlist_objs="$play_errlist_objs osx_write ipc"
-	play_cmdline_objs="$play_cmdline_objs osx_write"
 fi
 NEED_OGG_OBJECTS && play_errlist_objs="$play_errlist_objs ogg_afh_common"
 NEED_VORBIS_OBJECTS && {
@@ -930,36 +836,27 @@ if test $HAVE_MP4V2 = yes || test $HAVE_FAAD = yes; then
 	play_errlist_objs="$play_errlist_objs 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_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
 NEED_AO_OBJECTS && {
 	play_errlist_objs="$play_errlist_objs ao_write"
-	play_cmdline_objs="$play_cmdline_objs ao_write"
 }
 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"
+play_objs="$play_errlist_objs"
 AC_SUBST(play_objs, add_dot_o($play_objs))
 ######################################################################### write
-write_cmdline_objs="
-	write
-	file_write
-"
 write_errlist_objs="
 	write
 	write_common
@@ -970,50 +867,24 @@ write_errlist_objs="
 	sched
 	stdin
 	buffer_tree
-	ggo
 	check_wav
 	version
 "
-writers="file"
-default_writer="FILE_WRITE"
 
 if test "$have_core_audio" = "yes"; then
 	write_errlist_objs="$write_errlist_objs osx_write ipc"
-	write_cmdline_objs="$write_cmdline_objs osx_write"
-	writers="$writers osx"
-	default_writer="OSX_WRITE"
 fi
 NEED_AO_OBJECTS && {
 	write_errlist_objs="$write_errlist_objs ao_write"
-	write_cmdline_objs="$write_cmdline_objs ao_write"
-	writers="$writers ao"
-	default_writer="AO_WRITE"
 }
 if test $HAVE_OSS = yes; then
 	write_errlist_objs="$write_errlist_objs oss_write"
-	write_cmdline_objs="$write_cmdline_objs oss_write"
-	writers="$writers oss"
-	default_writer="OSS_WRITE"
 fi
 if test $HAVE_ALSA = yes; then
 	write_errlist_objs="$write_errlist_objs alsa_write"
-	write_cmdline_objs="$write_cmdline_objs alsa_write"
-	writers="$writers alsa"
-	default_writer="ALSA_WRITE"
 fi
-AC_SUBST(writers)
-write_objs="add_cmdline($write_cmdline_objs) $write_errlist_objs"
+write_objs="$write_errlist_objs"
 AC_SUBST(write_objs, add_dot_o($write_objs))
-enum="$(for i in $writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"
-AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
-	enum of supported writers)
-AC_DEFINE_UNQUOTED(DEFAULT_WRITER, $default_writer, use this writer if none was specified)
-names="$(for i in $writers; do printf \"$i\",' ' ; done)"
-AC_DEFINE_UNQUOTED(WRITER_NAMES, $names, supported writer names)
-inits="$(for i in $writers; do printf 'extern void '$i'_write_init(struct writer *); '; done)"
-AC_DEFINE_UNQUOTED(DECLARE_WRITER_INITS, $inits, init functions of the supported writers)
-array="$(for i in $writers; do printf '{.init = '$i'_write_init},'; done)"
-AC_DEFINE_UNQUOTED(WRITER_ARRAY, $array, array of supported writers)
 ######################################################################## audioc
 audioc_errlist_objs="
 	audioc
@@ -1071,10 +942,7 @@ 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)
-writers: $writers
 
 para_server: $build_server
 para_gui: $build_gui