From decce786a334ec96eed6e5f66f8465531a189324 Mon Sep 17 00:00:00 2001
From: Pavel Hrdina <phrdina@redhat.com>
Date: Wed, 7 Dec 2016 15:59:19 +0100
Subject: [PATCH] configure: move storage ZFS check to its own file

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---
 configure.ac           | 34 +++----------------------
 m4/virt-storage-zfs.m4 | 56 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 31 deletions(-)
 create mode 100644 m4/virt-storage-zfs.m4

diff --git a/configure.ac b/configure.ac
index edbfd65a60..f2b47d9c83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -565,7 +565,7 @@ LIBVIRT_STORAGE_ARG_DISK
 LIBVIRT_STORAGE_ARG_RBD
 LIBVIRT_STORAGE_ARG_SHEEPDOG
 LIBVIRT_STORAGE_ARG_GLUSTER
-LIBVIRT_ARG_WITH([STORAGE_ZFS], [ZFS backend for the storage driver], [check])
+LIBVIRT_STORAGE_ARG_ZFS
 
 if test "$with_libvirtd" = "no"; then
   with_storage_dir=no
@@ -597,37 +597,9 @@ LIBVIRT_STORAGE_CHECK_MPATH
 LIBVIRT_STORAGE_CHECK_RBD
 LIBVIRT_STORAGE_CHECK_SHEEPDOG
 LIBVIRT_STORAGE_CHECK_GLUSTER
+LIBVIRT_STORAGE_CHECK_ZFS
 
 
-if test "$with_storage_zfs" = "yes" ||
-   test "$with_storage_zfs" = "check"; then
-  AC_PATH_PROG([ZFS], [zfs], [], [$LIBVIRT_SBIN_PATH])
-  AC_PATH_PROG([ZPOOL], [zpool], [], [$LIBVIRT_SBIN_PATH])
-
-  if test "$with_storage_zfs" = "yes"; then
-    if test -z "$ZFS" || test -z "$ZPOOL"; then
-      AC_MSG_ERROR([We need zfs and zpool for ZFS storage driver])
-    fi
-  else
-    if test -z "$ZFS" || test -z "$ZPOOL"; then
-      with_storage_zfs=no
-    fi
-
-    if test "$with_storage_zfs" = "check"; then
-      with_storage_zfs=yes
-    fi
-  fi
-
-  if test "$with_storage_zfs" = "yes"; then
-    AC_DEFINE_UNQUOTED([WITH_STORAGE_ZFS], 1,
-      [whether ZFS backend for storage driver is enabled])
-    AC_DEFINE_UNQUOTED([ZFS], ["$ZFS"], [Location of zfs program])
-    AC_DEFINE_UNQUOTED([ZPOOL], ["$ZPOOL"], [Location of zpool program])
-  fi
-fi
-AM_CONDITIONAL([WITH_STORAGE_ZFS],
-  [test "$with_storage_zfs" = "yes"])
-
 if test "$with_storage_fs" = "yes" ||
    test "$with_storage_gluster" = "yes"; then
   AC_PATH_PROG([GLUSTER_CLI], [gluster], [], [$LIBVIRT_SBIN_PATH])
@@ -970,7 +942,7 @@ LIBVIRT_STORAGE_RESULT_DISK
 LIBVIRT_STORAGE_RESULT_RBD
 LIBVIRT_STORAGE_RESULT_SHEEPDOG
 LIBVIRT_STORAGE_RESULT_GLUSTER
-AC_MSG_NOTICE([     ZFS: $with_storage_zfs])
+LIBVIRT_STORAGE_RESULT_ZFS
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Security Drivers])
 AC_MSG_NOTICE([])
diff --git a/m4/virt-storage-zfs.m4 b/m4/virt-storage-zfs.m4
new file mode 100644
index 0000000000..5439b8b0d4
--- /dev/null
+++ b/m4/virt-storage-zfs.m4
@@ -0,0 +1,56 @@
+dnl The storage ZFS 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_ZFS], [
+  LIBVIRT_ARG_WITH([STORAGE_ZFS], [ZFS backend for the storage driver], [check])
+])
+
+AC_DEFUN([LIBVIRT_STORAGE_CHECK_ZFS], [
+  if test "$with_storage_zfs" = "yes" ||
+     test "$with_storage_zfs" = "check"; then
+    AC_PATH_PROG([ZFS], [zfs], [], [$LIBVIRT_SBIN_PATH])
+    AC_PATH_PROG([ZPOOL], [zpool], [], [$LIBVIRT_SBIN_PATH])
+
+    if test "$with_storage_zfs" = "yes"; then
+      if test -z "$ZFS" || test -z "$ZPOOL"; then
+        AC_MSG_ERROR([We need zfs and zpool for ZFS storage driver])
+      fi
+    else
+      if test -z "$ZFS" || test -z "$ZPOOL"; then
+        with_storage_zfs=no
+      fi
+
+      if test "$with_storage_zfs" = "check"; then
+        with_storage_zfs=yes
+      fi
+    fi
+
+    if test "$with_storage_zfs" = "yes"; then
+      AC_DEFINE_UNQUOTED([WITH_STORAGE_ZFS], 1,
+        [whether ZFS backend for storage driver is enabled])
+      AC_DEFINE_UNQUOTED([ZFS], ["$ZFS"], [Location of zfs program])
+      AC_DEFINE_UNQUOTED([ZPOOL], ["$ZPOOL"], [Location of zpool program])
+    fi
+  fi
+  AM_CONDITIONAL([WITH_STORAGE_ZFS], [test "$with_storage_zfs" = "yes"])
+])
+
+AC_DEFUN([LIBVIRT_STORAGE_RESULT_ZFS], [
+  LIBVIRT_RESULT([ZFS], [$with_storage_zfs])
+])
-- 
GitLab