diff options
Diffstat (limited to 'meson.build')
-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' | |||
92 | if not get_option('tray').disabled() | 92 | if not get_option('tray').disabled() |
93 | assert(get_option('auto_features').auto(), 'sd-bus-provider must not be set to auto since auto_features != auto') | 93 | assert(get_option('auto_features').auto(), 'sd-bus-provider must not be set to auto since auto_features != auto') |
94 | endif | 94 | endif |
95 | sdbus = dependency(['libsystemd', 'libelogind', 'basu'], | 95 | sdbus = dependency(['libsystemd', 'libelogind'], |
96 | required: get_option('tray'), | 96 | required: false, |
97 | version: '>=239', | 97 | version: '>=239', |
98 | ) | 98 | ) |
99 | if not sdbus.found() | ||
100 | sdbus = dependency('basu', required: false) | ||
101 | endif | ||
99 | else | 102 | else |
100 | sdbus = dependency(get_option('sd-bus-provider'), required: get_option('tray')) | 103 | sdbus = dependency(get_option('sd-bus-provider'), required: get_option('tray')) |
101 | endif | 104 | endif |
102 | 105 | ||
103 | have_tray = sdbus.found() | 106 | tray_deps_found = sdbus.found() |
107 | if get_option('tray').enabled() and not tray_deps_found | ||
108 | error('Building with -Dtray=enabled, but sd-bus has not been not found') | ||
109 | endif | ||
110 | have_tray = (not get_option('tray').disabled()) and tray_deps_found | ||
104 | 111 | ||
105 | conf_data = configuration_data() | 112 | conf_data = configuration_data() |
106 | 113 | ||