External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-06 06:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

configure: group all storage driver checks together

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-12-13 10:36:14 +01:00
parent decce786a3
commit fee0547799
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -555,6 +555,10 @@ fi
AM_CONDITIONAL([WITH_SECRETS], [test "$with_secrets" = "yes"]) AM_CONDITIONAL([WITH_SECRETS], [test "$with_secrets" = "yes"])
dnl
dnl Storage driver checks
dnl
LIBVIRT_STORAGE_ARG_DIR LIBVIRT_STORAGE_ARG_DIR
LIBVIRT_STORAGE_ARG_FS LIBVIRT_STORAGE_ARG_FS
LIBVIRT_STORAGE_ARG_LVM LIBVIRT_STORAGE_ARG_LVM
@ -581,25 +585,24 @@ if test "$with_libvirtd" = "no"; then
with_storage_zfs=no with_storage_zfs=no
fi fi
LIBVIRT_STORAGE_CHECK_DIR
dnl storage-fs does not work on MacOS X dnl storage-fs does not work on MacOS X
if test "$with_osx" = "yes"; then if test "$with_osx" = "yes"; then
with_storage_fs=no with_storage_fs=no
fi fi
LIBVIRT_STORAGE_CHECK_DIR
LIBVIRT_STORAGE_CHECK_FS LIBVIRT_STORAGE_CHECK_FS
LIBVIRT_STORAGE_CHECK_LVM LIBVIRT_STORAGE_CHECK_LVM
LIBVIRT_STORAGE_CHECK_ISCSI LIBVIRT_STORAGE_CHECK_ISCSI
LIBVIRT_STORAGE_CHECK_SCSI LIBVIRT_STORAGE_CHECK_SCSI
LIBVIRT_STORAGE_CHECK_MPATH LIBVIRT_STORAGE_CHECK_MPATH
LIBVIRT_STORAGE_CHECK_DISK
LIBVIRT_STORAGE_CHECK_RBD LIBVIRT_STORAGE_CHECK_RBD
LIBVIRT_STORAGE_CHECK_SHEEPDOG LIBVIRT_STORAGE_CHECK_SHEEPDOG
LIBVIRT_STORAGE_CHECK_GLUSTER LIBVIRT_STORAGE_CHECK_GLUSTER
LIBVIRT_STORAGE_CHECK_ZFS LIBVIRT_STORAGE_CHECK_ZFS
if test "$with_storage_fs" = "yes" || if test "$with_storage_fs" = "yes" ||
test "$with_storage_gluster" = "yes"; then test "$with_storage_gluster" = "yes"; then
AC_PATH_PROG([GLUSTER_CLI], [gluster], [], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([GLUSTER_CLI], [gluster], [], [$LIBVIRT_SBIN_PATH])
@ -609,8 +612,6 @@ if test "$with_storage_fs" = "yes" ||
fi fi
fi fi
LIBVIRT_STORAGE_CHECK_DISK
with_storage=no with_storage=no
for backend in dir fs lvm iscsi scsi mpath rbd disk; do for backend in dir fs lvm iscsi scsi mpath rbd disk; do
if eval test \$with_storage_$backend = yes; then if eval test \$with_storage_$backend = yes; then