X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=bbd07609258970ab998745429e7b14ad8c1a4042;hp=82a0d8cb4e2cf3d7594cc5d4684f115fa748b065;hb=7de07ae2e268280bf63decf60c287f060883f8e3;hpb=8ee71345ece2e781ffa955498fd90283260a5403 diff --git a/configure.ac b/configure.ac index 82a0d8cb..bbd07609 100644 --- a/configure.ac +++ b/configure.ac @@ -708,6 +708,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" @@ -715,17 +719,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 @@ -758,18 +754,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 @@ -833,22 +828,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 @@ -879,10 +871,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) ] ) ], @@ -921,18 +911,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" @@ -987,19 +975,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" @@ -1038,7 +1026,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 @@ -1046,7 +1034,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 @@ -1055,19 +1043,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])