From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 16 Apr 2026 08:55:57 +0000 (+0200)
Subject: - Fix configure, autoconf for #1406.
X-Git-Tag: release-1.25.0rc1~30
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=b97bd3a1fc5172caafb0f3ab2ebb06ce0f1dae29;p=thirdparty%2Funbound.git

- Fix configure, autoconf for #1406.
---

diff --git a/config.h.in b/config.h.in
index 3372ae4dc..d14257fda 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1142,9 +1142,6 @@
 #endif
 
 
-/* Define to 1 to prefer TLS crypto settings from the system. */
-#undef USE_SYSTEM_TLS
-
 /* Define this to enable server TCP Fast Open. */
 #undef USE_TCP_FASTOPEN
 
diff --git a/configure b/configure
index 62bc2496c..de41ecd14 100755
--- a/configure
+++ b/configure
@@ -669,7 +669,6 @@ SOURCEFILE
 SOURCEDETERMINE
 IPSET_OBJ
 IPSET_SRC
-SYSTEM_TLS_DEFAULT
 IPSECMOD_HEADER
 IPSECMOD_OBJ
 CACHEDB_OBJ
@@ -937,7 +936,6 @@ enable_dnscrypt
 with_libsodium
 enable_cachedb
 enable_ipsecmod
-enable_system_tls
 enable_ipset
 with_libmnl
 enable_explicit_port_randomisation
@@ -1643,8 +1641,6 @@ Optional Features:
                           storage
   --enable-ipsecmod       Enable ipsecmod module that facilitates
                           opportunistic IPsec
-  --enable-system-tls     Enable preference of system configured TLS socket
-                          options
   --enable-ipset          enable ipset module
   --disable-explicit-port-randomisation
                           disable explicit source port randomisation and rely
@@ -25123,26 +25119,6 @@ printf "%s\n" "#define USE_IPSECMOD 1" >>confdefs.h
 		;;
 esac
 
-# check for system TLS preference if requested
-# Check whether --enable-system-tls was given.
-if test ${enable_system_tls+y}
-then :
-  enableval=$enable_system_tls;
-fi
-
-case "$enable_system_tls" in
-	yes)
-
-printf "%s\n" "#define USE_SYSTEM_TLS 1" >>confdefs.h
-
-		SYSTEM_TLS_DEFAULT="yes"
-		;;
-	no|*)
-		SYSTEM_TLS_DEFAULT="no"
-		;;
-esac
-
-
 # check for ipset if requested
 # Check whether --enable-ipset was given.
 if test ${enable_ipset+y}
diff --git a/doc/Changelog b/doc/Changelog
index 8b2467098..f8667c775 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -12,6 +12,9 @@
 	  configure option, related to #1401, is no longer needed with the new
 	  option and the current default.
 
+16 April 2026: Wouter
+	- Fix configure, autoconf for #1406.
+
 15 April 2026: Wouter
 	- Fix RFC7766 compliance when client sends EOF over TCP. It stops
 	  pending replies and closes. Thanks to Yuxiao Wu, Tsinghua