[pulseaudio-commits] configure.ac

[Arun Raghavan]

 configure.ac |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit da5078e5c7762557c357da4825f8927bf3162532
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Thu Sep 6 09:07:34 2012 -0700

    build: Merge bluez pkg-config checks into one

diff --git a/configure.ac b/configure.ac
index 06923e3..ca95d18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -963,10 +963,7 @@ 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 ], 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)],
+    [PKG_CHECK_MODULES(BLUEZ, [ bluez >= 3.0 sbc >= 1.0 ], HAVE_BLUEZ=1, HAVE_BLUEZ=0)],
     HAVE_BLUEZ=0)
 AS_IF([test "x$HAVE_DBUS" != "x1"], HAVE_BLUEZ=0)