[libvirt] [PATCH 53/89] configure: move VMware driver check to its own file

[Pavel Hrdina]

Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 configure.ac             | 15 +++------------
 m4/virt-driver-vmware.m4 | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 m4/virt-driver-vmware.m4

diff --git a/configure.ac b/configure.ac
index 5879444da0..278604bf1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -402,7 +402,7 @@ LIBVIRT_ARG_WITH([XEN], [XEN], [check])
 LIBVIRT_ARG_WITH([XEN_INOTIFY], [XEN inotify], [check])
 LIBVIRT_ARG_WITH([QEMU], [QEMU/KVM], [yes])
 LIBVIRT_DRIVER_ARG_OPENVZ
-LIBVIRT_ARG_WITH([VMWARE], [VMware], [yes])
+LIBVIRT_DRIVER_ARG_VMWARE
 LIBVIRT_ARG_WITH([PHYP], [PHYP], [check])
 LIBVIRT_ARG_WITH([XENAPI], [XenAPI], [check])
 LIBVIRT_ARG_WITH([LIBXL], [libxenlight], [check])
@@ -454,16 +454,7 @@ LIBVIRT_CHECK_SYSCTL_CONFIG
 
 
 LIBVIRT_DRIVER_CHECK_OPENVZ
-
-dnl
-dnl Checks for the VMware Workstation/Player driver
-dnl
-
-if test "$with_vmware" = "yes"; then
-    AC_DEFINE_UNQUOTED([WITH_VMWARE], 1, [whether VMware driver is enabled])
-fi
-AM_CONDITIONAL([WITH_VMWARE], [test "$with_vmware" = "yes"])
-
+LIBVIRT_DRIVER_CHECK_VMWARE
 
 dnl
 dnl check for VirtualBox XPCOMC location
@@ -1677,7 +1668,7 @@ AC_MSG_NOTICE([      Xen: $with_xen])
 AC_MSG_NOTICE([     QEMU: $with_qemu])
 LIBVIRT_DRIVER_RESULT_UML
 LIBVIRT_DRIVER_RESULT_OPENVZ
-AC_MSG_NOTICE([   VMware: $with_vmware])
+LIBVIRT_DRIVER_RESULT_VMWARE
 AC_MSG_NOTICE([     VBox: $with_vbox])
 AC_MSG_NOTICE([   XenAPI: $with_xenapi])
 AC_MSG_NOTICE([ xenlight: $with_libxl])
diff --git a/m4/virt-driver-vmware.m4 b/m4/virt-driver-vmware.m4
new file mode 100644
index 0000000000..ed73087b90
--- /dev/null
+++ b/m4/virt-driver-vmware.m4
@@ -0,0 +1,33 @@
+dnl The VMware driver 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_DRIVER_ARG_VMWARE], [
+  LIBVIRT_ARG_WITH([VMWARE], [VMware], [yes])
+])
+
+AC_DEFUN([LIBVIRT_DRIVER_CHECK_VMWARE], [
+  if test "$with_vmware" = "yes"; then
+    AC_DEFINE_UNQUOTED([WITH_VMWARE], 1, [whether VMware driver is enabled])
+  fi
+  AM_CONDITIONAL([WITH_VMWARE], [test "$with_vmware" = "yes"])
+])
+
+AC_DEFUN([LIBVIRT_DRIVER_RESULT_VMWARE], [
+  LIBVIRT_RESULT([VMware], [$with_vmware])
+])
-- 
2.11.0