From 6d162feb1774848c760ffbf532c738700ba457cd Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Thu, 30 Apr 2020 11:35:36 +0200 Subject: [PATCH] meson: add parallels-sdk build check Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- 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 9a8bc42efa..11045e8b39 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 5b6a42bfcf..a544694d27 100644 --- a/meson.build +++ b/meson.build @@ -1238,6 +1238,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)