[libvirt PATCH 090/351] meson: add vbox driver build options

[Pavel Hrdina]

Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 configure.ac           |  8 --------
 m4/virt-driver-vbox.m4 | 44 ------------------------------------------
 meson.build            |  6 ++++++
 meson_options.txt      |  2 ++
 4 files changed, 8 insertions(+), 52 deletions(-)
 delete mode 100644 m4/virt-driver-vbox.m4

diff --git a/configure.ac b/configure.ac
index ab1b2145756..c0a6da1f3c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,11 +83,6 @@ AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"])
 AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" = "yes"])
 AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" = "yes"])
 
-# Stateful drivers are useful only when building the daemon.
-if test "$with_libvirtd" = "no" ; then
-  with_vbox=no
-fi
-
 # Check for compiler and library settings.
 
 LIBVIRT_ARG_NSS
@@ -103,13 +98,11 @@ dnl Virtualization drivers check
 dnl
 
 LIBVIRT_DRIVER_ARG_VMWARE
-LIBVIRT_DRIVER_ARG_VBOX
 LIBVIRT_DRIVER_ARG_VZ
 LIBVIRT_DRIVER_ARG_NETWORK
 LIBVIRT_DRIVER_ARG_INTERFACE
 
 LIBVIRT_DRIVER_CHECK_VMWARE
-LIBVIRT_DRIVER_CHECK_VBOX
 LIBVIRT_DRIVER_CHECK_VZ
 LIBVIRT_DRIVER_CHECK_NETWORK
 LIBVIRT_DRIVER_CHECK_INTERFACE
@@ -307,7 +300,6 @@ AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Drivers])
 AC_MSG_NOTICE([])
 LIBVIRT_DRIVER_RESULT_VMWARE
-LIBVIRT_DRIVER_RESULT_VBOX
 LIBVIRT_DRIVER_RESULT_VZ
 LIBVIRT_DRIVER_RESULT_NETWORK
 LIBVIRT_DRIVER_RESULT_INTERFACE
diff --git a/m4/virt-driver-vbox.m4 b/m4/virt-driver-vbox.m4
deleted file mode 100644
index 589b1c3ed5e..00000000000
--- a/m4/virt-driver-vbox.m4
+++ /dev/null
@@ -1,44 +0,0 @@
-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_FEATURE([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])
-])
diff --git a/meson.build b/meson.build
index 6a32554bb41..3309032face 100644
--- a/meson.build
+++ b/meson.build
@@ -1808,6 +1808,11 @@ if get_option('driver_test').enabled()
   conf.set('WITH_TEST', 1)
 endif
 
+if not get_option('driver_vbox').disabled() and conf.has('WITH_LIBVIRTD')
+  conf.set('WITH_VBOX', 1)
+  conf.set_quoted('VBOX_XPCOMC_DIR', get_option('vbox_xpcomc_dir'))
+endif
+
 
 # define top include directory
 
@@ -1830,6 +1835,7 @@ configure_file(output: 'meson-config.h', configuration: conf)
 driver_summary = {
   'QEMU': conf.has('WITH_QEMU'),
   'OpenVZ': conf.has('WITH_OPENVZ'),
+  'VBox': conf.has('WITH_VBOX'),
   'libxl': conf.has('WITH_LIBXL'),
   'LXC': conf.has('WITH_LXC'),
   'ESX': conf.has('WITH_ESX'),
diff --git a/meson_options.txt b/meson_options.txt
index f9f9e3f79fe..4ea5555a914 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -60,3 +60,5 @@ option('qemu_group', type: 'string', value: '', description: 'groupname to run Q
 option('driver_remote', type: 'feature', value: 'enabled', description: 'remote driver')
 option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct'], value: 'legacy', description: 'remote driver default mode')
 option('driver_test', type: 'feature', value: 'enabled', description: 'test driver')
+option('driver_vbox', type: 'feature', value: 'enabled', description: 'VirtualBox XPCOMC driver')
+option('vbox_xpcomc_dir', type: 'string', value: '', description: 'Location of directory containing VirtualBox XPCOMC library')
-- 
2.26.2