[libvirt] [PATCH 68/89] configure: move vbox driver check to its own file

[Pavel Hrdina]

Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 configure.ac           | 24 +++---------------------
 m4/virt-driver-vbox.m4 | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 21 deletions(-)
 create mode 100644 m4/virt-driver-vbox.m4

diff --git a/configure.ac b/configure.ac
index 5f1c2013d2..1356568a09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -405,7 +405,7 @@ LIBVIRT_DRIVER_ARG_VMWARE
 LIBVIRT_DRIVER_ARG_PHYP
 LIBVIRT_DRIVER_ARG_XENAPI
 LIBVIRT_DRIVER_ARG_LIBXL
-LIBVIRT_ARG_WITH([VBOX], [VirtualBox XPCOMC], [yes])
+LIBVIRT_DRIVER_ARG_VBOX
 LIBVIRT_DRIVER_ARG_LXC
 LIBVIRT_ARG_WITH([ESX], [ESX], [check])
 LIBVIRT_ARG_WITH([HYPERV], [Hyper-V], [check])
@@ -455,26 +455,8 @@ LIBVIRT_CHECK_SYSCTL_CONFIG
 LIBVIRT_DRIVER_CHECK_OPENVZ
 LIBVIRT_DRIVER_CHECK_VMWARE
 
-dnl
-dnl check for VirtualBox XPCOMC location
-dnl
-
-vbox_xpcomc_dir=
-
-if test "x$with_vbox" != "xyes" && test "x$with_vbox" != "xno"; then
-    # intentionally don't do any further checks here on the provided path
-    vbox_xpcomc_dir=$with_vbox
-    with_vbox=yes
-fi
-
-AC_DEFINE_UNQUOTED([VBOX_XPCOMC_DIR], ["$vbox_xpcomc_dir"],
-                   [Location of directory containing VirtualBox XPCOMC library])
-
-if test "x$with_vbox" = "xyes"; then
-    AC_DEFINE_UNQUOTED([WITH_VBOX], 1, [whether VirtualBox driver is enabled])
-fi
-AM_CONDITIONAL([WITH_VBOX], [test "$with_vbox" = "yes"])
 
+LIBVIRT_DRIVER_CHECK_VBOX
 LIBVIRT_DRIVER_CHECK_QEMU
 LIBVIRT_DRIVER_CHECK_TEST
 LIBVIRT_DRIVER_CHECK_REMOTE
@@ -1356,7 +1338,7 @@ LIBVIRT_DRIVER_RESULT_QEMU
 LIBVIRT_DRIVER_RESULT_UML
 LIBVIRT_DRIVER_RESULT_OPENVZ
 LIBVIRT_DRIVER_RESULT_VMWARE
-AC_MSG_NOTICE([     VBox: $with_vbox])
+LIBVIRT_DRIVER_RESULT_VBOX
 LIBVIRT_DRIVER_RESULT_XENAPI
 LIBVIRT_DRIVER_RESULT_LIBXL
 LIBVIRT_DRIVER_RESULT_LXC
diff --git a/m4/virt-driver-vbox.m4 b/m4/virt-driver-vbox.m4
new file mode 100644
index 0000000000..b84ce2271c
--- /dev/null
+++ b/m4/virt-driver-vbox.m4
@@ -0,0 +1,44 @@
+dnl The VirtualBox 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_VBOX], [
+  LIBVIRT_ARG_WITH([VBOX], [VirtualBox XPCOMC], [yes])
+])
+
+AC_DEFUN([LIBVIRT_DRIVER_CHECK_VBOX], [
+  vbox_xpcomc_dir=
+
+  if test "x$with_vbox" != "xyes" && test "x$with_vbox" != "xno"; then
+    # intentionally don't do any further checks here on the provided path
+    vbox_xpcomc_dir=$with_vbox
+    with_vbox=yes
+  fi
+
+  AC_DEFINE_UNQUOTED([VBOX_XPCOMC_DIR], ["$vbox_xpcomc_dir"],
+                     [Location of directory containing VirtualBox XPCOMC library])
+
+  if test "x$with_vbox" = "xyes"; then
+    AC_DEFINE_UNQUOTED([WITH_VBOX], 1, [whether VirtualBox driver is enabled])
+  fi
+  AM_CONDITIONAL([WITH_VBOX], [test "$with_vbox" = "yes"])
+])
+
+AC_DEFUN([LIBVIRT_DRIVER_RESULT_VBOX], [
+  LIBVIRT_RESULT([VBox], [$with_vbox])
+])
-- 
2.11.0