diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2019-08-13 17:08:13 +0200 |
|---|---|---|
| committer | Lucas Stach <l.stach@pengutronix.de> | 2019-08-14 10:16:34 +0200 |
| commit | 1911ef16e2f40419bd3525964bd3cb2434060f54 (patch) | |
| tree | f4fdd258b3716a93b7fb90f19862f1e25fa512eb | |
| parent | eb70672c561695c40b95b0113bf4981554cbd5ec (diff) | |
| download | pulseaudio-1911ef16e2f40419bd3525964bd3cb2434060f54.tar.gz | |
meson: allow to build bluez support without libbluetooth
pulseaudio does not link against libbluetooth, as it's only talking to the
bluez daemon over dbus. So the build dependency on libbluetooth is overly
restrictive, as some embedded systems choose to ship without libbluetooth
but still have bluez daemon support.
This syncs the meson to the autotools configuration behavior by changing
the bluez option to a default on boolean.
| -rw-r--r-- | meson.build | 5 | ||||
| -rw-r--r-- | meson_options.txt | 2 | ||||
| -rw-r--r-- | src/modules/meson.build | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/meson.build b/meson.build index 842d5f5b..c51ec24e 100644 --- a/meson.build +++ b/meson.build @@ -510,9 +510,8 @@ if avahi_dep.found() cdata.set('HAVE_AVAHI', 1) endif -bluez_dep = dependency('bluez', version : '>= 5.0', required : get_option('bluez5')) sbc_dep = dependency('sbc', version : '>= 1.0', required : false) -if bluez_dep.found() +if get_option('bluez5') assert(dbus_dep.found(), 'BlueZ requires D-Bus support') assert(sbc_dep.found(), 'BlueZ requires SBC support') cdata.set('HAVE_SBC', 1) @@ -695,7 +694,7 @@ summary = [ 'Enable Async DNS: @0@'.format(asyncns_dep.found()), 'Enable LIRC: @0@'.format(lirc_dep.found()), 'Enable D-Bus: @0@'.format(dbus_dep.found()), - ' Enable BlueZ 5: @0@'.format(bluez_dep.found()), + ' Enable BlueZ 5: @0@'.format(get_option('bluez5')), ' Enable native headsets: @0@'.format(get_option('bluez5-native-headset')), ' Enable ofono headsets: @0@'.format(get_option('bluez5-ofono-headset')), 'Enable udev: @0@'.format(udev_dep.found()), diff --git a/meson_options.txt b/meson_options.txt index e54caf5c..09873ddd 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -67,7 +67,7 @@ option('avahi', type : 'feature', value : 'auto', description : 'Optional Avahi support') option('bluez5', - type : 'feature', value : 'auto', + type : 'boolean', value : 'true', description : 'Optional BlueZ 5 support') option('bluez5-native-headset', type : 'boolean', diff --git a/src/modules/meson.build b/src/modules/meson.build index 5be90f2d..8562bdfa 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -101,7 +101,7 @@ if avahi_dep.found() ] endif -if bluez_dep.found() +if get_option('bluez5') subdir('bluetooth') all_modules += [ [ 'module-bluetooth-discover', 'bluetooth/module-bluetooth-discover.c' ], |