Rex Dieter 7cae8c3
From 3ffa0bc62afd8dbfa1d1cd5cef2177a96c461343 Mon Sep 17 00:00:00 2001
Rex Dieter 7cae8c3
From: Tanu Kaskinen <tanuk@iki.fi>
Rex Dieter 7cae8c3
Date: Sat, 22 Sep 2012 18:16:24 +0300
Rex Dieter 7cae8c3
Subject: [PATCH 3/7] build: Don't enable BlueZ if libbluetooth is not found.
Rex Dieter 7cae8c3
Rex Dieter 7cae8c3
Previously, if libsbc was available but libbluetooth was not, BlueZ
Rex Dieter 7cae8c3
would get incorrectly enabled.
Rex Dieter 7cae8c3
---
Rex Dieter 7cae8c3
 configure.ac | 5 +++--
Rex Dieter 7cae8c3
 1 file changed, 3 insertions(+), 2 deletions(-)
Rex Dieter 7cae8c3
Rex Dieter 7cae8c3
diff --git a/configure.ac b/configure.ac
Rex Dieter 7cae8c3
index 3199d85..d11af11 100644
Rex Dieter 7cae8c3
--- a/configure.ac
Rex Dieter 7cae8c3
+++ b/configure.ac
Rex Dieter 7cae8c3
@@ -1007,8 +1007,9 @@ AS_IF([test "x$enable_bluez" != "xno"],
Rex Dieter 7cae8c3
     [PKG_CHECK_MODULES(BLUEZ, [ bluez >= 4.99 ], HAVE_BLUEZ=1, HAVE_BLUEZ=0)],
Rex Dieter 7cae8c3
     HAVE_BLUEZ=0)
Rex Dieter 7cae8c3
 AS_IF([test "x$enable_bluez" != "xno"],
Rex Dieter 7cae8c3
-    [PKG_CHECK_MODULES(SBC, [ sbc >= 1.0 ], HAVE_BLUEZ=1, HAVE_BLUEZ=0)],
Rex Dieter 7cae8c3
-    HAVE_BLUEZ=0)
Rex Dieter 7cae8c3
+    [PKG_CHECK_MODULES(SBC, [ sbc >= 1.0 ], HAVE_SBC=1, HAVE_SBC=0)],
Rex Dieter 7cae8c3
+    HAVE_SBC=0)
Rex Dieter 7cae8c3
+AS_IF([test "x$HAVE_SBC" != "x1"], HAVE_BLUEZ=0)
Rex Dieter 7cae8c3
 AS_IF([test "x$HAVE_DBUS" != "x1"], HAVE_BLUEZ=0)
Rex Dieter 7cae8c3
 
Rex Dieter 7cae8c3
 AS_IF([test "x$enable_bluez" = "xyes" && test "x$HAVE_BLUEZ" = "x0"],
Rex Dieter 7cae8c3
-- 
Rex Dieter 7cae8c3
1.8.1.4
Rex Dieter 7cae8c3