From: Jo?o Paulo Rechi Vita <jprvita@xxxxxxxxxxxxx>
---
configure.ac | 28 ++++++++++++++--------------
src/Makefile.am | 8 ++++----
src/daemon/default.pa.in | 2 +-
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0ef0645..3533117 100644
--- a/configure.ac
+++ b/configure.ac
@@ -981,23 +981,23 @@ AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK,
#### BlueZ support (optional, dependent on D-Bus) ####
-AC_ARG_ENABLE([bluez],
- AS_HELP_STRING([--disable-bluez],[Disable optional BlueZ support]))
+AC_ARG_ENABLE([bluez4],
+ AS_HELP_STRING([--disable-bluez4],[Disable optional BlueZ 4 support]))
-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"],
+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"],
[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$HAVE_SBC" != "x1"], HAVE_BLUEZ_4=0)
+AS_IF([test "x$HAVE_DBUS" != "x1"], HAVE_BLUEZ_4=0)
-AS_IF([test "x$enable_bluez" = "xyes" && test "x$HAVE_BLUEZ" = "x0"],
- [AC_MSG_ERROR([*** BLUEZ support not found (requires BlueZ, sbc, and D-Bus)])])
+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)
-AM_CONDITIONAL([HAVE_BLUEZ], [test "x$HAVE_BLUEZ" = x1])
+AC_SUBST(HAVE_BLUEZ_4)
+AM_CONDITIONAL([HAVE_BLUEZ_4], [test "x$HAVE_BLUEZ_4" = x1])
#### UDEV support (optional) ####
@@ -1389,7 +1389,7 @@ AS_IF([test "x$HAVE_XEN" = "x1"], ENABLE_XEN=yes, ENABLE_XEN=no)
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" = "x1"], ENABLE_BLUEZ=yes, ENABLE_BLUEZ=no)
+AS_IF([test "x$HAVE_BLUEZ_4" = "x1"], ENABLE_BLUEZ_4=yes, ENABLE_BLUEZ_4=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)
@@ -1440,7 +1440,7 @@ echo "
Enable LIRC: ${ENABLE_LIRC}
Enable Xen PV driver: ${ENABLE_XEN}
Enable D-Bus: ${ENABLE_DBUS}
- Enable BlueZ: ${ENABLE_BLUEZ}
+ Enable BlueZ 4: ${ENABLE_BLUEZ_4}
Enable udev: ${ENABLE_UDEV}
Enable HAL->udev compat: ${ENABLE_HAL_COMPAT}
Enable systemd login: ${ENABLE_SYSTEMD}
diff --git a/src/Makefile.am b/src/Makefile.am
index ff37877..b9a59b1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1318,7 +1318,7 @@ modlibexec_LTLIBRARIES += \
module-dbus-protocol.la
endif
-if HAVE_BLUEZ
+if HAVE_BLUEZ_4
modlibexec_LTLIBRARIES += \
module-bluetooth-proximity.la \
module-bluetooth-policy.la \
@@ -2012,8 +2012,8 @@ module_bluetooth_proximity_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS)
module_bluetooth_proximity_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -DPA_BT_PROXIMITY_HELPER=\"$(pulselibexecdir)/proximity-helper\"
proximity_helper_SOURCES = modules/bluetooth/proximity-helper.c
-proximity_helper_LDADD = $(AM_LDADD) $(BLUEZ_LIBS)
-proximity_helper_CFLAGS = $(AM_CFLAGS) $(BLUEZ_CFLAGS)
+proximity_helper_LDADD = $(AM_LDADD) $(BLUEZ_4_LIBS)
+proximity_helper_CFLAGS = $(AM_CFLAGS) $(BLUEZ_4_CFLAGS)
proximity_helper_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
# Bluetooth BlueZ 4 sink / source
@@ -2070,7 +2070,7 @@ else
SYMLINK_PROGRAM=ln -sf
endif
install-exec-hook:
-if HAVE_BLUEZ
+if HAVE_BLUEZ_4
-chown root $(DESTDIR)$(pulselibexecdir)/proximity-helper
-chmod u+s $(DESTDIR)$(pulselibexecdir)/proximity-helper
endif
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 80fa6b9..19dd8a6 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -85,7 +85,7 @@ load-module module-jackdbus-detect channels=2
.fail
.endif
-ifelse(@HAVE_BLUEZ@, 1, [dnl
+ifelse(@HAVE_BLUEZ_4@, 1, [dnl
### Automatically load driver modules for Bluetooth hardware
.ifexists module-bluetooth-policy at PA_SOEXT@
load-module module-bluetooth-policy
--
1.7.11.7
