]> code.delx.au - pulseaudio/commitdiff
build: Don't enable BlueZ if libbluetooth is not found.
authorTanu Kaskinen <tanuk@iki.fi>
Sat, 22 Sep 2012 15:16:24 +0000 (18:16 +0300)
committerTanu Kaskinen <tanuk@iki.fi>
Thu, 20 Dec 2012 06:24:47 +0000 (08:24 +0200)
Previously, if libsbc was available but libbluetooth was not, BlueZ
would get incorrectly enabled.

configure.ac

index 3199d8563abec3249840b12fbf2a8d1e142d81b6..d11af11cd3acd9efdcf987f6f6b600e153bbc676 100644 (file)
@@ -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"],