[libvirt] [PATCH 70/89] configure: move Hyper-V driver check to its own file
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
configure.ac | 22 +++-------------------
m4/virt-driver-hyperv.m4 | 47 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 50 insertions(+), 19 deletions(-)
create mode 100644 m4/virt-driver-hyperv.m4
diff --git a/configure.ac b/configure.ac
index 879235cd1e..56ad61a8ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -408,7 +408,7 @@ LIBVIRT_DRIVER_ARG_LIBXL
LIBVIRT_DRIVER_ARG_VBOX
LIBVIRT_DRIVER_ARG_LXC
LIBVIRT_DRIVER_ARG_ESX
-LIBVIRT_ARG_WITH([HYPERV], [Hyper-V], [check])
+LIBVIRT_DRIVER_ARG_HYPERV
LIBVIRT_DRIVER_ARG_TEST
LIBVIRT_DRIVER_ARG_REMOTE
LIBVIRT_ARG_WITH([LIBVIRTD], [libvirtd], [yes])
@@ -979,23 +979,7 @@ dnl
dnl check for Hyper-V
dnl
-if test "$with_hyperv" != "no"; then
- if test "$with_openwsman" != "yes"; then
- if test "$with_hyperv" = "check"; then
- with_hyperv=no
- else
- AC_MSG_ERROR([openwsman is required for the Hyper-V driver])
- fi
- else
- with_hyperv=yes
- fi
-fi
-
-if test "$with_hyperv" = "yes" ; then
- AC_DEFINE_UNQUOTED([WITH_HYPERV], 1, [whether Hyper-V driver is enabled])
-fi
-AM_CONDITIONAL([WITH_HYPERV], [test "$with_hyperv" = "yes"])
-
+LIBVIRT_DRIVER_CHECK_HYPERV
dnl
dnl check for kernel headers required by btrfs ioctl
@@ -1319,7 +1303,7 @@ LIBVIRT_DRIVER_RESULT_LIBXL
LIBVIRT_DRIVER_RESULT_LXC
LIBVIRT_DRIVER_RESULT_PHYP
LIBVIRT_DRIVER_RESULT_ESX
-AC_MSG_NOTICE([ Hyper-V: $with_hyperv])
+LIBVIRT_DRIVER_RESULT_HYPERV
LIBVIRT_DRIVER_RESULT_VZ
LIBVIRT_DRIVER_RESULT_BHYVE
LIBVIRT_DRIVER_RESULT_TEST
diff --git a/m4/virt-driver-hyperv.m4 b/m4/virt-driver-hyperv.m4
new file mode 100644
index 0000000000..d99f8f6af5
--- /dev/null
+++ b/m4/virt-driver-hyperv.m4
@@ -0,0 +1,47 @@
+dnl The Hyper-V driver
+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_DRIVER_ARG_HYPERV], [
+ LIBVIRT_ARG_WITH([HYPERV], [Hyper-V], [check])
+])
+
+AC_DEFUN([LIBVIRT_DRIVER_CHECK_HYPERV], [
+ AC_REQUIRE([LIBVIRT_CHECK_OPENWSMAN])
+
+ if test "$with_hyperv" != "no"; then
+ if test "$with_openwsman" != "yes"; then
+ if test "$with_hyperv" = "check"; then
+ with_hyperv=no
+ else
+ AC_MSG_ERROR([openwsman is required for the Hyper-V driver])
+ fi
+ else
+ with_hyperv=yes
+ fi
+ fi
+
+ if test "$with_hyperv" = "yes" ; then
+ AC_DEFINE_UNQUOTED([WITH_HYPERV], 1, [whether Hyper-V driver is enabled])
+ fi
+ AM_CONDITIONAL([WITH_HYPERV], [test "$with_hyperv" = "yes"])
+])
+
+AC_DEFUN([LIBVIRT_DRIVER_RESULT_HYPERV], [
+ LIBVIRT_RESULT([Hyper-V], [$with_hyperv])
+])
--
2.11.0