changeset 4296:f9fb7284991d SDL-1.2

Debian patch: 030_pulseaudio_enable.diff
author Sam Lantinga <slouken@libsdl.org>
date Sat, 10 Oct 2009 08:50:35 +0000
parents d62725f761a1
children 27fe0dd48269
files configure.in
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Sat Oct 10 08:46:06 2009 +0000
+++ b/configure.in	Sat Oct 10 08:50:35 2009 +0000
@@ -490,8 +490,8 @@
 {
     AC_ARG_ENABLE(pulseaudio,
 AC_HELP_STRING([--enable-pulseaudio], [use PulseAudio [[default=yes]]]),
-                  , enable_pulse=yes)
-    if test x$enable_audio = xyes -a x$enable_pulse = xyes; then
+                  , enable_pulseaudio=yes)
+    if test x$enable_audio = xyes -a x$enable_pulseaudio = xyes; then
         audio_pulse=no
 
         PULSE_REQUIRED_VERSION=0.9
@@ -510,7 +510,7 @@
         if test x$audio_pulse = xyes; then
             AC_ARG_ENABLE(pulseaudio-shared,
 AC_HELP_STRING([--enable-pulseaudio-shared], [dynamically load PulseAudio support [[default=yes]]]),
-                          , enable_pulse_shared=yes)
+                          , enable_pulseaudio_shared=yes)
             if test "x`echo $PULSE_LIBS | grep -- -L`" = "x"; then
                 if test "x`ls /$base_libdir/libpulse-simple.so.* 2> /dev/null`" != "x"; then
                     PULSE_LIBS="-L/$base_libdir $PULSE_LIBS"
@@ -531,11 +531,11 @@
             SOURCES="$SOURCES $srcdir/src/audio/pulse/*.c"
             EXTRA_CFLAGS="$EXTRA_CFLAGS $PULSE_CFLAGS"
             if test x$have_loadso != xyes && \
-               test x$enable_pulse_shared = xyes; then
+               test x$enable_pulseaudio_shared = xyes; then
                 AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic PulseAudio loading])
             fi
             if test x$have_loadso = xyes && \
-               test x$enable_pulse_shared = xyes && test x$pulse_lib != x; then
+               test x$enable_pulseaudio_shared = xyes && test x$pulse_lib != x; then
                 AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_PULSE_DYNAMIC, "$pulse_lib")
             else
                 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PULSE_LIBS"