[libvirt PATCH 096/351] meson: add secrets driver build option
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
configure.ac | 11 -----------
meson.build | 4 ++++
meson_options.txt | 1 +
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9a806517594..0ab742c970f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,17 +132,6 @@ dnl Need to test if pkg-config exists
PKG_PROG_PKG_CONFIG
-LIBVIRT_ARG_WITH_FEATURE([SECRETS], [local secrets management driver], [yes])
-
-if test "$with_libvirtd" = "no"; then
- with_secrets=no
-fi
-if test "$with_secrets" = "yes" ; then
- AC_DEFINE_UNQUOTED([WITH_SECRETS], 1, [whether local secrets management driver is
available])
-fi
-AM_CONDITIONAL([WITH_SECRETS], [test "$with_secrets" = "yes"])
-
-
dnl
dnl Storage driver checks
dnl
diff --git a/meson.build b/meson.build
index b25d07fce94..3bd4e0423d2 100644
--- a/meson.build
+++ b/meson.build
@@ -1816,6 +1816,10 @@ if not get_option('driver_qemu').disabled()
endif
endif
+if not get_option('driver_secrets').disabled() and
conf.has('WITH_LIBVIRTD')
+ conf.set('WITH_SECRETS', 1)
+endif
+
if get_option('driver_test').enabled()
conf.set('WITH_TEST', 1)
endif
diff --git a/meson_options.txt b/meson_options.txt
index 3d7272348af..1e40eb214bf 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -61,6 +61,7 @@ option('qemu_user', type: 'string', value: '',
description: 'username to run QEM
option('qemu_group', type: 'string', value: '', description:
'groupname to run QEMU system instance as')
option('driver_remote', type: 'feature', value: 'enabled',
description: 'remote driver')
option('remote_default_mode', type: 'combo', choices: ['legacy',
'direct'], value: 'legacy', description: 'remote driver default
mode')
+option('driver_secrets', type: 'feature', value: 'auto',
description: 'local secrets management driver')
option('driver_test', type: 'feature', value: 'enabled',
description: 'test driver')
option('driver_vbox', type: 'feature', value: 'enabled',
description: 'VirtualBox XPCOMC driver')
option('vbox_xpcomc_dir', type: 'string', value: '', description:
'Location of directory containing VirtualBox XPCOMC library')
--
2.26.2