projects
/
platform
/
upstream
/
pulseaudio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6b52b47
)
Revert "build: Merge bluez pkg-config checks into one"
author
Arun Raghavan
<arun.raghavan@collabora.co.uk>
Fri, 7 Sep 2012 18:13:57 +0000
(23:43 +0530)
committer
Arun Raghavan
<arun.raghavan@collabora.co.uk>
Fri, 7 Sep 2012 18:15:12 +0000
(23:45 +0530)
Keeping the SBC check separate means we can keep the SBC_LIBS/CFLAGS
separate, which is cleaner. Thanks to Jan Steffens for pointing out that
this was broken (SBC_* wasn't actually changed to match the configure
change).
This reverts commit
da5078e5c7762557c357da4825f8927bf3162532
.
configure.ac
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index
ca95d18
..
06923e3
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-963,7
+963,10
@@
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 sbc >= 1.0 ], HAVE_BLUEZ=1, HAVE_BLUEZ=0)],
+ [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)],
HAVE_BLUEZ=0)
AS_IF([test "x$HAVE_DBUS" != "x1"], HAVE_BLUEZ=0)