diff options
-rw-r--r-- | include/swaybar/tray/tray.h | 2 | ||||
-rw-r--r-- | meson.build | 5 | ||||
-rw-r--r-- | meson_options.txt | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/include/swaybar/tray/tray.h b/include/swaybar/tray/tray.h index b5df0025..a64cd9c8 100644 --- a/include/swaybar/tray/tray.h +++ b/include/swaybar/tray/tray.h | |||
@@ -6,6 +6,8 @@ | |||
6 | #include <systemd/sd-bus.h> | 6 | #include <systemd/sd-bus.h> |
7 | #elif HAVE_LIBELOGIND | 7 | #elif HAVE_LIBELOGIND |
8 | #include <elogind/sd-bus.h> | 8 | #include <elogind/sd-bus.h> |
9 | #elif HAVE_BASU | ||
10 | #include <basu/sd-bus.h> | ||
9 | #endif | 11 | #endif |
10 | #include <cairo.h> | 12 | #include <cairo.h> |
11 | #include <stdint.h> | 13 | #include <stdint.h> |
diff --git a/meson.build b/meson.build index 9842d78a..38a55678 100644 --- a/meson.build +++ b/meson.build | |||
@@ -104,8 +104,12 @@ if get_option('sd-bus-provider') == 'auto' | |||
104 | sdbus = dependency('libelogind', | 104 | sdbus = dependency('libelogind', |
105 | required: false, | 105 | required: false, |
106 | version: '>=239', | 106 | version: '>=239', |
107 | not_found_message: 'libelogind not found, trying basu', | ||
107 | ) | 108 | ) |
108 | endif | 109 | endif |
110 | if not sdbus.found() | ||
111 | sdbus = dependency('basu', required: false) | ||
112 | endif | ||
109 | else | 113 | else |
110 | sdbus = dependency(get_option('sd-bus-provider'), required: get_option('tray')) | 114 | sdbus = dependency(get_option('sd-bus-provider'), required: get_option('tray')) |
111 | endif | 115 | endif |
@@ -122,6 +126,7 @@ conf_data.set10('HAVE_XWAYLAND', have_xwayland) | |||
122 | conf_data.set10('HAVE_GDK_PIXBUF', gdk_pixbuf.found()) | 126 | conf_data.set10('HAVE_GDK_PIXBUF', gdk_pixbuf.found()) |
123 | conf_data.set10('HAVE_LIBSYSTEMD', sdbus.found() and sdbus.name() == 'libsystemd') | 127 | conf_data.set10('HAVE_LIBSYSTEMD', sdbus.found() and sdbus.name() == 'libsystemd') |
124 | conf_data.set10('HAVE_LIBELOGIND', sdbus.found() and sdbus.name() == 'libelogind') | 128 | conf_data.set10('HAVE_LIBELOGIND', sdbus.found() and sdbus.name() == 'libelogind') |
129 | conf_data.set10('HAVE_BASU', sdbus.found() and sdbus.name() == 'basu') | ||
125 | conf_data.set10('HAVE_TRAY', have_tray) | 130 | conf_data.set10('HAVE_TRAY', have_tray) |
126 | 131 | ||
127 | scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages')) | 132 | scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages')) |
diff --git a/meson_options.txt b/meson_options.txt index 66c6d268..e36900b6 100644 --- a/meson_options.txt +++ b/meson_options.txt | |||
@@ -6,4 +6,4 @@ option('xwayland', type: 'feature', value: 'auto', description: 'Enable support | |||
6 | option('tray', type: 'feature', value: 'auto', description: 'Enable support for swaybar tray') | 6 | option('tray', type: 'feature', value: 'auto', description: 'Enable support for swaybar tray') |
7 | option('gdk-pixbuf', type: 'feature', value: 'auto', description: 'Enable support for more image formats in swaybg') | 7 | option('gdk-pixbuf', type: 'feature', value: 'auto', description: 'Enable support for more image formats in swaybg') |
8 | option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages') | 8 | option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages') |
9 | option('sd-bus-provider', type: 'combo', choices: ['auto', 'libsystemd', 'libelogind'], value: 'auto', description: 'Provider of the sd-bus library') | 9 | option('sd-bus-provider', type: 'combo', choices: ['auto', 'libsystemd', 'libelogind', 'basu'], value: 'auto', description: 'Provider of the sd-bus library') |