diff --git a/meson.build b/meson.build index 842d5f5b5..c51ec24ec 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 e54caf5cf..09873ddd2 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 5be90f2d6..8562bdfa9 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' ],