From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 21 Oct 2025 09:14:51 +0000 (+0200)
Subject: Also handle tls-libssl explicitly, as noted by @zeha
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba88af4870d907dfcb05a1e9abc5279e225dd387;p=thirdparty%2Fpdns.git

Also handle tls-libssl explicitly, as noted by @zeha

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>
---

diff --git a/pdns/recursordist/meson.build b/pdns/recursordist/meson.build
index c26daf333a..84d75a38c8 100644
--- a/pdns/recursordist/meson.build
+++ b/pdns/recursordist/meson.build
@@ -61,8 +61,9 @@ subdir('meson' / 'libsodium')               # Libsodium-based signers
 subdir('meson' / 'libcrypto')               # OpenSSL-based signers
 subdir('meson' / 'libssl')                  # OpenSSL libssl
 subdir('meson' / 'libssl-engines')          # OpenSSL libssl engines
-subdir('meson' / 'libsnmp')                 # SNMP
+subdir('meson' / 'gnutls')                  # GNUTLS
 subdir('meson' / 'dot')                     # DNS over TLS
+subdir('meson' / 'libsnmp')                 # SNMP
 subdir('meson' / 'clock-gettime')           # Clock_gettime
 subdir('meson' / 'boost')                   # Boost
 subdir('meson' / 'boost-context')           # Boost Context Switching Library
@@ -83,7 +84,6 @@ subdir('meson' / 'dnstap')                  # DNSTAP through libfstream
 subdir('meson' / 'libcurl')                 # Curl
 subdir('meson' / 'libcap')                  # Capabilities
 subdir('meson' / 'dlopen')                  # our Rust static library needs dlopen
-subdir('meson' / 'gnutls')                  # GNUTLS
 
 subdir('rec-rust-lib')
 
diff --git a/tasks.py b/tasks.py
index 9b21d72734..5e2a5d8a67 100644
--- a/tasks.py
+++ b/tasks.py
@@ -611,6 +611,7 @@ def ci_rec_configure_meson(c, features, build_dir):
             get_base_configure_cmd_meson(build_dir, src_dir=src_dir),
             "-D prefix=/opt/pdns-recursor",
             "-D dns-over-tls=enabled",
+            "-D tls-openssl=enabled",
             "-D tls-gnutls=enabled",
             "-D nod=enabled",
             "-D libcap=enabled",
@@ -623,8 +624,9 @@ def ci_rec_configure_meson(c, features, build_dir):
             "LDFLAGS='-L/usr/local/lib -Wl,-rpath,/usr/local/lib'",
             get_base_configure_cmd_meson(build_dir, src_dir=src_dir),
             "-D prefix=/opt/pdns-recursor",
-            "-D dns-over-tls=disabled",
             "-D dnstap=disabled",
+            "-D dns-over-tls=disabled",
+            "-D tls-openssl=disabled",
             "-D tls-gnutls=disabled",
             "-D nod=disabled",
             "-D systemd-service=disabled",