From: Alyssa Ross Date: Fri, 6 Aug 2021 14:49:47 +0000 (+0000) Subject: meson: fix logic for gnutls check X-Git-Tag: v6.1.0-rc3~6^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abc14fd05606274d8350f1f90d1ec7bc9e51aa21;p=thirdparty%2Fqemu.git meson: fix logic for gnutls check The logic before was if not get_option('gnutls').auto() or have_system Which is equivalent to if get_option('gnutls').enabled() or get_option('gnutls').disabled() or have_system This means that the check for gnutls is performed even if gnutls is disabled, which means that the build system will insist on having libtasn1 if gnutls is found, even if gnutls support is disabled. When gnutls is disabled, the check for gnutls shouldn't be performed, to ensure that further build system logic (like the check for libtasn1) doesn't make decisions based on the presence of gnutls, rather than the gnutls option. After making this change, I can successfully ./configure --disable-gnutls on my system with gnutls installed, but not libtasn1. Signed-off-by: Alyssa Ross Message-Id: <20210806144947.321647-1-hi@alyssa.is> Acked-by: Paolo Bonzini --- diff --git a/meson.build b/meson.build index af9bbb83dba..b3e7ec0e92d 100644 --- a/meson.build +++ b/meson.build @@ -824,7 +824,7 @@ endif gnutls = not_found gnutls_crypto = not_found -if not get_option('gnutls').auto() or have_system +if get_option('gnutls').enabled() or (get_option('gnutls').auto() and have_system) # For general TLS support our min gnutls matches # that implied by our platform support matrix #