X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=2df7339658518f5bc3b732b9b640bbc5d2fe84b3;hp=b6010490a705c80f70c102c49aa31fb524267bcb;hb=56561c08cf6cfe28bccebc513bcec057d8bb9afa;hpb=7024574d05fe8571c763d11c61626a9ac4980267 diff --git a/configure.ac b/configure.ac index b6010490..2df73396 100644 --- a/configure.ac +++ b/configure.ac @@ -102,14 +102,17 @@ all_errlist_objs="mp3_afh afh_common net string signal time daemon exec send_common ggo udp_recv color fec fecdec_filter prebuffer_filter bitstream imdct wma_afh wma_common wmadec_filter buffer_tree crypt_common - gui gui_theme sideband" - + gui gui_theme sideband afh_recv" executables="recv filter audioc write client afh audiod" -recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv)" +recv_cmdline_objs="add_cmdline(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 +" -recv_errlist_objs="http_recv recv_common recv time string net dccp_recv - fd sched stdout ggo udp_recv buffer_tree" recv_ldflags="" filter_cmdline_objs="add_cmdline(filter compress_filter amp_filter prebuffer_filter)" @@ -590,8 +593,10 @@ if test "$have_vorbis" = "yes" || test "$have_speex" = "yes"; then filter_ldflags="$filter_ldflags $ogg_libs" audiod_ldflags="$audiod_ldflags $ogg_libs" afh_ldflags="$afh_ldflags $ogg_libs" + recv_ldflags="$recv_ldflags $ogg_libs" all_errlist_objs="$all_errlist_objs ogg_afh_common" 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" fi if test "$have_vorbis" = "yes"; then @@ -603,11 +608,13 @@ if test "$have_vorbis" = "yes"; then filter_ldflags="$filter_ldflags $vorbis_libs" audiod_ldflags="$audiod_ldflags $vorbis_libs" afh_ldflags="$afh_ldflags $vorbis_libs" + recv_ldflags="$recv_ldflags $vorbis_libs" server_errlist_objs="$server_errlist_objs ogg_afh" filter_errlist_objs="$filter_errlist_objs oggdec_filter" audiod_errlist_objs="$audiod_errlist_objs oggdec_filter" afh_errlist_objs="$afh_errlist_objs ogg_afh" + recv_errlist_objs="$recv_errlist_objs ogg_afh" audiod_audio_formats="$audiod_audio_formats ogg" server_audio_formats="$server_audio_formats ogg" @@ -623,11 +630,13 @@ if test "$have_speex" = "yes"; then filter_ldflags="$filter_ldflags $speex_libs" audiod_ldflags="$audiod_ldflags $speex_libs" afh_ldflags="$afh_ldflags $speex_libs" + recv_ldflags="$recv_ldflags $speex_libs" 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" 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" server_audio_formats="$server_audio_formats spx" @@ -663,10 +672,14 @@ if test "$have_faad" = "yes"; then afh_errlist_objs="$afh_errlist_objs aac_common aac_afh" audiod_errlist_objs="$audiod_errlist_objs aacdec_filter aac_common" server_errlist_objs="$server_errlist_objs aac_afh aac_common" + recv_errlist_objs="$recv_errlist_objs aac_afh aac_common" + server_ldflags="$server_ldflags $faad_libs -lfaad" filter_ldflags="$filter_ldflags $faad_libs -lfaad" audiod_ldflags="$audiod_ldflags $faad_libs -lfaad" afh_ldflags="$afh_ldflags $faad_libs -lfaad" + recv_ldflags="$afh_ldflags $faad_libs -lfaad" + audiod_audio_formats="$audiod_audio_formats aac" server_audio_formats="$server_audio_formats aac" filters="$filters aacdec" @@ -750,6 +763,7 @@ if test ${have_libid3tag} = yes; then AC_DEFINE(HAVE_LIBID3TAG, 1, define to 1 you have libid3tag) server_ldflags="$server_ldflags $id3tag_libs -lid3tag -lz" afh_ldflags="$afh_ldflags $id3tag_libs -lid3tag -lz" + recv_ldflags="$recv_ldflags $id3tag_libs -lid3tag" AC_SUBST(id3tag_cppflags) else AC_MSG_WARN([no support for id3v2 tags]) @@ -784,16 +798,18 @@ if test "$have_flac" = "yes"; then audiod_errlist_objs="$audiod_errlist_objs flacdec_filter" afh_errlist_objs="$afh_errlist_objs flac_afh" server_errlist_objs="$server_errlist_objs flac_afh" + recv_errlist_objs="$recv_errlist_objs flac_afh" filter_ldflags="$filter_ldflags $flac_libs -lFLAC" audiod_ldflags="$audiod_ldflags $flac_libs -lFLAC" server_ldflags="$server_ldflags $flac_libs -lFLAC" afh_ldflags="$afh_ldflags $flac_libs -lFLAC" + recv_ldflags="$afh_ldflags $flac_libs -lFLAC" filters="$filters flacdec" server_audio_formats="$server_audio_formats flac" audiod_audio_formats="$audiod_audio_formats flac" AC_SUBST(flac_cppflags) else - AC_MSG_WARN([no flac support in para_audiod/para_filter]) + AC_MSG_WARN([no flac support in para_audiod/para_filter/para_afh/para_server]) fi CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" @@ -861,16 +877,20 @@ if test "$have_alsa" = "yes"; then fi if test "$have_alsa" = "yes"; then - all_errlist_objs="$all_errlist_objs alsa_write" audiod_errlist_objs="$audiod_errlist_objs alsa_write" audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(alsa_write)" audiod_ldflags="$audiod_ldflags -lasound" - write_errlist_objs="$write_errlist_objs alsa_write" write_cmdline_objs="$write_cmdline_objs add_cmdline(alsa_write)" write_ldflags="$write_ldflags -lasound" + fade_errlist_objs="$fade_errlist_objs alsa_mix" + fade_ldflags="$fade_ldflags -lasound" + all_errlist_objs="$all_errlist_objs alsa_write alsa_mix" + writers="$writers alsa" default_writer="ALSA_WRITE" + mixers="${mixers}alsa " + default_mixer="ALSA_MIX" fi CPPFLAGS="$OLD_CPPFLAGS" @@ -909,7 +929,7 @@ 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="mixers supported by para_fade: $mixers" + mixer_summary="supported mixers:: $mixers, default: $default_mixer" else AC_MSG_WARN([no mixer support]) mixer_summary="para_fade: no"