From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Wed, 16 Aug 2023 12:32:26 +0000 (+0200)
Subject: Meson: Cleanup DoT module
X-Git-Tag: rec-5.1.0-alpha1~80^2~209
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=019d0eac1d620c296f7ca52d4dd5249487974264;p=thirdparty%2Fpdns.git

Meson: Cleanup DoT module
---

diff --git a/meson/dot/meson.build b/meson/dot/meson.build
index 904a74ed4e..e1166a1814 100644
--- a/meson/dot/meson.build
+++ b/meson/dot/meson.build
@@ -1,8 +1,5 @@
-# DNS over TLS
-# Inputs: conf dep_libssl dep_gnutls
-
 opt_dot = get_option('dns-over-tls')
-conf.set10('HAVE_DNS_OVER_TLS', opt_dot, description: 'Whether DNS over TLS is enabled')
+conf.set('HAVE_DNS_OVER_TLS', opt_dot, description: 'DNS over TLS (DoT)')
 
 if opt_dot and not dep_libssl.found() and not dep_gnutls.found()
   error('DNS over TLS support was requested but neither OpenSSL libssl nor GnuTLS support is enabled')
diff --git a/meson_options.txt b/meson_options.txt
index 843b779b8a..cf8ca4aa11 100644
--- 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('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('dns-over-tls', type: 'boolean', value: false, description: 'DNS over TLS (requires GnuTLS or OpenSSL)')
 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')