X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=configure.ac;h=9f63bc1043c66e2b1046d2c606bf95736f475e51;hb=bfd5b598e02e63d5c6e316525fe6d435eadeb42e;hp=c39b0512c0eed22d17204937c1365e00e7b70ec4;hpb=64819779cf2bf77c2323a89d61bdfeccb35a43ce;p=paraslash.git diff --git a/configure.ac b/configure.ac index c39b0512..9f63bc10 100644 --- a/configure.ac +++ b/configure.ac @@ -124,45 +124,6 @@ recv_errlist_objs=" 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 @@ -287,7 +248,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 +260,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,10 +314,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" @@ -392,10 +354,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" @@ -411,29 +371,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,19 +464,17 @@ 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) @@ -630,12 +575,10 @@ if test "$have_vorbis" = "yes" || \ 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" @@ -650,10 +593,8 @@ 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" @@ -670,10 +611,8 @@ 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" @@ -712,7 +651,6 @@ 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" @@ -721,9 +659,6 @@ if test "$have_faad" = "yes"; then 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" @@ -757,14 +692,11 @@ 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 @@ -828,22 +760,17 @@ 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" + AC_SUBST(flac_cppflags) + flac_ldflags="$flac_libs -lFLAC" + AC_SUBST(flac_ldflags) + 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) else AC_MSG_WARN([no flac support in para_audiod/para_filter/para_afh/para_server]) fi @@ -874,10 +801,8 @@ AC_CHECK_HEADER(sys/soundcard.h, [ 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) ] ) ], @@ -916,18 +841,16 @@ if test "$have_alsa" = "yes"; then 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" - 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" fade_errlist_objs="$fade_errlist_objs alsa_mix" - fade_ldflags="$fade_ldflags -lasound" writers="$writers alsa" default_writer="ALSA_WRITE" @@ -982,19 +905,19 @@ if test "$have_ao" = "yes"; then ]) fi 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" - 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) fi CPPFLAGS="$OLD_CPPFLAGS" @@ -1033,7 +956,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 @@ -1041,7 +964,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 @@ -1050,19 +973,17 @@ 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 + AC_SUBST(readline_cppflags) + AC_SUBST(readline_ldflags) 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_DEFINE(HAVE_READLINE, 1, define to 1 to turn on readline support) else AC_MSG_WARN([libreadline not found or unusable]) @@ -1093,17 +1014,14 @@ 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" + 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" 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) else AC_MSG_WARN([no resample support in para_audiod/para_filter]) fi @@ -1156,7 +1074,6 @@ if test \( "$have_openssl" = "yes" -o "$have_gcrypt" = "yes" \) \ version ggo " - server_ldflags="$server_ldflags $osl_libs -losl" else build_server="no" fi @@ -1302,6 +1219,77 @@ 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 + ############################################################# error2.h # these are always built all_errlist_objs=" @@ -1393,7 +1381,6 @@ 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)