From 90cf2208656c513b78a587e3e0f1f64144c0f209 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 3 Apr 2023 09:38:52 +0200 Subject: Merging upstream version 1.4. Signed-off-by: Daniel Baumann --- meson_options.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meson_options.txt') diff --git a/meson_options.txt b/meson_options.txt index 2c093ca..a1ed79f 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -7,6 +7,8 @@ option('rstdir', type : 'string', value : '', description : 'directory for ReST option('docs', type : 'combo', choices : ['false', 'html', 'man', 'rst', 'all'], description : 'install documentation') option('docs-build', type : 'boolean', value : false, description : 'build documentation') -option('python', type : 'combo', choices : ['auto', 'true', 'false'], description : 'Generate libnvme python bindings') +option('python', type : 'feature', value: 'auto', description : 'Generate libnvme python bindings') option('openssl', type : 'feature', value: 'auto', description : 'OpenSSL support') -option('libdbus', type : 'feature', value: 'auto', description : 'libdbus support') +option('libdbus', type : 'feature', value: 'disabled', description : 'libdbus support') +option('json-c', type : 'feature', value: 'auto', description : 'JSON support') +option('keyutils', type: 'feature', value: 'auto', description: 'keyutils support') -- cgit v1.2.3