Meson: Cleanup GnuTLS module

diff --git a/meson.build b/meson.build
index e6d5f370abdaf2faf0b073de670afc5429dededc..04a6dc01754e03566ef7c1ce7c8e9728e59fafd9 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -192,6 +192,7 @@ deps = [
   dep_libdecaf,
   dep_libcrypto,
   dep_libssl,
+  dep_gnutls,
   dep_gss_tsig,
   dep_pkcs11,
   dep_yahttp,

diff --git a/meson/gnutls/meson.build b/meson/gnutls/meson.build
index 467b87d6dc868d2135f99c6a8d19e6c30fa4b354..8e1a2294a3d3223f027d8fda3468fee49b95c6ff 100644 (file)
--- a/meson/gnutls/meson.build
+++ b/meson/gnutls/meson.build
@@ -1,6 +1,3 @@
-# GnuTLS
-# Inputs: conf deps
-
 opt_gnutls = get_option('tls-gnutls')
 dep_gnutls = dependency('gnutls', version: '>= 3.1.11', required: opt_gnutls)
 
@@ -14,10 +11,9 @@ if dep_gnutls.found()
 
   foreach func: funcs
     has = cxx.has_function(func, dependencies: dep_gnutls)
-    conf.set10('HAVE_' + func.to_upper(), has, description: 'Whether we have ' + func)
+    conf.set('HAVE_' + func.to_upper(), has, description: 'Have GnuTLS ' + func)
   endforeach
 endif
 
-deps += dep_gnutls
-conf.set10('HAVE_GNUTLS', dep_gnutls.found(), description: 'Whether we support GnuTLS')
-summary('GnuTLS', dep_gnutls.found(), bool_yn: dep_gnutls.found() or not opt_gnutls.auto(), section: 'Configuration')
+conf.set('HAVE_GNUTLS', dep_gnutls.found(), description: 'GnuTLS')
+summary('GnuTLS', dep_gnutls.found(), bool_yn: true, section: 'Crypto')

diff --git a/meson_options.txt b/meson_options.txt
index 270b7cc2bdab4414490bcbdc80b0085313939f24..843b779b8acd3465a45d3866b01d261bbef14aea 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -6,9 +6,9 @@ option('signers-libsodium', type: 'feature', value: 'auto', description: 'Enable
 option('signers-libdecaf', type: 'feature', value: 'auto', description: 'Enable libdecaf-based signers')
 option('signers-libcrypto', type: 'feature', value: 'auto', description: 'Enable OpenSSL libcrypto-based signers)')
 option('signers-libcrypto-path', type: 'string', value: '', description: 'Custom path to find OpenSSL libcrypto')
-option('tls-gnutls', type: 'feature', value: 'auto', description: 'Enable GnuTLS-based TLS')
 option('dns-over-tls', type: 'boolean', value: false, description: 'Enable DNS over TLS (requires GnuTLS or OpenSSL)')
 option('tls-libssl', type: 'feature', value: 'auto', description: 'OpenSSL-based TLS')
+option('tls-gnutls', type: 'feature', value: 'auto', description: 'GnuTLS-based TLS')
 option('ipcipher', type: 'feature', value: 'auto', description: 'IPcipher (requires libcrypto)')
 option('unit-tests', type: 'boolean', value: false, description: 'Build and run unit tests')
 option('unit-tests-backends', type: 'boolean', value: false, description: 'Build and run backend unit tests')