[libvirt] [PATCH 87/89] configure: move storage Gluster check to its own file
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
configure.ac | 17 +++--------------
m4/virt-storage-gluster.m4 | 43 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 14 deletions(-)
create mode 100644 m4/virt-storage-gluster.m4
diff --git a/configure.ac b/configure.ac
index 05895fd2a4..914ace9139 100644
--- a/configure.ac
+++ b/configure.ac
@@ -564,7 +564,7 @@ LIBVIRT_STORAGE_ARG_MPATH
LIBVIRT_STORAGE_ARG_DISK
LIBVIRT_STORAGE_ARG_RBD
LIBVIRT_STORAGE_ARG_SHEEPDOG
-LIBVIRT_ARG_WITH([STORAGE_GLUSTER], [Gluster backend for the storage driver], [check])
+LIBVIRT_STORAGE_ARG_GLUSTER
LIBVIRT_ARG_WITH([STORAGE_ZFS], [ZFS backend for the storage driver], [check])
if test "$with_libvirtd" = "no"; then
@@ -596,20 +596,9 @@ LIBVIRT_STORAGE_CHECK_SCSI
LIBVIRT_STORAGE_CHECK_MPATH
LIBVIRT_STORAGE_CHECK_RBD
LIBVIRT_STORAGE_CHECK_SHEEPDOG
+LIBVIRT_STORAGE_CHECK_GLUSTER
-if test "$with_storage_gluster" = "check"; then
- with_storage_gluster=$with_glusterfs
-fi
-if test "$with_storage_gluster" = "yes"; then
- if test "$with_glusterfs" = no; then
- AC_MSG_ERROR([Need glusterfs (libgfapi) for gluster storage driver])
- fi
- AC_DEFINE_UNQUOTED([WITH_STORAGE_GLUSTER], [1],
- [whether Gluster backend for storage driver is enabled])
-fi
-AM_CONDITIONAL([WITH_STORAGE_GLUSTER], [test "$with_storage_gluster" =
"yes"])
-
if test "$with_storage_zfs" = "yes" ||
test "$with_storage_zfs" = "check"; then
AC_PATH_PROG([ZFS], [zfs], [], [$LIBVIRT_SBIN_PATH])
@@ -980,7 +969,7 @@ LIBVIRT_STORAGE_RESULT_MPATH
LIBVIRT_STORAGE_RESULT_DISK
LIBVIRT_STORAGE_RESULT_RBD
LIBVIRT_STORAGE_RESULT_SHEEPDOG
-AC_MSG_NOTICE([ Gluster: $with_storage_gluster])
+LIBVIRT_STORAGE_RESULT_GLUSTER
AC_MSG_NOTICE([ ZFS: $with_storage_zfs])
AC_MSG_NOTICE([])
AC_MSG_NOTICE([Security Drivers])
diff --git a/m4/virt-storage-gluster.m4 b/m4/virt-storage-gluster.m4
new file mode 100644
index 0000000000..06272991f4
--- /dev/null
+++ b/m4/virt-storage-gluster.m4
@@ -0,0 +1,43 @@
+dnl The storage Gluster check
+dnl
+dnl Copyright (C) 2016 Red Hat, Inc.
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License, or (at your option) any later version.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library. If not, see
+dnl <http://www.gnu.org/licenses/>;.
+dnl
+
+AC_DEFUN([LIBVIRT_STORAGE_ARG_GLUSTER], [
+ LIBVIRT_ARG_WITH([STORAGE_GLUSTER], [Gluster backend for the storage driver],
+ [check])
+])
+
+AC_DEFUN([LIBVIRT_STORAGE_CHECK_GLUSTER], [
+ AC_REQUIRE([LIBVIRT_CHECK_GLUSTER])
+
+ if test "$with_storage_gluster" = "check"; then
+ with_storage_gluster=$with_glusterfs
+ fi
+ if test "$with_storage_gluster" = "yes"; then
+ if test "$with_glusterfs" = no; then
+ AC_MSG_ERROR([Need glusterfs (libgfapi) for gluster storage driver])
+ fi
+ AC_DEFINE_UNQUOTED([WITH_STORAGE_GLUSTER], [1],
+ [whether Gluster backend for storage driver is enabled])
+ fi
+ AM_CONDITIONAL([WITH_STORAGE_GLUSTER], [test "$with_storage_gluster" =
"yes"])
+])
+
+AC_DEFUN([LIBVIRT_STORAGE_RESULT_GLUSTER], [
+ LIBVIRT_RESULT([Gluster], [$with_storage_gluster])
+])
--
2.11.0