[libvirt PATCH 091/351] meson: add VMWare driver build option
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
configure.ac | 3 ---
m4/virt-driver-vmware.m4 | 33 ---------------------------------
meson.build | 6 ++++++
meson_options.txt | 1 +
4 files changed, 7 insertions(+), 36 deletions(-)
delete mode 100644 m4/virt-driver-vmware.m4
diff --git a/configure.ac b/configure.ac
index c0a6da1f3c6..531ff24feb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,12 +97,10 @@ dnl
dnl Virtualization drivers check
dnl
-LIBVIRT_DRIVER_ARG_VMWARE
LIBVIRT_DRIVER_ARG_VZ
LIBVIRT_DRIVER_ARG_NETWORK
LIBVIRT_DRIVER_ARG_INTERFACE
-LIBVIRT_DRIVER_CHECK_VMWARE
LIBVIRT_DRIVER_CHECK_VZ
LIBVIRT_DRIVER_CHECK_NETWORK
LIBVIRT_DRIVER_CHECK_INTERFACE
@@ -299,7 +297,6 @@ AC_MSG_NOTICE([=====================])
AC_MSG_NOTICE([])
AC_MSG_NOTICE([Drivers])
AC_MSG_NOTICE([])
-LIBVIRT_DRIVER_RESULT_VMWARE
LIBVIRT_DRIVER_RESULT_VZ
LIBVIRT_DRIVER_RESULT_NETWORK
LIBVIRT_DRIVER_RESULT_INTERFACE
diff --git a/m4/virt-driver-vmware.m4 b/m4/virt-driver-vmware.m4
deleted file mode 100644
index 06504eb386d..00000000000
--- a/m4/virt-driver-vmware.m4
+++ /dev/null
@@ -1,33 +0,0 @@
-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_FEATURE([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])
-])
diff --git a/meson.build b/meson.build
index 3309032face..cd7ec2eaa00 100644
--- a/meson.build
+++ b/meson.build
@@ -1813,6 +1813,11 @@ if not get_option('driver_vbox').disabled() and
conf.has('WITH_LIBVIRTD')
conf.set_quoted('VBOX_XPCOMC_DIR', get_option('vbox_xpcomc_dir'))
endif
+if get_option('driver_vmware').enabled()
+ conf.set('WITH_VMWARE', 1)
+ conf.set('WITH_VMX', 1)
+endif
+
# define top include directory
@@ -1835,6 +1840,7 @@ configure_file(output: 'meson-config.h', configuration:
conf)
driver_summary = {
'QEMU': conf.has('WITH_QEMU'),
'OpenVZ': conf.has('WITH_OPENVZ'),
+ 'VMware': conf.has('WITH_VMWARE'),
'VBox': conf.has('WITH_VBOX'),
'libxl': conf.has('WITH_LIBXL'),
'LXC': conf.has('WITH_LXC'),
diff --git a/meson_options.txt b/meson_options.txt
index 4ea5555a914..b6a49991f19 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -62,3 +62,4 @@ option('remote_default_mode', type: 'combo', choices:
['legacy', 'direct'], valu
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')
+option('driver_vmware', type: 'feature', value: 'enabled',
description: 'VMware driver')
--
2.26.2