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

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

diff --git a/configure.ac b/configure.ac
index 185770dc20..ba5303e87f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -563,7 +563,7 @@ LIBVIRT_STORAGE_ARG_SCSI
 LIBVIRT_STORAGE_ARG_MPATH
 LIBVIRT_STORAGE_ARG_DISK
 LIBVIRT_STORAGE_ARG_RBD
-LIBVIRT_ARG_WITH([STORAGE_SHEEPDOG], [with Sheepdog backend for the storage driver], [check])
+LIBVIRT_STORAGE_ARG_SHEEPDOG
 LIBVIRT_ARG_WITH([STORAGE_GLUSTER], [Gluster backend for the storage driver], [check])
 LIBVIRT_ARG_WITH([STORAGE_ZFS], [ZFS backend for the storage driver], [check])
 
@@ -595,35 +595,9 @@ LIBVIRT_STORAGE_CHECK_ISCSI
 LIBVIRT_STORAGE_CHECK_SCSI
 LIBVIRT_STORAGE_CHECK_MPATH
 LIBVIRT_STORAGE_CHECK_RBD
+LIBVIRT_STORAGE_CHECK_SHEEPDOG
 
 
-if test "$with_storage_sheepdog" = "yes" ||
-   test "$with_storage_sheepdog" = "check"; then
-  AC_PATH_PROGS([SHEEPDOGCLI], [collie dog], [], [$LIBVIRT_SBIN_PATH])
-
-  if test "$with_storage_sheepdog" = "yes"; then
-    if test -z "$SHEEPDOGCLI"; then
-      AC_MSG_ERROR([We need sheepdog client for Sheepdog storage driver])
-    fi
-  else
-    if test -z "$SHEEPDOGCLI"; then
-      with_storage_sheepdog=no
-    fi
-
-    if test "$with_storage_sheepdog" = "check"; then
-      with_storage_sheepdog=yes
-    fi
-  fi
-
-  if test "$with_storage_sheepdog" = "yes"; then
-    AC_DEFINE_UNQUOTED([WITH_STORAGE_SHEEPDOG], 1,
-      [whether Sheepdog backend for storage driver is enabled])
-    AC_DEFINE_UNQUOTED([SHEEPDOGCLI],["$SHEEPDOGCLI"],[Location of sheepdog client program])
-  fi
-fi
-AM_CONDITIONAL([WITH_STORAGE_SHEEPDOG],
-  [test "$with_storage_sheepdog" = "yes"])
-
 if test "$with_storage_gluster" = "check"; then
   with_storage_gluster=$with_glusterfs
 fi
@@ -1005,7 +979,7 @@ LIBVIRT_STORAGE_RESULT_SCSI
 LIBVIRT_STORAGE_RESULT_MPATH
 LIBVIRT_STORAGE_RESULT_DISK
 LIBVIRT_STORAGE_RESULT_RBD
-AC_MSG_NOTICE([Sheepdog: $with_storage_sheepdog])
+LIBVIRT_STORAGE_RESULT_SHEEPDOG
 AC_MSG_NOTICE([ Gluster: $with_storage_gluster])
 AC_MSG_NOTICE([     ZFS: $with_storage_zfs])
 AC_MSG_NOTICE([])
diff --git a/m4/virt-storage-sheepdog.m4 b/m4/virt-storage-sheepdog.m4
new file mode 100644
index 0000000000..a9f4c834dd
--- /dev/null
+++ b/m4/virt-storage-sheepdog.m4
@@ -0,0 +1,56 @@
+dnl The storage Sheepdog 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_SHEEPDOG], [
+  LIBVIRT_ARG_WITH([STORAGE_SHEEPDOG],
+                   [with Sheepdog backend for the storage driver], [check])
+])
+
+AC_DEFUN([LIBVIRT_STORAGE_CHECK_SHEEPDOG], [
+  if test "$with_storage_sheepdog" = "yes" ||
+     test "$with_storage_sheepdog" = "check"; then
+    AC_PATH_PROGS([SHEEPDOGCLI], [collie dog], [], [$LIBVIRT_SBIN_PATH])
+
+    if test "$with_storage_sheepdog" = "yes"; then
+      if test -z "$SHEEPDOGCLI"; then
+        AC_MSG_ERROR([We need sheepdog client for Sheepdog storage driver])
+      fi
+    else
+      if test -z "$SHEEPDOGCLI"; then
+        with_storage_sheepdog=no
+      fi
+
+      if test "$with_storage_sheepdog" = "check"; then
+        with_storage_sheepdog=yes
+      fi
+    fi
+
+    if test "$with_storage_sheepdog" = "yes"; then
+      AC_DEFINE_UNQUOTED([WITH_STORAGE_SHEEPDOG], 1,
+                         [whether Sheepdog backend for storage driver is enabled])
+      AC_DEFINE_UNQUOTED([SHEEPDOGCLI], ["$SHEEPDOGCLI"],
+                         [Location of sheepdog client program])
+    fi
+  fi
+  AM_CONDITIONAL([WITH_STORAGE_SHEEPDOG], [test "$with_storage_sheepdog" = "yes"])
+])
+
+AC_DEFUN([LIBVIRT_STORAGE_RESULT_SHEEPDOG], [
+  LIBVIRT_RESULT([Sheepdog], [$with_storage_sheepdog])
+])
-- 
GitLab