[pulseaudio-discuss] [PATCH 18/56] build: Load the right modules depending on the BlueZ version

[jprvita at gmail.com]

From: João Paulo Rechi Vita <jprvita at openbossa.org>

Support for BlueZ 4 is built only when bluez.pc is present on the target
system, and that is a big hint that we should load the BlueZ 4 modules.
On all other cases we can try to load the BlueZ 5 modules.
---
 src/daemon/default.pa.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 19dd8a6..9a7fa40 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -85,15 +85,20 @@ load-module module-jackdbus-detect channels=2
 .fail
 .endif
 
-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
 .endif
+ifelse(@HAVE_BLUEZ_4@, 1, [dnl
 
 .ifexists module-bluez4-discover at PA_SOEXT@
 load-module module-bluez4-discover
 .endif
+], [dnl
+
+.ifexists module-bluez5-discover at PA_SOEXT@
+load-module module-bluez5-discover
+.endif
 ])dnl
 
 ifelse(@HAVE_AF_UNIX@, 1, [dnl
-- 
1.7.11.7