X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=dc0dd0e08d2fcc02e0a5bbb34f0cecb4f8044e02;hb=d952d67d0f302ae7415fde958e71d7ca12f2e40c;hp=48b75ec5804dbb0603bd7d9b5d7b65aaf5bad272;hpb=52ac85177056d375e79d1df838d40a35b78a3e55;p=paraslash.git diff --git a/configure.ac b/configure.ac index 48b75ec5..dc0dd0e0 100644 --- a/configure.ac +++ b/configure.ac @@ -92,77 +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="" - -filter_cmdline_objs=" - filter - compress_filter - amp_filter - prebuffer_filter -" -filter_errlist_objs=" - filter_common - wav_filter - compress_filter - filter - string - stdin - stdout - sched - fd - amp_filter - ggo - fecdec_filter - fec - version - prebuffer_filter - time - bitstream - imdct - wma_common - wmadec_filter - buffer_tree -" -filter_ldflags="-lm" -filters=" - compress - wav - amp - fecdec - wmadec - prebuffer -" - audioc_cmdline_objs="audioc" audioc_errlist_objs=" audioc @@ -174,87 +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 -" -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" - -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], [ @@ -353,10 +201,8 @@ if test "$check_openssl" = "yes"; then if test "$have_openssl" = "yes"; then AC_DEFINE(HAVE_OPENSSL, 1, [define to 1 to turn on openssl support]) AC_SUBST(openssl_cppflags) - openssl_libs="$openssl_libs -lssl -lcrypto" - server_ldflags="$server_ldflags $openssl_libs" - client_ldflags="$client_ldflags $openssl_libs" - audiod_ldflags="$audiod_ldflags $openssl_libs" + openssl_ldflags="$openssl_libs -lssl -lcrypto" + AC_SUBST(openssl_ldflags) server_errlist_objs="$server_errlist_objs crypt" client_errlist_objs="$client_errlist_objs crypt" @@ -395,10 +241,8 @@ if test "$check_gcrypt" = "yes"; then if test "$have_gcrypt" = "yes"; then AC_DEFINE(HAVE_GCRYPT, 1, [define to 1 to turn on gcrypt support]) AC_SUBST(gcrypt_cppflags) - gcrypt_libs="$gcrypt_libs -lgcrypt" - server_ldflags="$server_ldflags $gcrypt_libs" - client_ldflags="$client_ldflags $gcrypt_libs" - audiod_ldflags="$audiod_ldflags $gcrypt_libs" + gcrypt_ldflags="$gcrypt_libs -lgcrypt" + AC_SUBST(gcrypt_ldflags) server_errlist_objs="$server_errlist_objs gcrypt" client_errlist_objs="$client_errlist_objs gcrypt" @@ -414,29 +258,16 @@ else fi ########################################################################### libsocket AC_CHECK_LIB([c], [socket], - [socket_lib=], - [socket_lib="-lsocket"] + [socket_ldlflags=], + [socket_ldflags="-lsocket"] ) -server_ldflags="$server_ldflags $socket_lib" -client_ldflags="$client_ldflags $socket_lib" -audioc_ldflags="$audioc_ldflags $socket_lib" -audiod_ldflags="$audiod_ldflags $socket_lib" -recv_ldflags="$recv_ldflags $socket_lib" -AC_SEARCH_LIBS([connect],[socket],[],[ - AC_MSG_ERROR([Fatal: Did not find connect().]) -],[]) +AC_SUBST(socket_ldflags) ########################################################################### libnsl AC_CHECK_LIB([c], [gethostbyname], - [nsl_lib=], - [nsl_lib="-lnsl"] + [nsl_ldflags=], + [nsl_ldflags="-lnsl"] ) -server_ldflags="$server_ldflags $nsl_lib" -client_ldflags="$client_ldflags $nsl_lib" -audioc_ldflags="$audioc_ldflags $nsl_lib" -recv_ldflags="$recv_ldflags $nsl_lib" -AC_SEARCH_LIBS([inet_ntoa],[nsl],[],[ - AC_MSG_ERROR([Fatal: Did not find inet_ntoa().]) -],[]) +AC_SUBST(nsl_ldflags) ########################################################################### ucred AC_MSG_CHECKING(for struct ucred) AC_LINK_IFELSE([AC_LANG_PROGRAM([[ @@ -520,21 +351,12 @@ if test ${have_core_audio} = yes; then f2="-framework AudioToolbox" f3="-framework AudioUnit" f4="-framework CoreServices" - f="$f1 $f2 $f3 $f4" + 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" - audiod_ldflags="$audiod_ldflags $f" - - play_errlist_objs="$play_errlist_objs osx_write ipc" - play_cmdline_objs="$play_cmdline_objs osx_write.cmdline" - play_ldflags="$play_ldflags $f" - write_errlist_objs="$write_errlist_objs osx_write ipc" - write_cmdline_objs="$write_cmdline_objs osx_write.cmdline" - write_ldflags="$write_ldflags $f" - 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 @@ -626,23 +448,15 @@ 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) - filters="$filters oggdec" vorbis_ldflags="$vorbis_libs -lvorbis -lvorbisfile" AC_SUBST(vorbis_ldflags) server_errlist_objs="$server_errlist_objs ogg_afh" - filter_errlist_objs="$filter_errlist_objs oggdec_filter" 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" @@ -653,14 +467,9 @@ if test "$have_speex" = "yes"; then speex_ldflags="$speex_libs -lspeex" AC_SUBST(speex_ldflags) - filters="$filters spxdec" server_errlist_objs="$server_errlist_objs spx_afh spx_common" - filter_errlist_objs="$filter_errlist_objs spxdec_filter 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" @@ -673,14 +482,9 @@ if test "$have_opus" = "yes"; then opus_ldflags="$opus_libs -lopus" AC_SUBST(opus_ldflags) - filters="$filters opusdec" server_errlist_objs="$server_errlist_objs opus_afh opus_common" - filter_errlist_objs="$filter_errlist_objs opusdec_filter 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" @@ -715,18 +519,11 @@ if test "$have_faad" = "yes"; then faad_ldflags="$faad_libs -lfaad" AC_SUBST(faad_ldflags) - filter_errlist_objs="$filter_errlist_objs aacdec_filter aac_common" - 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" - filters="$filters aacdec" -else - AC_MSG_WARN([no aac support in para_audiod/para_filter]) fi CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" @@ -760,14 +557,9 @@ if test "$have_mad" = "yes"; then AC_SUBST(mad_cppflags) mad_ldflags="$mad_libs -lmad" AC_SUBST(mad_ldflags) - filter_cmdline_objs="$filter_cmdline_objs mp3dec_filter" audiod_cmdline_objs="$audiod_cmdline_objs mp3dec_filter" - play_cmdline_objs="$play_cmdline_objs mp3dec_filter" - filter_errlist_objs="$filter_errlist_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" - filters="$filters mp3dec" else AC_MSG_WARN([no mp3dec support in para_audiod/para_filter]) fi @@ -835,13 +627,8 @@ if test "$have_flac" = "yes"; then flac_ldflags="$flac_libs -lFLAC" AC_SUBST(flac_ldflags) - filter_errlist_objs="$filter_errlist_objs flacdec_filter" 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" - filters="$filters flacdec" audio_format_handlers="$audio_format_handlers flac" audiod_audio_formats="$audiod_audio_formats flac" else @@ -860,16 +647,10 @@ 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" fade_errlist_objs="$fade_errlist_objs oss_mix" - writers="$writers oss" - default_writer="OSS_WRITE" mixers="${mixers}oss " default_mixer="OSS_MIX" @@ -918,15 +699,9 @@ 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" fade_errlist_objs="$fade_errlist_objs alsa_mix" - writers="$writers alsa" - default_writer="ALSA_WRITE" mixers="${mixers}alsa " default_mixer="ALSA_MIX" fi @@ -985,12 +760,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" fi CPPFLAGS="$OLD_CPPFLAGS" @@ -1056,7 +825,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]) @@ -1091,13 +859,8 @@ if test "$have_samplerate" = "yes"; then samplerate_ldflags="$samplerate_libs -lsamplerate" AC_SUBST(samplerate_ldflags) - filter_errlist_objs="$filter_errlist_objs resample_filter check_wav" - filter_cmdline_objs="$filter_cmdline_objs resample_filter" 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" - filters="$filters resample" else AC_MSG_WARN([no resample support in para_audiod/para_filter]) fi @@ -1295,44 +1058,364 @@ else build_gui="no" AC_MSG_WARN([no curses lib, cannot build para_gui]) fi -############################################################# error2.h -# these are always built -all_errlist_objs=" - $recv_errlist_objs - $filter_errlist_objs - $audioc_errlist_objs - $write_errlist_objs - $afh_errlist_objs - $play_errlist_objs +######################################################################## filter +filters=" + compress + wav + amp + fecdec + wmadec + prebuffer " - -# optional executables -if test "$build_server" = "yes"; then - all_errlist_objs="$all_errlist_objs $server_errlist_objs" -fi -if test "$build_gui" = "yes"; then - all_errlist_objs="$all_errlist_objs $gui_errlist_objs" -fi -if test "$build_fade" = "yes"; then - all_errlist_objs="$all_errlist_objs $fade_errlist_objs" -fi -if test "$build_client" = "yes"; then - all_errlist_objs="$all_errlist_objs $client_errlist_objs" -fi -if test "$build_audiod" = "yes"; then - all_errlist_objs="$all_errlist_objs $audiod_errlist_objs" -fi - -all_errlist_objs="$(echo $all_errlist_objs | tr ' ' '\n' | sort | uniq)" - -object_executable_matrix= -for i in $executables; do - eval objs=\$${i}_errlist_objs - object_executable_matrix="$object_executable_matrix $i: $objs" -done -# use echo to replace newlines by space -AC_SUBST(object_executable_matrix, $(echo $object_executable_matrix)) - +filter_errlist_objs=" + filter_common + wav_filter + compress_filter + filter + string + stdin + stdout + sched + fd + amp_filter + ggo + fecdec_filter + fec + version + prebuffer_filter + time + bitstream + imdct + wma_common + wmadec_filter + buffer_tree + net +" +filter_cmdline_objs=" + filter + compress_filter + amp_filter + prebuffer_filter +" + +if test "$have_vorbis" = "yes"; then + filters="$filters oggdec" + filter_errlist_objs="$filter_errlist_objs oggdec_filter" +fi +if test "$have_speex" = "yes"; then + filters="$filters spxdec" + filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common" +fi +if test "$have_opus" = "yes"; then + filters="$filters opusdec" + filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common" +fi +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_flac" = "yes"; then + filter_errlist_objs="$filter_errlist_objs flacdec_filter" + filters="$filters flacdec" +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 +########################################################################## 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) +######################################################################### 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) +############################################################# error2.h +# these are always built +all_errlist_objs=" + $recv_errlist_objs + $filter_errlist_objs + $audioc_errlist_objs + $write_errlist_objs + $afh_errlist_objs + $play_errlist_objs +" + +# optional executables +if test "$build_server" = "yes"; then + all_errlist_objs="$all_errlist_objs $server_errlist_objs" +fi +if test "$build_gui" = "yes"; then + all_errlist_objs="$all_errlist_objs $gui_errlist_objs" +fi +if test "$build_fade" = "yes"; then + all_errlist_objs="$all_errlist_objs $fade_errlist_objs" +fi +if test "$build_client" = "yes"; then + all_errlist_objs="$all_errlist_objs $client_errlist_objs" +fi +if test "$build_audiod" = "yes"; then + all_errlist_objs="$all_errlist_objs $audiod_errlist_objs" +fi + +all_errlist_objs="$(echo $all_errlist_objs | tr ' ' '\n' | sort | uniq)" + +object_executable_matrix= +for i in $executables; do + eval objs=\$${i}_errlist_objs + object_executable_matrix="$object_executable_matrix $i: $objs" +done +# use echo to replace newlines by space +AC_SUBST(object_executable_matrix, $(echo $object_executable_matrix)) + for obj in $all_errlist_objs; do SS="$SS SS_$(echo $obj | tr 'a-z' 'A-Z')," done @@ -1369,24 +1452,13 @@ 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_SUBST(filter_ldflags, $filter_ldflags) AC_DEFINE_UNQUOTED(INIT_FILTER_ERRLISTS, objlist_to_errlist($filter_errlist_objs), errors used by para_filter) @@ -1400,16 +1472,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, - 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, @@ -1424,11 +1486,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) @@ -1437,17 +1494,6 @@ AC_DEFINE_UNQUOTED(DECLARE_FILTER_INITS, $inits, init functions of the supported 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)