diff options
| author | Kirill Chibisov <contact@kchibisov.com> | 2022-01-10 17:54:24 +0300 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2022-01-12 17:25:34 +0100 |
| commit | dbaf2e4fdb327f05f792b69430fe6f893fc9d879 (patch) | |
| tree | 8e48fdd24e0c8f7b172f0184419ae5eb41ce7421 | |
| parent | aa443629b58e1d3d10cf64e689b661c076808d66 (diff) | |
| download | sway-dbaf2e4fdb327f05f792b69430fe6f893fc9d879.tar.xz | |
build: fix building with basu
02b412a introduced the use of list for sdbus deps, however
it was assuming that all packages which were in a list has a version
higher than 239. That is true for libsystemd and libelogind, since they
use the same versions, however basu is using version numbers which are
way lower than what libsystemd/libelogind are using, so basu only build
is failing.
| -rw-r--r-- | meson.build | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 0182b8f0..b226ac83 100644 --- a/meson.build +++ b/meson.build @@ -92,15 +92,22 @@ if get_option('sd-bus-provider') == 'auto' if not get_option('tray').disabled() assert(get_option('auto_features').auto(), 'sd-bus-provider must not be set to auto since auto_features != auto') endif - sdbus = dependency(['libsystemd', 'libelogind', 'basu'], - required: get_option('tray'), + sdbus = dependency(['libsystemd', 'libelogind'], + required: false, version: '>=239', ) + if not sdbus.found() + sdbus = dependency('basu', required: false) + endif else sdbus = dependency(get_option('sd-bus-provider'), required: get_option('tray')) endif -have_tray = sdbus.found() +tray_deps_found = sdbus.found() +if get_option('tray').enabled() and not tray_deps_found + error('Building with -Dtray=enabled, but sd-bus has not been not found') +endif +have_tray = (not get_option('tray').disabled()) and tray_deps_found conf_data = configuration_data() |