[libvirt] [PATCH 81/89] configure: move storage iSCSI check to its own file

[Pavel Hrdina]

Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 configure.ac             | 26 +++----------------------
 m4/virt-storage-iscsi.m4 | 50 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 23 deletions(-)
 create mode 100644 m4/virt-storage-iscsi.m4

diff --git a/configure.ac b/configure.ac
index 4a5324936b..e39530447c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -558,7 +558,7 @@ AM_CONDITIONAL([WITH_SECRETS], [test "$with_secrets" = "yes"])
 LIBVIRT_STORAGE_ARG_DIR
 LIBVIRT_STORAGE_ARG_FS
 LIBVIRT_STORAGE_ARG_LVM
-LIBVIRT_ARG_WITH([STORAGE_ISCSI], [iSCSI backend for the storage driver], [check])
+LIBVIRT_STORAGE_ARG_ISCSI
 LIBVIRT_ARG_WITH([STORAGE_SCSI], [SCSI backend for the storage driver], [check])
 LIBVIRT_ARG_WITH([STORAGE_MPATH], [mpath backend for the storage driver], [check])
 LIBVIRT_ARG_WITH([STORAGE_DISK], [GPartd Disk backend for the storage driver], [check])
@@ -591,29 +591,9 @@ fi
 
 LIBVIRT_STORAGE_CHECK_FS
 LIBVIRT_STORAGE_CHECK_LVM
+LIBVIRT_STORAGE_CHECK_ISCSI
 
 
-if test "$with_storage_iscsi" = "yes" || test "$with_storage_iscsi" = "check"; then
-  AC_PATH_PROG([ISCSIADM], [iscsiadm], [], [$LIBVIRT_SBIN_PATH])
-  if test "$with_storage_iscsi" = "yes" ; then
-    if test -z "$ISCSIADM" ; then AC_MSG_ERROR([We need iscsiadm for iSCSI storage driver]) ; fi
-  else
-    if test -z "$ISCSIADM" ; then with_storage_iscsi=no ; fi
-
-    if test "$with_storage_iscsi" = "check" ; then with_storage_iscsi=yes ; fi
-  fi
-
-  if test "$with_storage_iscsi" = "yes" ; then
-    AC_DEFINE_UNQUOTED([WITH_STORAGE_ISCSI], 1, [whether iSCSI backend for storage driver is enabled])
-  fi
-fi
-if test -z "$ISCIADM" ; then
-    AC_DEFINE_UNQUOTED([ISCSIADM],["iscsiadm"],[Name of iscsiadm program])
-else
-    AC_DEFINE_UNQUOTED([ISCSIADM],["$ISCSIADM"],[Location of iscsiadm program])
-fi
-AM_CONDITIONAL([WITH_STORAGE_ISCSI], [test "$with_storage_iscsi" = "yes"])
-
 if test "$with_storage_scsi" = "check" || test "$with_storage_scsi" = "yes"; then
    with_storage_scsi=yes
 
@@ -1083,7 +1063,7 @@ AC_MSG_NOTICE([])
 LIBVIRT_STORAGE_RESULT_DIR
 LIBVIRT_STORAGE_RESULT_FS
 LIBVIRT_STORAGE_RESULT_LVM
-AC_MSG_NOTICE([   iSCSI: $with_storage_iscsi])
+LIBVIRT_STORAGE_RESULT_ISCSI
 AC_MSG_NOTICE([    SCSI: $with_storage_scsi])
 AC_MSG_NOTICE([   mpath: $with_storage_mpath])
 AC_MSG_NOTICE([    Disk: $with_storage_disk])
diff --git a/m4/virt-storage-iscsi.m4 b/m4/virt-storage-iscsi.m4
new file mode 100644
index 0000000000..6ad61fc732
--- /dev/null
+++ b/m4/virt-storage-iscsi.m4
@@ -0,0 +1,50 @@
+dnl The storage iSCSI 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_ISCSI], [
+  LIBVIRT_ARG_WITH([STORAGE_ISCSI], [iSCSI backend for the storage driver],
+                   [check])
+])
+
+AC_DEFUN([LIBVIRT_STORAGE_CHECK_ISCSI], [
+  if test "$with_storage_iscsi" = "yes" || test "$with_storage_iscsi" = "check"; then
+    AC_PATH_PROG([ISCSIADM], [iscsiadm], [], [$LIBVIRT_SBIN_PATH])
+    if test "$with_storage_iscsi" = "yes" ; then
+      if test -z "$ISCSIADM" ; then AC_MSG_ERROR([We need iscsiadm for iSCSI storage driver]) ; fi
+    else
+      if test -z "$ISCSIADM" ; then with_storage_iscsi=no ; fi
+
+      if test "$with_storage_iscsi" = "check" ; then with_storage_iscsi=yes ; fi
+    fi
+
+    if test "$with_storage_iscsi" = "yes" ; then
+      AC_DEFINE_UNQUOTED([WITH_STORAGE_ISCSI], 1, [whether iSCSI backend for storage driver is enabled])
+    fi
+  fi
+  if test -z "$ISCIADM" ; then
+    AC_DEFINE_UNQUOTED([ISCSIADM],["iscsiadm"],[Name of iscsiadm program])
+  else
+    AC_DEFINE_UNQUOTED([ISCSIADM],["$ISCSIADM"],[Location of iscsiadm program])
+  fi
+  AM_CONDITIONAL([WITH_STORAGE_ISCSI], [test "$with_storage_iscsi" = "yes"])
+])
+
+AC_DEFUN([LIBVIRT_STORAGE_RESULT_ISCSI], [
+  LIBVIRT_RESULT([iSCSI], [$with_storage_iscsi])
+])
-- 
2.11.0