Fix pulseaudio/portaudio detection.

Originally committed to SVN as r2691.
This commit is contained in:
Amar Takhar 2009-01-13 09:43:24 +00:00
parent a194575488
commit 57bdedbaa7

View file

@ -444,10 +444,11 @@ AM_CONDITIONAL([HAVE_PORTAUDIO], [test "$with_portaudio" != "no"])
AC_ARG_WITH(pulseaudio,[ --without-pulseaudio build without PulseAudio audio provider. AC_ARG_WITH(pulseaudio,[ --without-pulseaudio build without PulseAudio audio provider.
(default: auto)], pulseaudio_disabled="(disabled)") (default: auto)], pulseaudio_disabled="(disabled)")
if test "x$with_pulseaudio" != xno; then if test "$with_pulseaudio" != "no"; then
PKG_CHECK_MODULES(LIBPULSE, libpulse >= 0.5, [found_audio=yes; with_pulseaudio=yes], [with_pulseaudio=no]) PKG_CHECK_MODULES(LIBPULSE, libpulse >= 0.5, [with_pulseaudio="yes"], [with_pulseaudio="no"])
fi fi
if test "$with_pulseaudio" != "no"; then
AC_AGI_COMPILE([PuleseAudio], [pulseaudio], [$LIBPULSE_CFLAGS], [$LIBPULSE_LIBS],[ AC_AGI_COMPILE([PuleseAudio], [pulseaudio], [$LIBPULSE_CFLAGS], [$LIBPULSE_LIBS],[
#include <pulse/pulseaudio.h> #include <pulse/pulseaudio.h>
int main(void) { int main(void) {
@ -455,16 +456,18 @@ int main(void) {
if (!mainloop) return 1; if (!mainloop) return 1;
return 0; return 0;
} ]) } ])
fi
if test "$agi_cv_with_pulseaudio" = "no" && test "$with_pulseaudio" = "yes"; then if test "$agi_cv_with_pulseaudio" = "no" && test "$with_pulseaudio" = "yes"; then
AC_MSG_WARN([PulseAudio detected, but it doesn't work...]) AC_MSG_WARN([PulseAudio detected, but it doesn't work...])
with_pulseaudio="no" with_pulseaudio="no"
else
AC_DEFINE(WITH_PULSEAUDIO, 1, [Enable PulseAudio support])
found_audio="yes"
fi fi
AM_CONDITIONAL([HAVE_PULSEAUDIO], [test "$with_pulseaudio" != "no"]) AM_CONDITIONAL([HAVE_PULSEAUDIO], [test "$with_pulseaudio" != "no"])
if test "$with_pulseaudio" = "yes"; then
AC_DEFINE(WITH_PULSEAUDIO, 1, [Enable PulseAudio support])
fi
######### #########
## OpenAL ## OpenAL