X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=abf8c071b8a53091ec3c263576fa9f6fae5a74cd;hp=f4049373d56391b3dbff79d166ed9969eff5607d;hb=0f4790f2eb859832419e5aeb3d4549fbde3b0499;hpb=c79cdc5b88a4324a6a07b89688ad618ef0098e14 diff --git a/configure.ac b/configure.ac index f4049373..abf8c071 100644 --- a/configure.ac +++ b/configure.ac @@ -92,169 +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 - string - net - fd - version - ggo -" -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], [ @@ -287,7 +124,11 @@ fi AC_CHECK_HEADER(osl.h, [], have_osl=no) AC_CHECK_LIB([osl], [osl_open_table], [], have_osl=no) -if test "$have_osl" = "no"; then +if test "$have_osl" = "yes"; then + AC_SUBST(osl_cppflags) + osl_ldflags="$osl_libs -losl" + AC_SUBST(osl_ldflags) +else AC_MSG_WARN([libosl not found, can not build para_server. Download libosl at http://systemlinux.org/~maan/osl @@ -295,7 +136,6 @@ or execute git clone git://git.tuebingen.mpg.de/osl ]) fi -AC_SUBST(osl_cppflags) CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" LIBS="$OLD_LIBS" @@ -350,14 +190,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" - - server_errlist_objs="$server_errlist_objs crypt" - client_errlist_objs="$client_errlist_objs crypt" - audiod_errlist_objs="$audiod_errlist_objs crypt" + openssl_ldflags="$openssl_libs -lssl -lcrypto" + AC_SUBST(openssl_ldflags) check_gcrypt="no" else @@ -392,14 +226,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" - - server_errlist_objs="$server_errlist_objs gcrypt" - client_errlist_objs="$client_errlist_objs gcrypt" - audiod_errlist_objs="$audiod_errlist_objs gcrypt" + gcrypt_ldflags="$gcrypt_libs -lgcrypt" + AC_SUBST(gcrypt_ldflags) else AC_MSG_WARN([gcrypt library not found]) fi @@ -411,29 +239,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([[ @@ -517,21 +332,8 @@ if test ${have_core_audio} = yes; then f2="-framework AudioToolbox" f3="-framework AudioUnit" f4="-framework CoreServices" - f="$f1 $f2 $f3 $f4" - - 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" + core_audio_ldflags="$f1 $f2 $f3 $f4" + AC_SUBST(core_audio_ldflags) AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X) fi ####################################################### ogg/vorbis/speex/opus @@ -618,86 +420,32 @@ if test "$have_vorbis" = "yes" || \ test "$have_speex" = "yes" || \ test "$have_opus" = "yes"; then AC_SUBST(ogg_cppflags) - ogg_libs="$ogg_libs -logg" + ogg_ldflags="$ogg_libs -logg" if test "$OSTYPE" = "Darwin"; then - ogg_libs="-Wl,-bind_at_load $ogg_libs" + ogg_ldflags="-Wl,-bind_at_load $ogg_ldflags" fi - server_ldflags="$server_ldflags $ogg_libs" - filter_ldflags="$filter_ldflags $ogg_libs" - audiod_ldflags="$audiod_ldflags $ogg_libs" - play_ldflags="$play_ldflags $ogg_libs" - afh_ldflags="$afh_ldflags $ogg_libs" - recv_ldflags="$recv_ldflags $ogg_libs" - 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" + AC_SUBST(ogg_ldflags) 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_libs="-lvorbis -lvorbisfile" - server_ldflags="$server_ldflags $vorbis_libs" - filter_ldflags="$filter_ldflags $vorbis_libs" - audiod_ldflags="$audiod_ldflags $vorbis_libs" - play_ldflags="$play_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" - 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" + vorbis_ldflags="$vorbis_libs -lvorbis -lvorbisfile" + AC_SUBST(vorbis_ldflags) audio_format_handlers="$audio_format_handlers ogg" -else - AC_MSG_WARN([no ogg/vorbis $msg]) fi if test "$have_speex" = "yes"; then AC_DEFINE(HAVE_SPEEX, 1, define to 1 to turn on ogg/speex support) - filters="$filters spxdec" - speex_libs="-lspeex" - server_ldflags="$server_ldflags $speex_libs" - filter_ldflags="$filter_ldflags $speex_libs" - audiod_ldflags="$audiod_ldflags $speex_libs" - play_ldflags="$play_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" - 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" + AC_SUBST(speex_cppflags) + speex_ldflags="$speex_libs -lspeex" + AC_SUBST(speex_ldflags) audio_format_handlers="$audio_format_handlers spx" else AC_MSG_WARN([no ogg/speex $msg]) fi if test "$have_opus" = "yes"; then AC_DEFINE(HAVE_OPUS, 1, define to 1 to turn on ogg/opus support) - filters="$filters opusdec" - opus_libs="-lopus" - server_ldflags="$server_ldflags $opus_libs" - filter_ldflags="$filter_ldflags $opus_libs" - audiod_ldflags="$audiod_ldflags $opus_libs" - afh_ldflags="$afh_ldflags $opus_libs" - play_ldflags="$play_ldflags $opus_libs" - recv_ldflags="$recv_ldflags $opus_libs" - - 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" + AC_SUBST(opus_cppflags) + opus_ldflags="$opus_libs -lopus" + AC_SUBST(opus_ldflags) audio_format_handlers="$audio_format_handlers opus" else AC_MSG_WARN([no ogg/opus $msg]) @@ -726,26 +474,11 @@ AC_CHECK_HEADER(neaacdec.h, [], have_faad=no) AC_CHECK_LIB([faad], [NeAACDecOpen], [], have_faad=no) if test "$have_faad" = "yes"; then AC_DEFINE(HAVE_FAAD, 1, define to 1 if you want to build the aacdec filter) - 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" - - server_ldflags="$server_ldflags $faad_libs -lfaad" - filter_ldflags="$filter_ldflags $faad_libs -lfaad" - audiod_ldflags="$audiod_ldflags $faad_libs -lfaad" - play_ldflags="$play_ldflags $faad_libs -lfaad" - afh_ldflags="$afh_ldflags $faad_libs -lfaad" - recv_ldflags="$afh_ldflags $faad_libs -lfaad" + AC_SUBST(faad_cppflags) + faad_ldflags="$faad_libs -lfaad" + AC_SUBST(faad_ldflags) - audiod_audio_formats="$audiod_audio_formats aac" audio_format_handlers="$audio_format_handlers aac" - filters="$filters aacdec" - AC_SUBST(faad_cppflags) -else - AC_MSG_WARN([no aac support in para_audiod/para_filter]) fi CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" @@ -776,18 +509,9 @@ AC_CHECK_LIB([mad], [mad_stream_init], [], [ ]) if test "$have_mad" = "yes"; then AC_DEFINE(HAVE_MAD, 1, define to 1 if you want to build the mp3dec filter) - 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" - filter_ldflags="$filter_ldflags $mad_libs -lmad" - audiod_ldflags="$audiod_ldflags $mad_libs -lmad" - play_ldflags="$play_ldflags $mad_libs -lmad" - audiod_audio_formats="$audiod_audio_formats mp3" - filters="$filters mp3dec" AC_SUBST(mad_cppflags) + mad_ldflags="$mad_libs -lmad" + AC_SUBST(mad_ldflags) else AC_MSG_WARN([no mp3dec support in para_audiod/para_filter]) fi @@ -851,22 +575,10 @@ AC_CHECK_HEADER(FLAC/stream_decoder.h, [], have_flac=no) AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [], have_flac=no, -logg -lm) if test "$have_flac" = "yes"; then AC_DEFINE(HAVE_FLAC, 1, define to 1 if you want to build the flacdec filter) - 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" - filter_ldflags="$filter_ldflags $flac_libs -lFLAC" - audiod_ldflags="$audiod_ldflags $flac_libs -lFLAC" - play_ldflags="$play_ldflags $flac_libs -lFLAC" - server_ldflags="$server_ldflags $flac_libs -lFLAC" - afh_ldflags="$afh_ldflags $flac_libs -lFLAC" - recv_ldflags="$recv_ldflags $flac_libs -lFLAC" - filters="$filters flacdec" - audio_format_handlers="$audio_format_handlers flac" - audiod_audio_formats="$audiod_audio_formats flac" AC_SUBST(flac_cppflags) + flac_ldflags="$flac_libs -lFLAC" + AC_SUBST(flac_ldflags) + audio_format_handlers="$audio_format_handlers flac" else AC_MSG_WARN([no flac support in para_audiod/para_filter/para_afh/para_server]) fi @@ -882,25 +594,14 @@ have_oss="yes" 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" AC_CHECK_LIB(ossaudio, _oss_ioctl, [ - audiod_ldflags="$audiod_ldflags -lossaudio" - play_ldflags="$play_ldflags -lossaudio" - write_ldflags="$write_ldflags -lossaudio" - fade_ldflags="$fade_ldflags -lossaudio" + oss_ldflags="-lossaudio" + AC_SUBST(oss_ldflags) ] ) ], @@ -939,21 +640,10 @@ if test "$have_alsa" = "yes"; then fi if test "$have_alsa" = "yes"; then - audiod_errlist_objs="$audiod_errlist_objs alsa_write" - audiod_cmdline_objs="$audiod_cmdline_objs alsa_write" - audiod_ldflags="$audiod_ldflags -lasound" - play_errlist_objs="$play_errlist_objs alsa_write" - play_cmdline_objs="$play_cmdline_objs alsa_write" - play_ldflags="$play_ldflags -lasound" - - write_errlist_objs="$write_errlist_objs alsa_write" - write_cmdline_objs="$write_cmdline_objs alsa_write" - write_ldflags="$write_ldflags -lasound" + alsa_ldflags="-lasound" + AC_SUBST(alsa_ldflags) fade_errlist_objs="$fade_errlist_objs alsa_mix" - fade_ldflags="$fade_ldflags -lasound" - writers="$writers alsa" - default_writer="ALSA_WRITE" mixers="${mixers}alsa " default_mixer="ALSA_MIX" fi @@ -1005,19 +695,9 @@ if test "$have_ao" = "yes"; then ]) fi if test "$have_ao" = "yes"; then - audiod_errlist_objs="$audiod_errlist_objs ao_write" - audiod_cmdline_objs="$audiod_cmdline_objs ao_write" - audiod_ldflags="$audiod_ldflags -lao -lpthread" - - play_errlist_objs="$play_errlist_objs ao_write" - play_cmdline_objs="$play_cmdline_objs ao_write" - play_ldflags="$play_ldflags -lao -lpthread" - - write_errlist_objs="$write_errlist_objs ao_write" - write_cmdline_objs="$write_cmdline_objs ao_write" - write_ldflags="$write_ldflags $ao_libs -lao -lpthread" - writers="$writers ao" AC_SUBST(ao_cppflags) + ao_ldflags="$ao_libs -lao -lpthread" + AC_SUBST(ao_ldflags) fi CPPFLAGS="$OLD_CPPFLAGS" @@ -1056,7 +736,7 @@ if test "$have_curses" != "yes"; then fi if test "$have_readline" = "yes"; then - readline_libs="$readline_libs -lreadline" + readline_ldflags="$readline_libs -lreadline" AC_SEARCH_LIBS([rl_free_keymap], [readline], [], [have_readline="no"]) if test "$have_readline" = "no"; then # try with -lcurses # clear cache @@ -1064,7 +744,7 @@ if test "$have_readline" = "yes"; then unset ac_cv_search_rl_free_keymap 2> /dev/null AC_SEARCH_LIBS([rl_free_keymap], [readline], [ have_readline=yes - readline_libs="$readline_libs -lcurses" + readline_ldflags="$readline_ldflags -lcurses" ], [], [-lcurses]) fi if test "$have_readline" = "no"; then # try with -ltermcap @@ -1073,19 +753,15 @@ if test "$have_readline" = "yes"; then unset ac_cv_search_rl_free_keymap 2> /dev/null AC_SEARCH_LIBS([rl_free_keymap], [readline], [ have_readline=yes - readline_libs="$readline_libs -ltermcap" + readline_ldflags="$readline_ldflags -ltermcap" ], [], [-ltermcap]) fi fi if test "$have_readline" = "yes"; then - client_errlist_objs="$client_errlist_objs interactive" - client_ldflags="$client_ldflags $readline_libs" - audioc_errlist_objs="$audioc_errlist_objs buffer_tree interactive sched time" - audioc_ldflags="$audioc_ldflags $readline_libs" - play_errlist_objs="$play_errlist_objs interactive" - play_ldflags="$play_ldflags $readline_libs" + : AC_SUBST(readline_cppflags) + AC_SUBST(readline_ldflags) AC_DEFINE(HAVE_READLINE, 1, define to 1 to turn on readline support) else AC_MSG_WARN([libreadline not found or unusable]) @@ -1116,17 +792,9 @@ AC_CHECK_HEADER(samplerate.h, [], have_samplerate=no) AC_CHECK_LIB([samplerate], [src_process], [], have_samplerate=no, []) if test "$have_samplerate" = "yes"; then - 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" - filter_ldflags="$filter_ldflags $samplerate_libs -lsamplerate" - audiod_ldflags="$audiod_ldflags $samplerate_libs -lsamplerate" - play_ldflags="$play_ldflags $samplerate_libs -lsamplerate" - filters="$filters resample" AC_SUBST(samplerate_cppflags) + samplerate_ldflags="$samplerate_libs -lsamplerate" + AC_SUBST(samplerate_ldflags) else AC_MSG_WARN([no resample support in para_audiod/para_filter]) fi @@ -1140,7 +808,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 @@ -1179,19 +847,48 @@ if test \( "$have_openssl" = "yes" -o "$have_gcrypt" = "yes" \) \ version ggo " - server_ldflags="$server_ldflags $osl_libs -losl" -else - build_server="no" -fi -############################################################# client -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 - net - string + 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 +############################################################# client +if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then + build_client="yes" + executables="$executables client" + client_cmdline_objs="client" + client_errlist_objs=" + client + net + string fd sched stdin @@ -1204,6 +901,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 @@ -1211,6 +921,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 @@ -1259,8 +970,67 @@ 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 @@ -1325,6 +1095,348 @@ else build_gui="no" AC_MSG_WARN([no curses lib, cannot build para_gui]) fi +######################################################################## filter +filters=" + compress + wav + amp + fecdec + wmadec + prebuffer +" +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) +######################################################################## 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=" @@ -1399,66 +1511,16 @@ 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) -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(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, - 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) -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) @@ -1467,23 +1529,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) -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: