From 9c886f20b97b6ab1ac85b849f1fe7f16eb199ff0 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Thu, 23 Aug 2018 21:00:58 -0400 Subject: Revert "Merge pull request #1194 from ascent12/meson_feature" This breaks wlroots when used as a meson subproject. This reverts commit dea311992eb4ff3e343c3cf5b0603034223d2a42, reversing changes made to 6db9c4b74667c1d917d720f5e96985a2461569fb. --- meson_options.txt | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'meson_options.txt') diff --git a/meson_options.txt b/meson_options.txt index 360c6f6a..e474b8aa 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,10 +1,8 @@ -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') +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') -- cgit v1.2.3