[libvirt PATCH 065/351] meson: add parallels-sdk build check

Pavel Hrdina phrdina at redhat.com
Thu Jul 16 09:55:01 UTC 2020


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 m4/virt-driver-vz.m4 | 4 ----
 meson.build          | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/m4/virt-driver-vz.m4 b/m4/virt-driver-vz.m4
index 9a8bc42efa1..11045e8b393 100644
--- a/m4/virt-driver-vz.m4
+++ b/m4/virt-driver-vz.m4
@@ -22,12 +22,8 @@ AC_DEFUN([LIBVIRT_DRIVER_ARG_VZ],[
 ])
 
 AC_DEFUN([LIBVIRT_DRIVER_CHECK_VZ],[
-    PARALLELS_SDK_REQUIRED="7.0.22"
-
     if test "$with_vz" = "yes" ||
        test "$with_vz" = "check"; then
-        PKG_CHECK_MODULES([PARALLELS_SDK], [parallels-sdk >= $PARALLELS_SDK_REQUIRED],
-                          [PARALLELS_SDK_FOUND=yes], [PARALLELS_SDK_FOUND=no])
 
         if test "$with_vz" = "yes" && test "$PARALLELS_SDK_FOUND" = "no"; then
             AC_MSG_ERROR([Parallels Virtualization SDK is needed to build the Virtuozzo driver.])
diff --git a/meson.build b/meson.build
index 0fc7f3f4bb7..a9ebcd18842 100644
--- a/meson.build
+++ b/meson.build
@@ -1220,6 +1220,9 @@ endif
 openwsman_version = '2.2.3'
 openwsman_dep = dependency('openwsman', version: '>=' + openwsman_version, required: get_option('openwsman'))
 
+parallels_sdk_version = '7.0.22'
+parallels_sdk_dep = dependency('parallels-sdk', version: '>=' + parallels_sdk_version, required: false)
+
 # readline 7.0 is the first version which includes pkg-config support
 readline_version = '7.0'
 readline_dep = dependency('readline', version: '>=' + readline_version, required: false)
-- 
2.26.2




More information about the libvir-list mailing list