diff options
author | Tanu Kaskinen <tanuk@iki.fi> | 2012-09-22 18:16:24 +0300 |
---|---|---|
committer | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2012-12-20 12:36:17 +0530 |
commit | 3ffa0bc62afd8dbfa1d1cd5cef2177a96c461343 (patch) | |
tree | 3c89285422a68dfd4c2787f2e5c2490c3c554314 | |
parent | e5155b4f505dbc39c54944e369237202f0b42bf6 (diff) |
build: Don't enable BlueZ if libbluetooth is not found.
Previously, if libsbc was available but libbluetooth was not, BlueZ
would get incorrectly enabled.
-rw-r--r-- | configure.ac | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 3199d856..d11af11c 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"], |