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

diff --git a/configure.ac b/configure.ac
index 3d85f30c..6fca996e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,41 +90,6 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
 	[AC_MSG_ERROR([function not found, cannot live without it])])
 
 executables="recv filter audioc write afh play"
-audio_format_handlers="mp3 wma"
-
-audioc_cmdline_objs="audioc"
-audioc_errlist_objs="
-	audioc
-	string
-	net
-	fd
-	version
-	ggo
-"
-audioc_ldflags=""
-
-write_cmdline_objs="
-	write
-	file_write
-"
-write_errlist_objs="
-	write
-	write_common
-	file_write
-	time
-	fd
-	string
-	sched
-	stdin
-	buffer_tree
-	ggo
-	check_wav
-	version
-"
-write_ldflags=""
-writers="file"
-default_writer="FILE_WRITE"
-
 ################################################################## clock_gettime
 clock_gettime_lib=
 AC_CHECK_LIB([c], [clock_gettime], [clock_gettime_lib=c], [
@@ -226,10 +191,6 @@ if test "$check_openssl" = "yes"; then
 		openssl_ldflags="$openssl_libs -lssl -lcrypto"
 		AC_SUBST(openssl_ldflags)
 
-		server_errlist_objs="$server_errlist_objs crypt"
-		client_errlist_objs="$client_errlist_objs crypt"
-		audiod_errlist_objs="$audiod_errlist_objs crypt"
-
 		check_gcrypt="no"
 	else
 		AC_MSG_WARN([openssl libraries not found])
@@ -265,10 +226,6 @@ if test "$check_gcrypt" = "yes"; then
 		AC_SUBST(gcrypt_cppflags)
 		gcrypt_ldflags="$gcrypt_libs -lgcrypt"
 		AC_SUBST(gcrypt_ldflags)
-
-		server_errlist_objs="$server_errlist_objs gcrypt"
-		client_errlist_objs="$client_errlist_objs gcrypt"
-		audiod_errlist_objs="$audiod_errlist_objs gcrypt"
 	else
 		AC_MSG_WARN([gcrypt library not found])
 	fi
@@ -375,14 +332,6 @@ if test ${have_core_audio} = yes; then
 	f4="-framework CoreServices"
 	core_audio_ldflags="$f1 $f2 $f3 $f4"
 	AC_SUBST(core_audio_ldflags)
-
-	audiod_errlist_objs="$audiod_errlist_objs osx_write ipc"
-	audiod_cmdline_objs="$audiod_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"
-	default_writer="OSX_WRITE"
 	AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X)
 fi
 ####################################################### ogg/vorbis/speex/opus
@@ -474,31 +423,17 @@ if test "$have_vorbis" = "yes" || \
 		ogg_ldflags="-Wl,-bind_at_load $ogg_ldflags"
 	fi
 	AC_SUBST(ogg_ldflags)
-	server_errlist_objs="$server_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)
 	vorbis_ldflags="$vorbis_libs -lvorbis -lvorbisfile"
 	AC_SUBST(vorbis_ldflags)
-
-	server_errlist_objs="$server_errlist_objs ogg_afh"
-	audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
-
-	audiod_audio_formats="$audiod_audio_formats ogg"
-	audio_format_handlers="$audio_format_handlers ogg"
 fi
 if test "$have_speex" = "yes"; then
 	AC_DEFINE(HAVE_SPEEX, 1, define to 1 to turn on ogg/speex support)
 	AC_SUBST(speex_cppflags)
 	speex_ldflags="$speex_libs -lspeex"
 	AC_SUBST(speex_ldflags)
-
-
-	server_errlist_objs="$server_errlist_objs spx_afh spx_common"
-	audiod_errlist_objs="$audiod_errlist_objs spxdec_filter spx_common"
-
-	audiod_audio_formats="$audiod_audio_formats spx"
-	audio_format_handlers="$audio_format_handlers spx"
 else
 	AC_MSG_WARN([no ogg/speex $msg])
 fi
@@ -507,12 +442,6 @@ if test "$have_opus" = "yes"; then
 	AC_SUBST(opus_cppflags)
 	opus_ldflags="$opus_libs -lopus"
 	AC_SUBST(opus_ldflags)
-
-
-	server_errlist_objs="$server_errlist_objs opus_afh opus_common"
-	audiod_errlist_objs="$audiod_errlist_objs opusdec_filter opus_common"
-
-	audiod_audio_formats="$audiod_audio_formats opus"
 	audio_format_handlers="$audio_format_handlers opus"
 else
 	AC_MSG_WARN([no ogg/opus $msg])
@@ -544,12 +473,6 @@ if test "$have_faad" = "yes"; then
 	AC_SUBST(faad_cppflags)
 	faad_ldflags="$faad_libs -lfaad"
 	AC_SUBST(faad_ldflags)
-
-	audiod_errlist_objs="$audiod_errlist_objs aacdec_filter aac_common"
-	server_errlist_objs="$server_errlist_objs aac_afh aac_common"
-
-	audiod_audio_formats="$audiod_audio_formats aac"
-	audio_format_handlers="$audio_format_handlers aac"
 fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
@@ -583,9 +506,6 @@ if test "$have_mad" = "yes"; then
 	AC_SUBST(mad_cppflags)
 	mad_ldflags="$mad_libs -lmad"
 	AC_SUBST(mad_ldflags)
-	audiod_cmdline_objs="$audiod_cmdline_objs mp3dec_filter"
-	audiod_errlist_objs="$audiod_errlist_objs mp3dec_filter"
-	audiod_audio_formats="$audiod_audio_formats mp3"
 else
 	AC_MSG_WARN([no mp3dec support in para_audiod/para_filter])
 fi
@@ -652,11 +572,6 @@ if test "$have_flac" = "yes"; then
 	AC_SUBST(flac_cppflags)
 	flac_ldflags="$flac_libs -lFLAC"
 	AC_SUBST(flac_ldflags)
-
-	audiod_errlist_objs="$audiod_errlist_objs flacdec_filter"
-	server_errlist_objs="$server_errlist_objs flac_afh"
-	audio_format_handlers="$audio_format_handlers flac"
-	audiod_audio_formats="$audiod_audio_formats flac"
 else
 	AC_MSG_WARN([no flac support in para_audiod/para_filter/para_afh/para_server])
 fi
@@ -672,18 +587,6 @@ have_oss="yes"
 msg="=> will not build oss writer"
 
 AC_CHECK_HEADER(sys/soundcard.h, [
-	audiod_errlist_objs="$audiod_errlist_objs oss_write"
-	audiod_cmdline_objs="$audiod_cmdline_objs oss_write"
-
-	write_errlist_objs="$write_errlist_objs oss_write"
-	write_cmdline_objs="$write_cmdline_objs oss_write"
-	fade_errlist_objs="$fade_errlist_objs oss_mix"
-
-	writers="$writers oss"
-	default_writer="OSS_WRITE"
-	mixers="${mixers}oss "
-	default_mixer="OSS_MIX"
-
 	AC_CHECK_LIB(ossaudio, _oss_ioctl, [
 			oss_ldflags="-lossaudio"
 			AC_SUBST(oss_ldflags)
@@ -727,17 +630,6 @@ fi
 if test "$have_alsa" = "yes"; then
 	alsa_ldflags="-lasound"
 	AC_SUBST(alsa_ldflags)
-	audiod_errlist_objs="$audiod_errlist_objs alsa_write"
-	audiod_cmdline_objs="$audiod_cmdline_objs alsa_write"
-
-	write_errlist_objs="$write_errlist_objs alsa_write"
-	write_cmdline_objs="$write_cmdline_objs alsa_write"
-	fade_errlist_objs="$fade_errlist_objs alsa_mix"
-
-	writers="$writers alsa"
-	default_writer="ALSA_WRITE"
-	mixers="${mixers}alsa "
-	default_mixer="ALSA_MIX"
 fi
 
 CPPFLAGS="$OLD_CPPFLAGS"
@@ -790,13 +682,6 @@ if test "$have_ao" = "yes"; then
 	AC_SUBST(ao_cppflags)
 	ao_ldflags="$ao_libs -lao -lpthread"
 	AC_SUBST(ao_ldflags)
-
-	audiod_errlist_objs="$audiod_errlist_objs ao_write"
-	audiod_cmdline_objs="$audiod_cmdline_objs ao_write"
-
-	write_errlist_objs="$write_errlist_objs ao_write"
-	write_cmdline_objs="$write_cmdline_objs ao_write"
-	writers="$writers ao"
 fi
 
 CPPFLAGS="$OLD_CPPFLAGS"
@@ -858,10 +743,9 @@ if test "$have_readline" = "yes"; then
 fi
 
 if test "$have_readline" = "yes"; then
+	:
 	AC_SUBST(readline_cppflags)
 	AC_SUBST(readline_ldflags)
-	client_errlist_objs="$client_errlist_objs interactive"
-	audioc_errlist_objs="$audioc_errlist_objs buffer_tree interactive sched time"
 	AC_DEFINE(HAVE_READLINE, 1, define to 1 to turn on readline support)
 else
 	AC_MSG_WARN([libreadline not found or unusable])
@@ -895,9 +779,6 @@ if test "$have_samplerate" = "yes"; then
 	AC_SUBST(samplerate_cppflags)
 	samplerate_ldflags="$samplerate_libs -lsamplerate"
 	AC_SUBST(samplerate_ldflags)
-
-	audiod_errlist_objs="$audiod_errlist_objs resample_filter check_wav"
-	audiod_cmdline_objs="$audiod_cmdline_objs resample_filter"
 else
 	AC_MSG_WARN([no resample support in para_audiod/para_filter])
 fi
@@ -911,7 +792,7 @@ if test \( "$have_openssl" = "yes" -o "$have_gcrypt" = "yes" \) \
 	build_server="yes"
 	executables="$executables server"
 	server_cmdline_objs="server"
-	server_errlist_objs="$server_errlist_objs
+	server_errlist_objs="
 		server
 		afh_common
 		mp3_afh
@@ -950,6 +831,36 @@ if test \( "$have_openssl" = "yes" -o "$have_gcrypt" = "yes" \) \
 		version
 		ggo
 	"
+	if test "$have_openssl" = "yes"; then
+		server_errlist_objs="$server_errlist_objs crypt"
+	fi
+	if test "$have_gcrypt" = "yes"; then
+		server_errlist_objs="$server_errlist_objs gcrypt"
+	fi
+	if test "$have_vorbis" = "yes" || \
+			test "$have_speex" = "yes" || \
+			test "$have_opus" = "yes"; then
+		server_errlist_objs="$server_errlist_objs ogg_afh_common"
+	fi
+	if test "$have_vorbis" = "yes"; then
+		server_errlist_objs="$server_errlist_objs ogg_afh"
+	fi
+	if test "$have_speex" = "yes"; then
+		server_errlist_objs="$server_errlist_objs spx_afh spx_common"
+	fi
+	if test "$have_opus" = "yes"; then
+		server_errlist_objs="$server_errlist_objs opus_afh opus_common"
+	fi
+	if test "$have_faad" = "yes"; then
+		server_errlist_objs="$server_errlist_objs aac_afh aac_common"
+	fi
+	if test "$have_flac" = "yes"; then
+		server_errlist_objs="$server_errlist_objs flac_afh"
+	fi
+	server_objs="add_cmdline($server_cmdline_objs) $server_errlist_objs"
+	AC_SUBST(server_objs, add_dot_o($server_objs))
+	AC_DEFINE_UNQUOTED(INIT_SERVER_ERRLISTS,
+		objlist_to_errlist($server_errlist_objs), errors used by para_server)
 else
 	build_server="no"
 fi
@@ -958,7 +869,7 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
 	build_client="yes"
 	executables="$executables client"
 	client_cmdline_objs="client"
-	client_errlist_objs="$client_errlist_objs
+	client_errlist_objs="
 		client
 		net
 		string
@@ -974,6 +885,19 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
 		version
 		ggo
 	"
+	if test "$have_openssl" = "yes"; then
+		client_errlist_objs="$client_errlist_objs crypt"
+	fi
+	if test "$have_gcrypt" = "yes"; then
+		client_errlist_objs="$client_errlist_objs gcrypt"
+	fi
+	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))
+	AC_DEFINE_UNQUOTED(INIT_CLIENT_ERRLISTS,
+		objlist_to_errlist($client_errlist_objs), errors used by para_client)
 else
 	build_client="no"
 fi
@@ -981,6 +905,7 @@ fi
 if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
 	build_audiod="yes"
 	executables="$executables audiod"
+	audiod_audio_formats="wma"
 	audiod_cmdline_objs="$audiod_cmdline_objs
 		audiod
 		compress_filter
@@ -1029,20 +954,88 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
 		wmadec_filter
 		buffer_tree
 	"
-	audiod_ldflags="$audiod_ldflags -lm"
-	audiod_audio_formats="$audiod_audio_formats wma"
+	if test "$have_openssl" = "yes"; then
+		audiod_errlist_objs="$audiod_errlist_objs crypt"
+	fi
+	if test "$have_gcrypt" = "yes"; then
+		audiod_errlist_objs="$audiod_errlist_objs gcrypt"
+	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.cmdline"
+	fi
+	if test "$have_vorbis" = "yes"; then
+		audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
+		audiod_audio_formats="$audiod_audio_formats ogg"
+	fi
+	if test "$have_speex" = "yes"; then
+		audiod_errlist_objs="$audiod_errlist_objs spxdec_filter spx_common"
+		audiod_audio_formats="$audiod_audio_formats spx"
+	fi
+	if test "$have_opus" = "yes"; then
+		audiod_errlist_objs="$audiod_errlist_objs opusdec_filter opus_common"
+		audiod_audio_formats="$audiod_audio_formats opus"
+	fi
+	if test "$have_faad" = "yes"; then
+		audiod_errlist_objs="$audiod_errlist_objs aacdec_filter aac_common"
+		audiod_audio_formats="$audiod_audio_formats aac"
+	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_flac" = "yes"; then
+		audiod_errlist_objs="$audiod_errlist_objs flacdec_filter"
+		audiod_audio_formats="$audiod_audio_formats flac"
+	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
+	if test "$have_ao" = "yes"; then
+		audiod_errlist_objs="$audiod_errlist_objs ao_write"
+		audiod_cmdline_objs="$audiod_cmdline_objs ao_write"
+	fi
+	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"
+	AC_SUBST(audiod_objs, add_dot_o($audiod_objs))
+	AC_DEFINE_UNQUOTED(INIT_AUDIOD_ERRLISTS, objlist_to_errlist($audiod_errlist_objs),
+		errors used by para_audiod)
+
+	enum="$(for i in $audiod_audio_formats; do printf "AUDIO_FORMAT_${i}, " | tr '[a-z]' '[A-Z]'; done)"
+	AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMATS_ENUM, $enum NUM_AUDIO_FORMATS,
+		enum of audio formats supported by audiod)
+	names="$(for i in $audiod_audio_formats; do printf \"$i\",' ' ; done)"
+	AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMAT_ARRAY, $names, array of audio formats supported by audiod)
 else
 	build_audiod="no"
 fi
 ########################################################################### fade
-if test -n "$mixers"; then
+if test "$have_oss" = "yes" -o "$have_alsa" = "yes"; then
 	build_fade="yes"
 	executables="$executables fade"
-	fade_errlist_objs="$fade_errlist_objs fade exec string fd version ggo"
 	fade_cmdline_objs="fade"
+	fade_errlist_objs="fade exec string fd version ggo"
+	if test "$have_oss" = "yes"; then
+		fade_errlist_objs="$fade_errlist_objs oss_mix"
+		mixers="${mixers}oss "
+		default_mixer="OSS_MIX"
+	fi
+	if test "$have_alsa" = "yes"; then
+		fade_errlist_objs="$fade_errlist_objs alsa_mix"
+		mixers="${mixers}alsa "
+		default_mixer="ALSA_MIX"
+	fi
 	fade_objs="add_cmdline($fade_cmdline_objs) $fade_errlist_objs"
 	AC_SUBST(fade_objs, add_dot_o($fade_objs))
-	AC_SUBST(fade_ldflags, $fade_ldflags)
 	AC_DEFINE_UNQUOTED(INIT_FADE_ERRLISTS,
 		objlist_to_errlist($fade_errlist_objs),
 		errors used by para_fade)
@@ -1066,11 +1059,9 @@ if test -n "$mixers"; then
 		init functions of the supported mixers)
 	array="$(for i in $mixers; do printf '{.init = '$i'_mix_init},'; done)"
 	AC_DEFINE_UNQUOTED(MIXER_ARRAY, $array, array of supported mixers)
-	mixer_summary="supported mixers:: $mixers, default: $default_mixer"
 else
 	build_fade="no"
 	AC_MSG_WARN([no mixer support])
-	mixer_summary="para_fade: no"
 fi
 ########################################################################### gui
 if test "$have_curses" = "yes"; then
@@ -1091,6 +1082,9 @@ if test "$have_curses" = "yes"; then
 		ggo
 	"
 	gui_objs="add_cmdline($gui_cmdline_objs) $gui_errlist_objs"
+	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)
 else
 	build_gui="no"
 	AC_MSG_WARN([no curses lib, cannot build para_gui])
@@ -1165,6 +1159,19 @@ if test "$have_samplerate" = "yes"; then
 	filter_cmdline_objs="$filter_cmdline_objs resample_filter"
 	filters="$filters resample"
 fi
+filter_objs="add_cmdline($filter_cmdline_objs) $filter_errlist_objs"
+
+AC_SUBST(filter_objs, add_dot_o($filter_objs))
+AC_DEFINE_UNQUOTED(INIT_FILTER_ERRLISTS,
+	objlist_to_errlist($filter_errlist_objs), errors used by para_filter)
+
+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
@@ -1220,6 +1227,7 @@ 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
+audio_format_handlers="mp3 wma"
 afh_cmdline_objs="afh"
 afh_errlist_objs="
 	afh
@@ -1240,18 +1248,22 @@ if test "$have_vorbis" = "yes" || \
 fi
 if test "$have_vorbis" = "yes"; then
 	afh_errlist_objs="$afh_errlist_objs ogg_afh"
+	audio_format_handlers="$audio_format_handlers ogg"
 fi
 if test "$have_speex" = "yes"; then
 	afh_errlist_objs="$afh_errlist_objs spx_afh spx_common"
+	audio_format_handlers="$audio_format_handlers spx"
 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"
+	audio_format_handlers="$audio_format_handlers aac"
 fi
 if test "$have_flac" = "yes"; then
 	afh_errlist_objs="$afh_errlist_objs flac_afh"
+	audio_format_handlers="$audio_format_handlers flac"
 fi
 
 afh_objs="add_cmdline($afh_cmdline_objs) $afh_errlist_objs"
@@ -1355,6 +1367,88 @@ 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)
+######################################################################### write
+write_cmdline_objs="
+	write
+	file_write
+"
+write_errlist_objs="
+	write
+	write_common
+	file_write
+	time
+	fd
+	string
+	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.cmdline"
+	writers="$writers osx"
+	default_writer="OSX_WRITE"
+fi
+if test "$have_ao" = "yes"; then
+	write_errlist_objs="$write_errlist_objs ao_write"
+	write_cmdline_objs="$write_cmdline_objs ao_write"
+	writers="$writers ao"
+	default_writer="AO_WRITE"
+fi
+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
+write_objs="add_cmdline($write_cmdline_objs) $write_errlist_objs"
+AC_SUBST(write_objs, add_dot_o($write_objs))
+AC_DEFINE_UNQUOTED(INIT_WRITE_ERRLISTS,
+	objlist_to_errlist($write_errlist_objs), errors used by para_write)
+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_cmdline_objs="audioc"
+audioc_errlist_objs="
+	audioc
+	string
+	net
+	fd
+	version
+	ggo
+"
+if test "$have_readline" = "yes"; then
+	audioc_errlist_objs="$audioc_errlist_objs
+		buffer_tree
+		interactive
+		sched
+		time
+	"
+fi
+audioc_objs="add_cmdline($audioc_cmdline_objs) $audioc_errlist_objs"
+AC_SUBST(audioc_objs, add_dot_o($audioc_objs))
+AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS,
+	objlist_to_errlist($audioc_errlist_objs), errors used by para_audioc)
 ############################################################# error2.h
 # these are always built
 all_errlist_objs="
@@ -1429,71 +1523,6 @@ AC_DEFINE_UNQUOTED(AUDIO_FORMAT_HANDLERS, "$audio_format_handlers",
 
 AC_SUBST(executables)
 
-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"
-
-AC_SUBST(filter_objs, add_dot_o($filter_objs))
-AC_DEFINE_UNQUOTED(INIT_FILTER_ERRLISTS,
-	objlist_to_errlist($filter_errlist_objs), errors used by para_filter)
-
-AC_SUBST(audiod_objs, add_dot_o($audiod_objs))
-AC_SUBST(audiod_ldflags, $audiod_ldflags)
-AC_DEFINE_UNQUOTED(INIT_AUDIOD_ERRLISTS, objlist_to_errlist($audiod_errlist_objs),
-	errors used by para_audiod)
-
-AC_SUBST(server_objs, add_dot_o($server_objs))
-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(write_objs, add_dot_o($write_objs))
-AC_SUBST(write_ldflags, $write_ldflags)
-AC_DEFINE_UNQUOTED(INIT_WRITE_ERRLISTS,
-	objlist_to_errlist($write_errlist_objs), errors used by para_write)
-
-AC_SUBST(client_objs, add_dot_o($client_objs))
-AC_SUBST(client_ldflags, $client_ldflags)
-AC_DEFINE_UNQUOTED(INIT_CLIENT_ERRLISTS,
-	objlist_to_errlist($client_errlist_objs), errors used by para_client)
-
-AC_SUBST(audioc_objs, add_dot_o($audioc_objs))
-AC_SUBST(audioc_ldflags, $audioc_ldflags)
-AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS,
-	objlist_to_errlist($audioc_errlist_objs), errors used by para_audioc)
-
-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)
-
-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)
-
-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)
-
-enum="$(for i in $audiod_audio_formats; do printf "AUDIO_FORMAT_${i}, " | tr '[a-z]' '[A-Z]'; done)"
-AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMATS_ENUM, $enum NUM_AUDIO_FORMATS,
-	enum of audio formats supported by audiod)
-names="$(for i in $audiod_audio_formats; do printf \"$i\",' ' ; done)"
-AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMAT_ARRAY, $names, array of audio formats supported by audiod)
-
 AC_OUTPUT
 AC_MSG_NOTICE([
 paraslash configuration:
@@ -1505,7 +1534,7 @@ id3 version2 support: $have_libid3tag
 filters: $(echo $filters)
 writers: $writers
 
-$mixer_summary
+para_fade: $build_fade
 para_server: $build_server
 para_gui: $build_gui
 para_fade: $build_fade