[pulseaudio-commits] configure.ac

[Tanu Kaskinen]

 configure.ac |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 68d2bcccd7a6d27d7d9d8155a54f8b7d35dd7ab4
Author: Tanu Kaskinen <tanuk at iki.fi>
Date:   Sat Sep 22 18:16:24 2012 +0300

    build: Don't enable BlueZ if libbluetooth is not found.
    
    Previously, if libsbc was available but libbluetooth was not, BlueZ
    would get incorrectly enabled.

diff --git a/configure.ac b/configure.ac
index 3199d85..d11af11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1007,8 +1007,9 @@ AS_IF([test "x$enable_bluez" != "xno"],
     [PKG_CHECK_MODULES(BLUEZ, [ bluez >= 4.99 ], 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)
+    [PKG_CHECK_MODULES(SBC, [ sbc >= 1.0 ], HAVE_SBC=1, HAVE_SBC=0)],
+    HAVE_SBC=0)
+AS_IF([test "x$HAVE_SBC" != "x1"], HAVE_BLUEZ=0)
 AS_IF([test "x$HAVE_DBUS" != "x1"], HAVE_BLUEZ=0)
 
 AS_IF([test "x$enable_bluez" = "xyes" && test "x$HAVE_BLUEZ" = "x0"],