From: Daniel P. Berrangé <berrange@redhat.com>
Date: Wed, 23 Jun 2021 11:31:53 +0000 (+0100)
Subject: build: fix logic for enabling libssh/libssh2 checks
X-Git-Tag: v7.5.0-rc1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9f9df9f2d41d3d44dc20ee2a502c1b68ebfbc14;p=thirdparty%2Flibvirt.git

build: fix logic for enabling libssh/libssh2 checks

When 'driver_remote' is 'auto', the 'enabled()' method does not
evaluate to true, causing the libssh/libssh2 checks to be skipped.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/meson.build b/meson.build
index 9caae5521b..1fab424fde 100644
--- a/meson.build
+++ b/meson.build
@@ -1005,7 +1005,7 @@ else
 endif
 
 libssh_version = '0.7'
-if get_option('driver_remote').enabled()
+if not get_option('driver_remote').disabled()
   libssh_dep = dependency('libssh', version: '>=' + libssh_version, required: get_option('libssh'))
   if libssh_dep.found()
     conf.set('WITH_LIBSSH', 1)
@@ -1028,7 +1028,7 @@ else
 endif
 
 libssh2_version = '1.3'
-if get_option('driver_remote').enabled()
+if not get_option('driver_remote').disabled()
   libssh2_dep = dependency('libssh2', version: '>=' + libssh2_version, required: get_option('libssh2'))
   if libssh2_dep.found()
     conf.set('WITH_SSH2', 1)