aboutsummaryrefslogtreecommitdiff
path: root/meson_options.txt
diff options
context:
space:
mode:
authorScott Anderson <scott@anderso.nz>2018-08-24 19:35:02 +1200
committerScott Anderson <scott@anderso.nz>2018-08-24 19:35:02 +1200
commitfd3fa760d336312acafeb6812b5b0068f5851f27 (patch)
tree6876337b81c01c13d53d6c4f2e3680c51fd9e204 /meson_options.txt
parent9c886f20b97b6ab1ac85b849f1fe7f16eb199ff0 (diff)
Revert "Revert "Merge pull request #1194 from ascent12/meson_feature""
This reverts commit 9c886f20b97b6ab1ac85b849f1fe7f16eb199ff0.
Diffstat (limited to 'meson_options.txt')
-rw-r--r--meson_options.txt18
1 files changed, 10 insertions, 8 deletions
diff --git a/meson_options.txt b/meson_options.txt
index e474b8aa..360c6f6a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,8 +1,10 @@
-option('enable-libcap', type: 'combo', choices: ['auto', 'true', 'false'], value: 'auto', description: 'Enable support for capabilities')
-option('enable-systemd', type: 'combo', choices: ['auto', 'true', 'false'], value: 'auto', description: 'Enable support for logind')
-option('enable-elogind', type: 'combo', choices: ['auto', 'true', 'false'], value: 'auto', description: 'Enable support for logind')
-option('enable-xcb_errors', type: 'combo', choices: ['auto', 'true', 'false'], value: 'auto', description: 'Use xcb-errors util library')
-option('enable-xwayland', type: 'boolean', value: true, description: 'Enable support X11 applications')
-option('enable-x11_backend', type: 'boolean', value: true, description: 'Enable X11 backend')
-option('enable-rootston', type: 'boolean', value: true, description: 'Build the rootston example compositor')
-option('enable-examples', type: 'boolean', value: true, description: 'Build example applications')
+option('libcap', type: 'feature', value: 'auto', description: 'Enable support for rootless session via capabilities (cap_sys_admin)')
+option('logind', type: 'feature', value: 'auto', description: 'Enable support for rootless session via logind')
+option('logind-provider', type: 'combo', choices: ['systemd', 'elogind'], value: 'systemd', description: 'Provider of logind support library')
+option('xcb-errors', type: 'feature', value: 'auto', description: 'Use xcb-errors util library')
+option('xcb-icccm', type: 'feature', value: 'auto', description: 'Use xcb-icccm util library')
+option('xcb-xkb', type: 'feature', value: 'auto', description: 'Use xcb-xkb util library')
+option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications')
+option('x11-backend', type: 'feature', value: 'auto', description: 'Enable X11 backend')
+option('rootston', type: 'boolean', value: true, description: 'Build the rootston example compositor')
+option('examples', type: 'boolean', value: true, description: 'Build example applications')