meson: add Virtuozzo driver build option

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/configure.ac b/configure.ac
index 2fc35b3a96a20a178d6d8e3048e759f1d3cceab2..688fd7ae455f3747132d5c58b8780a8aa78bd258 100644 (file)
--- 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
 
@@ -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([])

diff --git a/m4/virt-driver-vz.m4 b/m4/virt-driver-vz.m4
deleted file mode 100644 (file)
index 11045e8..0000000
--- 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 588610c380e95acefd08daa22bdd6aa80ee9a89f..d45c986ad38283836fd4103bdac1e4ba7d19a2ac 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -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'),

diff --git a/meson_options.txt b/meson_options.txt
index 1f7c7a5395e9abcfcf84c9cb2a27529079ec9486..8b57ef8af067a935927ba45f1618659a66b1024d 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -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')