[pulseaudio-discuss] [PATCH 17/56] build: Add support for enabling/disabling BlueZ 5 support
jprvita at gmail.com
jprvita at gmail.com
Fri Jul 12 11:06:32 PDT 2013
From: João Paulo Rechi Vita <jprvita at openbossa.org>
---
configure.ac | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3533117..38ef6c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -979,26 +979,35 @@ PA_MACHINE_ID_FALLBACK="${localstatedir}/lib/dbus/machine-id"
AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK,
[Fallback machine-id file])
-#### BlueZ support (optional, dependent on D-Bus) ####
+#### BlueZ support (optional, dependent on D-Bus and SBC) ####
AC_ARG_ENABLE([bluez4],
AS_HELP_STRING([--disable-bluez4],[Disable optional BlueZ 4 support]))
+AC_ARG_ENABLE([bluez5],
+ AS_HELP_STRING([--disable-bluez5],[Disable optional BlueZ 5 support]))
-AS_IF([test "x$enable_bluez4" != "xno"],
- [PKG_CHECK_MODULES(BLUEZ_4, [ bluez >= 4.99 bluez < 5.0 ], HAVE_BLUEZ_4=1, HAVE_BLUEZ_4=0)],
- HAVE_BLUEZ_4=0)
-AS_IF([test "x$enable_bluez4" != "xno"],
+## SBC ##
+AS_IF([test "x$enable_bluez4" != "xno" || test "x$enable_bluez5" != "xno"],
[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_4=0)
-AS_IF([test "x$HAVE_DBUS" != "x1"], HAVE_BLUEZ_4=0)
+## BlueZ 4 ##
+AS_IF([test "x$enable_bluez4" != "xno"],
+ [PKG_CHECK_MODULES(BLUEZ_4, [ bluez >= 4.99 bluez < 5.0 ], HAVE_BLUEZ_4=1, HAVE_BLUEZ_4=0)],
+ HAVE_BLUEZ_4=0)
+AS_IF([test "x$HAVE_DBUS" != "x1" || test "x$HAVE_SBC" != "x1"], HAVE_BLUEZ_4=0)
AS_IF([test "x$enable_bluez4" = "xyes" && test "x$HAVE_BLUEZ_4" = "x0"],
[AC_MSG_ERROR([*** BLUEZ 4 support not found (requires bluez >= 4.99 and < 5.0, sbc, and D-Bus)])])
-
AC_SUBST(HAVE_BLUEZ_4)
AM_CONDITIONAL([HAVE_BLUEZ_4], [test "x$HAVE_BLUEZ_4" = x1])
+## BlueZ 5 ##
+AS_IF([test "x$enable_bluez5" != "xno" && test "x$HAVE_DBUS" = "x1" && test "x$HAVE_SBC" = "x1"], HAVE_BLUEZ_5=1)
+AS_IF([test "x$enable_bluez5" = "xyes" && test "x$HAVE_BLUEZ_5" != "x1"],
+ [AC_MSG_ERROR([*** BLUEZ 5 support not found (requires sbc and D-Bus)])])
+AC_SUBST(HAVE_BLUEZ_5)
+AM_CONDITIONAL([HAVE_BLUEZ_5], [test "x$HAVE_BLUEZ_5" = x1])
+
#### UDEV support (optional) ####
AC_ARG_ENABLE([udev],
@@ -1390,6 +1399,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], ENABLE_DBUS=yes, ENABLE_DBUS=no)
AS_IF([test "x$HAVE_UDEV" = "x1"], ENABLE_UDEV=yes, ENABLE_UDEV=no)
AS_IF([test "x$HAVE_SYSTEMD" = "x1"], ENABLE_SYSTEMD=yes, ENABLE_SYSTEMD=no)
AS_IF([test "x$HAVE_BLUEZ_4" = "x1"], ENABLE_BLUEZ_4=yes, ENABLE_BLUEZ_4=no)
+AS_IF([test "x$HAVE_BLUEZ_5" = "x1"], ENABLE_BLUEZ_5=yes, ENABLE_BLUEZ_5=no)
AS_IF([test "x$HAVE_HAL_COMPAT" = "x1"], ENABLE_HAL_COMPAT=yes, ENABLE_HAL_COMPAT=no)
AS_IF([test "x$HAVE_TCPWRAP" = "x1"], ENABLE_TCPWRAP=yes, ENABLE_TCPWRAP=no)
AS_IF([test "x$HAVE_LIBSAMPLERATE" = "x1"], ENABLE_LIBSAMPLERATE=yes, ENABLE_LIBSAMPLERATE=no)
@@ -1441,6 +1451,7 @@ echo "
Enable Xen PV driver: ${ENABLE_XEN}
Enable D-Bus: ${ENABLE_DBUS}
Enable BlueZ 4: ${ENABLE_BLUEZ_4}
+ Enable BlueZ 5: ${ENABLE_BLUEZ_5}
Enable udev: ${ENABLE_UDEV}
Enable HAL->udev compat: ${ENABLE_HAL_COMPAT}
Enable systemd login: ${ENABLE_SYSTEMD}
--
1.7.11.7
More information about the pulseaudio-discuss
mailing list