From 161ae2fcb41e1a5e8fbc56a375b332ec63c47bf2 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Sat, 10 Feb 2018 10:46:27 +0100 Subject: meson build: make enable options work as auto/true/false This makes meson fail if -Denable_systemd=true was set but not found The default is now auto which is the old behaviour --- meson_options.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meson_options.txt') diff --git a/meson_options.txt b/meson_options.txt index b1e64bd9..6434b43d 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,4 @@ -option('enable_libcap', type: 'boolean', value: true, description: 'Enable support for capabilities') -option('enable_systemd', type: 'boolean', value: true, description: 'Enable support for logind') -option('enable_elogind', type: 'boolean', value: true, description: 'Enable support for logind') +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_xwayland', type: 'boolean', value: true, description: 'Enable support X11 applications') -- cgit v1.2.3