diff options
author | Drew DeVault <sir@cmpwn.com> | 2019-02-27 16:00:28 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-27 16:00:28 -0500 |
commit | aea33551fb517a47533b87338da1ccb8a3f0c1a5 (patch) | |
tree | e0d5735a7f6e40114673234838c9e08f287958bf | |
parent | config: remove double assignement to result in get_output_config (diff) | |
parent | Print Meson features (diff) | |
download | sway-aea33551fb517a47533b87338da1ccb8a3f0c1a5.tar.gz sway-aea33551fb517a47533b87338da1ccb8a3f0c1a5.tar.zst sway-aea33551fb517a47533b87338da1ccb8a3f0c1a5.zip |
Merge pull request #3787 from emersion/meson-print-features
Print Meson features
-rw-r--r-- | meson.build | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/meson.build b/meson.build index d3172bdd..3c3c1f41 100644 --- a/meson.build +++ b/meson.build | |||
@@ -93,11 +93,6 @@ conf_data.set10('HAVE_SYSTEMD', systemd.found()) | |||
93 | conf_data.set10('HAVE_ELOGIND', elogind.found()) | 93 | conf_data.set10('HAVE_ELOGIND', elogind.found()) |
94 | conf_data.set10('HAVE_TRAY', have_tray) | 94 | conf_data.set10('HAVE_TRAY', have_tray) |
95 | 95 | ||
96 | if not systemd.found() and not elogind.found() | ||
97 | warning('The sway binary must be setuid when compiled without (e)logind') | ||
98 | warning('You must do this manually post-install: chmod a+s /path/to/sway') | ||
99 | endif | ||
100 | |||
101 | scdoc = find_program('scdoc', required: get_option('man-pages')) | 96 | scdoc = find_program('scdoc', required: get_option('man-pages')) |
102 | if scdoc.found() | 97 | if scdoc.found() |
103 | sh = find_program('sh') | 98 | sh = find_program('sh') |
@@ -235,3 +230,21 @@ if get_option('fish-completions') | |||
235 | 230 | ||
236 | install_data(fish_files, install_dir: fish_install_dir) | 231 | install_data(fish_files, install_dir: fish_install_dir) |
237 | endif | 232 | endif |
233 | |||
234 | status = [ | ||
235 | '', | ||
236 | 'Features:', | ||
237 | 'xwayland: @0@'.format(have_xwayland), | ||
238 | 'gdk-pixbuf: @0@'.format(gdk_pixbuf.found()), | ||
239 | 'systemd: @0@'.format(systemd.found()), | ||
240 | 'elogind: @0@'.format(elogind.found()), | ||
241 | 'tray: @0@'.format(have_tray), | ||
242 | 'man-pages: @0@'.format(scdoc.found()), | ||
243 | '', | ||
244 | ] | ||
245 | message('\n'.join(status)) | ||
246 | |||
247 | if not systemd.found() and not elogind.found() | ||
248 | warning('The sway binary must be setuid when compiled without (e)logind') | ||
249 | warning('You must do this manually post-install: chmod a+s /path/to/sway') | ||
250 | endif | ||