X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=9ceed415c8155e2f666cfd2165c54a9e2c42ac3f;hp=b12dc1815ca5c3245c8cebe80a018c23cf54930e;hb=51642118c156044133720d7b36e971fcb99b1e45;hpb=b6c7050f63cb0fa16e9b0af4354e7cb065587d0b diff --git a/configure.ac b/configure.ac index b12dc181..9ceed415 100644 --- a/configure.ac +++ b/configure.ac @@ -287,7 +287,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 +299,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 +353,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 +393,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,17 +410,10 @@ 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=], @@ -666,14 +658,11 @@ else fi if test "$have_opus" = "yes"; then AC_DEFINE(HAVE_OPUS, 1, define to 1 to turn on ogg/opus support) + AC_SUBST(opus_cppflags) + opus_ldflags="$opus_libs -lopus" + AC_SUBST(opus_ldflags) + 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" @@ -711,6 +700,10 @@ 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) + AC_SUBST(faad_cppflags) + 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" @@ -718,17 +711,9 @@ if test "$have_faad" = "yes"; then 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" - 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 @@ -761,18 +746,17 @@ 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) + 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" - 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) else AC_MSG_WARN([no mp3dec support in para_audiod/para_filter]) fi @@ -836,22 +820,19 @@ 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) + AC_SUBST(flac_cppflags) + 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" - 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 @@ -882,10 +863,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) ] ) ], @@ -924,18 +903,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" @@ -990,19 +967,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" @@ -1041,7 +1018,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 @@ -1049,7 +1026,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 @@ -1058,19 +1035,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]) @@ -1101,17 +1076,17 @@ AC_CHECK_HEADER(samplerate.h, [], have_samplerate=no) AC_CHECK_LIB([samplerate], [src_process], [], have_samplerate=no, []) if test "$have_samplerate" = "yes"; then + AC_SUBST(samplerate_cppflags) + 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" - 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 @@ -1164,7 +1139,6 @@ if test \( "$have_openssl" = "yes" -o "$have_gcrypt" = "yes" \) \ version ggo " - server_ldflags="$server_ldflags $osl_libs -losl" else build_server="no" fi