From b6661ec3a4f23398478441eadb8ad58279f55f0a Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Wed, 14 Jan 2009 04:58:35 +0000 Subject: [PATCH] Re-format PulseAudio detection block. (legacy) Originally committed to SVN as r2692. --- configure.in | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/configure.in b/configure.in index 7851fc3eb..9e2967d5f 100644 --- a/configure.in +++ b/configure.in @@ -474,11 +474,12 @@ AM_CONDITIONAL([HAVE_PULSEAUDIO], [test "$with_pulseaudio" != "no"]) ######### AC_ARG_WITH(openal,[ --without-openal build without OpenAL audio provider. (default: auto)], openal_disabled="(disabled)") -if test "x$with_openal" != xno; then - PKG_CHECK_MODULES(OPENAL, openal >= 0.0.8, [found_audio=yes; with_openal=yes], [with_openal=no]) +if test "$with_openal" != "no"; then + PKG_CHECK_MODULES(OPENAL, openal >= 0.0.8, [with_openal=yes], [with_openal=no]) fi -AC_AGI_COMPILE([OpenAL], [openal], [$OPENAL_CFLAGS], [$OPENAL_LIBS],[ +if test "$with_openal" != "no"; then + AC_AGI_COMPILE([OpenAL], [openal], [$OPENAL_CFLAGS], [$OPENAL_LIBS],[ #if defined(__APPLE__) #include #include @@ -492,18 +493,18 @@ int main(void) { ALCcontext *context = alcCreateContext(device, 0); if (!context) return 1; return 0; -}]) +} ]) +fi if test "$agi_cv_with_openal" = "no" && test "$with_openal" = "yes"; then AC_MSG_WARN([OpenAL detected, but it doesn't work...]) with_openal="no" -fi - -AM_CONDITIONAL([HAVE_OPENAL], [test "$with_openal" != "no"]) -if test "$with_openal" = "yes"; then +else + found_audio="yes" AC_DEFINE(WITH_OPENAL, 1, [Enable OpenAL support]) fi +AM_CONDITIONAL([HAVE_OPENAL], [test "$with_openal" != "no"]) #########################