External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-03 12:55:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: add Virtuozzo driver build option

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
Pavel Hrdina 2020-06-19 11:57:23 +02:00
parent 03677e366d
commit 27b31f69bd
4 changed files with 8 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -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
@ -295,7 +293,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([])

43
m4/virt-driver-vz.m4
View File

@ -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])
])

7
meson.build
View File

@ -1836,6 +1836,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
@ -1864,6 +1870,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'),

1
meson_options.txt
View File

@ -64,3 +64,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')