From 2d1df509f470fe7cdb35de8d02ec30b1d6db0ad2 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Thu, 21 Jun 2007 20:41:17 +0000 Subject: [PATCH] fix auto* library referencing Originally committed to SVN as r1282. --- aegisub/Makefile.am | 3 --- configure.ac | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/aegisub/Makefile.am b/aegisub/Makefile.am index 834b66563..d368fb5d5 100644 --- a/aegisub/Makefile.am +++ b/aegisub/Makefile.am @@ -26,15 +26,12 @@ endif AUDIO_PLAYER=audio_player.cpp if HAVE_PORTAUDIO AUDIO_PLAYER += audio_player_portaudio.cpp -aegisub_LDFLAGS += -lportaudio endif if HAVE_ALSA AUDIO_PLAYER += audio_player_alsa.cpp -aegisub_LDFLAGS += -lasound endif if HAVE_PULSEAUDIO AUDIO_PLAYER += audio_player_pulse.cpp -aegisub_LDFLAGS += -lpulse endif AUTOMATION = auto4_base.cpp diff --git a/configure.ac b/configure.ac index 38adc39b8..494a5dc21 100644 --- a/configure.ac +++ b/configure.ac @@ -66,8 +66,8 @@ EOM ]) -AC_CHECK_LIB([asound], [snd_pcm_open], [found_audio=yes], [with_alsa=no]) -AC_CHECK_LIB([portaudio], [Pa_Initialize], [found_audio=yes], [with_portaudio=no]) +AC_CHECK_LIB([asound], [snd_pcm_open], [LIBS="-lasound $LIBS"; found_audio=yes], [with_alsa=no]) +AC_CHECK_LIB([portaudio], [Pa_Initialize], [LIBS="-lportaudio $LIBS";found_audio=yes], [with_portaudio=no]) AC_CHECK_FUNCS([Pa_GetStreamTime]) PKG_CHECK_MODULES([LIBPULSE], libpulse >= 0.5, [found_audio=yes], [with_pulseaudio=no]) AC_CHECK_LIB([avcodec], [avcodec_init],, [with_ffmpeg=no]) @@ -110,8 +110,8 @@ else AC_MSG_XFAILURE([wxWidgets is required. Try --with-wx-config.]) fi -CPPFLAGS="$CPPFLAGS `$WXCONFIG --cppflags | sed -e 's/-fno-exceptions//'` $FREETYPE_CFLAGS" -LIBS="$LIBS `$WXCONFIG --libs std,gl,stc` $FREETYPE_LIBS" +CPPFLAGS="$CPPFLAGS `$WXCONFIG --cppflags | sed -e 's/-fno-exceptions//'` $FREETYPE_CFLAGS $LIBPULSE_CFLAGS" +LIBS="$LIBS `$WXCONFIG --libs std,gl,stc` $FREETYPE_LIBS $LIBPULSE_LIBS" AC_MSG_CHECKING([wxWidgets OpenGL support]) AC_LINK_IFELSE([