[libvirt PATCH 092/351] meson: add Virtuozzo driver build option
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
configure.ac | 3 ---
m4/virt-driver-vz.m4 | 43 -------------------------------------------
meson.build | 7 +++++++
meson_options.txt | 1 +
4 files changed, 8 insertions(+), 46 deletions(-)
delete mode 100644 m4/virt-driver-vz.m4
diff --git a/configure.ac b/configure.ac
index 531ff24feb8..f2947074e5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,11 +97,9 @@ dnl
dnl Virtualization drivers check
dnl
-LIBVIRT_DRIVER_ARG_VZ
LIBVIRT_DRIVER_ARG_NETWORK
LIBVIRT_DRIVER_ARG_INTERFACE
-LIBVIRT_DRIVER_CHECK_VZ
LIBVIRT_DRIVER_CHECK_NETWORK
LIBVIRT_DRIVER_CHECK_INTERFACE
@@ -297,7 +295,6 @@ AC_MSG_NOTICE([=====================])
AC_MSG_NOTICE([])
AC_MSG_NOTICE([Drivers])
AC_MSG_NOTICE([])
-LIBVIRT_DRIVER_RESULT_VZ
LIBVIRT_DRIVER_RESULT_NETWORK
LIBVIRT_DRIVER_RESULT_INTERFACE
AC_MSG_NOTICE([])
diff --git a/m4/virt-driver-vz.m4 b/m4/virt-driver-vz.m4
deleted file mode 100644
index 11045e8b393..00000000000
--- a/m4/virt-driver-vz.m4
+++ /dev/null
@@ -1,43 +0,0 @@
-dnl The Virtuozzo driver
-dnl
-dnl Copyright (C) 2005-2015 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_VZ],[
- LIBVIRT_ARG_WITH_FEATURE([VZ], [Virtuozzo], [check])
-])
-
-AC_DEFUN([LIBVIRT_DRIVER_CHECK_VZ],[
- if test "$with_vz" = "yes" ||
- test "$with_vz" = "check"; then
-
- if test "$with_vz" = "yes" && test
"$PARALLELS_SDK_FOUND" = "no"; then
- AC_MSG_ERROR([Parallels Virtualization SDK is needed to build the Virtuozzo
driver.])
- fi
-
- with_vz=$PARALLELS_SDK_FOUND
- if test "$with_vz" = "yes"; then
- AC_DEFINE_UNQUOTED([WITH_VZ], 1,
- [whether vz driver is enabled])
- fi
- fi
- AM_CONDITIONAL([WITH_VZ], [test "$with_vz" = "yes"])
-])
-
-AC_DEFUN([LIBVIRT_DRIVER_RESULT_VZ],[
- LIBVIRT_RESULT([vz], [$with_vz])
-])
diff --git a/meson.build b/meson.build
index cd7ec2eaa00..19b51890abb 100644
--- a/meson.build
+++ b/meson.build
@@ -1818,6 +1818,12 @@ if get_option('driver_vmware').enabled()
conf.set('WITH_VMX', 1)
endif
+if not get_option('driver_vz').disabled() and parallels_sdk_dep.found()
+ conf.set('WITH_VZ', 1)
+elif get_option('driver_vz').enabled()
+ error('Parallels Virtualization SDK is needed to build the Virtuozzo driver.')
+endif
+
# define top include directory
@@ -1846,6 +1852,7 @@ driver_summary = {
'LXC': conf.has('WITH_LXC'),
'ESX': conf.has('WITH_ESX'),
'Hyper-V': conf.has('WITH_HYPERV'),
+ 'vz': conf.has('WITH_VZ'),
'Bhyve': conf.has('WITH_BHYVE'),
'Test': conf.has('WITH_TEST'),
'Remote': conf.has('WITH_REMOTE'),
diff --git a/meson_options.txt b/meson_options.txt
index b6a49991f19..d6963fabd3c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -63,3 +63,4 @@ option('driver_test', type: 'feature', value:
'enabled', description: 'test driv
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')
+option('driver_vz', type: 'feature', value: 'auto', description:
'Virtuozzo driver')
--
2.26.2