From: Pavel Hrdina Date: Tue, 13 Dec 2016 09:36:14 +0000 (+0100) Subject: configure: group all storage driver checks together X-Git-Tag: v3.0.0-rc1~163 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fee05477996415fd46a61c3fd2f58ada449e7c86;p=thirdparty%2Flibvirt.git configure: group all storage driver checks together Signed-off-by: Pavel Hrdina --- diff --git a/configure.ac b/configure.ac index f2b47d9c83..b080970d85 100644 --- a/configure.ac +++ b/configure.ac @@ -555,6 +555,10 @@ fi AM_CONDITIONAL([WITH_SECRETS], [test "$with_secrets" = "yes"]) +dnl +dnl Storage driver checks +dnl + LIBVIRT_STORAGE_ARG_DIR LIBVIRT_STORAGE_ARG_FS LIBVIRT_STORAGE_ARG_LVM @@ -581,25 +585,24 @@ if test "$with_libvirtd" = "no"; then with_storage_zfs=no fi -LIBVIRT_STORAGE_CHECK_DIR - dnl storage-fs does not work on MacOS X if test "$with_osx" = "yes"; then with_storage_fs=no fi +LIBVIRT_STORAGE_CHECK_DIR LIBVIRT_STORAGE_CHECK_FS LIBVIRT_STORAGE_CHECK_LVM LIBVIRT_STORAGE_CHECK_ISCSI LIBVIRT_STORAGE_CHECK_SCSI LIBVIRT_STORAGE_CHECK_MPATH +LIBVIRT_STORAGE_CHECK_DISK LIBVIRT_STORAGE_CHECK_RBD LIBVIRT_STORAGE_CHECK_SHEEPDOG LIBVIRT_STORAGE_CHECK_GLUSTER LIBVIRT_STORAGE_CHECK_ZFS - if test "$with_storage_fs" = "yes" || test "$with_storage_gluster" = "yes"; then AC_PATH_PROG([GLUSTER_CLI], [gluster], [], [$LIBVIRT_SBIN_PATH]) @@ -609,8 +612,6 @@ if test "$with_storage_fs" = "yes" || fi fi -LIBVIRT_STORAGE_CHECK_DISK - with_storage=no for backend in dir fs lvm iscsi scsi mpath rbd disk; do if eval test \$with_storage_$backend = yes; then