From 4390be305b235e647dd18c95c74d79a2a085d561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 13 Apr 2017 20:30:07 -0400 Subject: meson: replace yes/no/auto with true/false/auto This doesn't feel as natural, but is more consistent with the boolean options which require true/false, and allows setting of options without knowing of which type the option is. --- meson_options.txt | 60 +++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'meson_options.txt') diff --git a/meson_options.txt b/meson_options.txt index 25875ca031..1058e10db6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -85,10 +85,10 @@ option('hwdb', type : 'boolean', description : 'support for the hardware database') option('rfkill', type : 'boolean', description : 'support for the rfkill tools') -option('man', type : 'combo', choices : ['auto', 'yes', 'no'], +option('man', type : 'combo', choices : ['auto', 'true', 'false'], description : 'build and install man pages') -option('html', type : 'combo', choices : ['auto', 'yes', 'no'], - value : 'no', +option('html', type : 'combo', choices : ['auto', 'true', 'false'], + value : 'false', description : 'build and install html pages') option('certificate-root', type : 'string', value : '/etc/ssl', @@ -153,63 +153,63 @@ option('support-url', type : 'string', description : 'the support URL to show in catalog entries included in systemd', value : 'https://lists.freedesktop.org/mailman/listinfo/systemd-devel') -option('seccomp', type : 'combo', choices : ['auto', 'yes', 'no'], +option('seccomp', type : 'combo', choices : ['auto', 'true', 'false'], description : 'SECCOMP support') -option('selinux', type : 'combo', choices : ['auto', 'yes', 'no'], +option('selinux', type : 'combo', choices : ['auto', 'true', 'false'], description : 'SELinux support') -option('apparmor', type : 'combo', choices : ['auto', 'yes', 'no'], +option('apparmor', type : 'combo', choices : ['auto', 'true', 'false'], description : 'AppArmor support') -option('smack', type : 'combo', choices : ['auto', 'yes', 'no'], +option('smack', type : 'combo', choices : ['auto', 'true', 'false'], description : 'SMACK support') option('smack-run-label', type : 'string', description : 'run systemd --system itself with a specific SMACK label') -option('polkit', type : 'combo', choices : ['auto', 'yes', 'no'], +option('polkit', type : 'combo', choices : ['auto', 'true', 'false'], description : 'PolicyKit support') option('ima', type : 'boolean', description : 'IMA support') -option('audit', type : 'combo', choices : ['auto', 'yes', 'no'], +option('audit', type : 'combo', choices : ['auto', 'true', 'false'], description : 'libaudit support') -option('blkid', type : 'combo', choices : ['auto', 'yes', 'no'], +option('blkid', type : 'combo', choices : ['auto', 'true', 'false'], description : 'libblkid support') -option('kmod', type : 'combo', choices : ['auto', 'yes', 'no'], +option('kmod', type : 'combo', choices : ['auto', 'true', 'false'], description : 'support for loadable modules') -option('pam', type : 'combo', choices : ['auto', 'yes', 'no'], +option('pam', type : 'combo', choices : ['auto', 'true', 'false'], description : 'PAM support') -option('microhttpd', type : 'combo', choices : ['auto', 'yes', 'no'], +option('microhttpd', type : 'combo', choices : ['auto', 'true', 'false'], description : 'libµhttpd support') -option('libcryptsetup', type : 'combo', choices : ['auto', 'yes', 'no'], +option('libcryptsetup', type : 'combo', choices : ['auto', 'true', 'false'], description : 'libcryptsetup support') -option('libcurl', type : 'combo', choices : ['auto', 'yes', 'no'], +option('libcurl', type : 'combo', choices : ['auto', 'true', 'false'], description : 'libcurl support') -option('libidn', type : 'combo', choices : ['auto', 'yes', 'no'], +option('libidn', type : 'combo', choices : ['auto', 'true', 'false'], description : 'libidn support') -option('libiptc', type : 'combo', choices : ['auto', 'yes', 'no'], +option('libiptc', type : 'combo', choices : ['auto', 'true', 'false'], description : 'libiptc support') -option('qrencode', type : 'combo', choices : ['auto', 'yes', 'no'], +option('qrencode', type : 'combo', choices : ['auto', 'true', 'false'], description : 'libqrencode support') -option('libgcrypt', type : 'combo', choices : ['auto', 'yes', 'no'], +option('libgcrypt', type : 'combo', choices : ['auto', 'true', 'false'], description : 'libgcrypt support') -option('gnutls', type : 'combo', choices : ['auto', 'yes', 'no'], +option('gnutls', type : 'combo', choices : ['auto', 'true', 'false'], description : 'gnutls support') -option('elfutils', type : 'combo', choices : ['auto', 'yes', 'no'], +option('elfutils', type : 'combo', choices : ['auto', 'true', 'false'], description : 'elfutils support') -option('zlib', type : 'combo', choices : ['auto', 'yes', 'no'], +option('zlib', type : 'combo', choices : ['auto', 'true', 'false'], description : 'zlib compression support') -option('bzip2', type : 'combo', choices : ['auto', 'yes', 'no'], +option('bzip2', type : 'combo', choices : ['auto', 'true', 'false'], description : 'bzip2 compression support') -option('xz', type : 'combo', choices : ['auto', 'yes', 'no'], +option('xz', type : 'combo', choices : ['auto', 'true', 'false'], description : 'xz compression support') -option('lz4', type : 'combo', choices : ['auto', 'yes', 'no'], +option('lz4', type : 'combo', choices : ['auto', 'true', 'false'], description : 'lz4 compression support') -option('xkbcommon', type : 'combo', choices : ['auto', 'yes', 'no'], +option('xkbcommon', type : 'combo', choices : ['auto', 'true', 'false'], description : 'xkbcommon keymap support') -option('glib', type : 'combo', choices : ['auto', 'yes', 'no'], +option('glib', type : 'combo', choices : ['auto', 'true', 'false'], description : 'libglib support (for tests only)') -option('dbus', type : 'combo', choices : ['auto', 'yes', 'no'], +option('dbus', type : 'combo', choices : ['auto', 'true', 'false'], description : 'libdbus support (for tests only)') -option('gnu-efi', type : 'combo', choices : ['auto', 'yes', 'no'], +option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'], description : 'gnu-efi support for sd-boot') option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules') @@ -227,7 +227,7 @@ option('bashcompletiondir', type : 'string', option('zshcompletiondir', type : 'string', description : 'directory for zsh completion scripts ["no" disables]') -option('tests', type : 'combo', choices : ['yes', 'unsafe'], +option('tests', type : 'combo', choices : ['true', 'unsafe'], description : 'enable extra tests with =unsafe') option('install-tests', type : 'boolean', value : 'false', description : 'install test executables') -- cgit v1.2.1