summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-08-06 14:49:47 +0000
committerPatchew Applier <no-reply@patchew.org>2021-08-06 15:36:11 +0000
commitabc14fd05606274d8350f1f90d1ec7bc9e51aa21 (patch)
treecd082af5778ef0d0fa5d42445696b20be61fcc49
parentdee64246ded3aa7dbada68b96ce1c64e5bea327d (diff)
downloadfocaccia-qemu-abc14fd05606274d8350f1f90d1ec7bc9e51aa21.tar.gz
focaccia-qemu-abc14fd05606274d8350f1f90d1ec7bc9e51aa21.zip
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 <hi@alyssa.is>
Message-Id: <20210806144947.321647-1-hi@alyssa.is>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--meson.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index af9bbb83db..b3e7ec0e92 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
   #