X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=configure.ac;h=d7ec1c6e22b4c91e838e5c0257b24f1653356821;hb=37083ef61b5d9d8406995de57e4b6319f46436a5;hp=1a22fd07f21b3cb11f5b6fa387985ac6f16d2bff;hpb=e74262169a3b7124d73d330494569b87b2ce915d;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index 1a22fd07..d7ec1c6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -871,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)
 		]
 	)
 	],
@@ -913,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"
@@ -979,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"
@@ -1030,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
@@ -1038,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
@@ -1047,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])
@@ -1090,17 +1084,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