X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=c39b0512c0eed22d17204937c1365e00e7b70ec4;hb=64819779cf2bf77c2323a89d61bdfeccb35a43ce;hp=b12dc1815ca5c3245c8cebe80a018c23cf54930e;hpb=b6c7050f63cb0fa16e9b0af4354e7cb065587d0b;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index b12dc181..c39b0512 100644
--- a/configure.ac
+++ b/configure.ac
@@ -666,14 +666,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 +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"
@@ -718,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
@@ -761,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