meson: add storage build check

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/configure.ac b/configure.ac
index 9de58afddbdbb3dd92ace14d7ee82c03d2918a4c..6ba1a37cb72789bea69089e1181fb078d14b9935 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -184,19 +184,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 65103ec6e45262b270015cf4480b4d98a8e9b723..19deb58c53a1e35060874f896bdd81494450f8cf 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1879,6 +1879,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('.')