[libvirt PATCH 098/351] meson: add storage build check

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- configure.ac | 13 ------------- meson.build | 9 +++++++++ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index e4cd6c15e16..49ead1baa8e 100644 --- a/configure.ac +++ b/configure.ac @@ -186,19 +186,6 @@ LIBVIRT_STORAGE_CHECK_GLUSTER LIBVIRT_STORAGE_CHECK_ZFS LIBVIRT_STORAGE_CHECK_VSTORAGE -with_storage=no -for backend in dir fs lvm iscsi iscsi_direct scsi mpath rbd disk; do - if eval test \$with_storage_$backend = yes; then - with_storage=yes - break - fi -done -if test $with_storage = yes; then - AC_DEFINE([WITH_STORAGE], [1], - [Define to 1 if at least one storage backend is in use]) -fi -AM_CONDITIONAL([WITH_STORAGE], [test "$with_storage" = "yes"]) - dnl Python3 < 3.7 treats the C locale as 7-bit only. dnl We must force env vars so it treats it as UTF-8 dnl regardless of the user's locale. diff --git a/meson.build b/meson.build index 6527473ceaf..c865d6c2cbf 100644 --- a/meson.build +++ b/meson.build @@ -1861,6 +1861,15 @@ if conf.has('WITH_QEMU') or conf.has('WITH_LXC') or conf.has('WITH_NETWORK') endif +# check for storage drivers + +use_storage = false + +if use_storage + conf.set('WITH_STORAGE', 1) +endif + + # define top include directory top_inc_dir = include_directories('.') -- 2.26.2