[pulseaudio-commits] configure.ac

[Arun Raghavan]

 configure.ac |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 3e3c9ef67be16d0cb8a615b85449654865d19bf3
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Fri Sep 7 23:43:57 2012 +0530

    Revert "build: Merge bluez pkg-config checks into one"
    
    Keeping the SBC check separate means we can keep the SBC_LIBS/CFLAGS
    separate, which is cleaner. Thanks to Jan Steffens for pointing out that
    this was broken (SBC_* wasn't actually changed to match the configure
    change).
    
    This reverts commit da5078e5c7762557c357da4825f8927bf3162532.

diff --git a/configure.ac b/configure.ac
index ca95d18..06923e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -963,7 +963,10 @@ AC_ARG_ENABLE([bluez],
     AS_HELP_STRING([--disable-bluez],[Disable optional BlueZ support]))
 
 AS_IF([test "x$enable_bluez" != "xno"],
-    [PKG_CHECK_MODULES(BLUEZ, [ bluez >= 3.0 sbc >= 1.0 ], HAVE_BLUEZ=1, HAVE_BLUEZ=0)],
+    [PKG_CHECK_MODULES(BLUEZ, [ bluez >= 3.0 ], HAVE_BLUEZ=1, HAVE_BLUEZ=0)],
+    HAVE_BLUEZ=0)
+AS_IF([test "x$enable_bluez" != "xno"],
+    [PKG_CHECK_MODULES(SBC, [ sbc >= 1.0 ], HAVE_BLUEZ=1, HAVE_BLUEZ=0)],
     HAVE_BLUEZ=0)
 AS_IF([test "x$HAVE_DBUS" != "x1"], HAVE_BLUEZ=0)