From: Otto <otto.moerbeek@open-xchange.com>
Date: Wed, 10 Nov 2021 09:07:58 +0000 (+0100)
Subject: Remove other remains of GnuTLS config that was never useful
X-Git-Tag: dnsdist-1.7.0-beta1~13^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10971%2Fhead;p=thirdparty%2Fpdns.git

Remove other remains of GnuTLS config that was never useful
---

diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index 16f388ccaa..98df6482a2 100644
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -447,10 +447,10 @@ AM_CPPFLAGS += $(LIBSSL_CFLAGS)
 pdns_recursor_LDADD += $(LIBSSL_LIBS)
 endif
 
-if HAVE_GNUTLS
-AM_CPPFLAGS += $(GNUTLS_CFLAGS)
-pdns_recursor_LDADD += $(GNUTLS_LIBS)
-endif
+#if HAVE_GNUTLS
+#AM_CPPFLAGS += $(GNUTLS_CFLAGS)
+#pdns_recursor_LDADD += $(GNUTLS_LIBS)
+#endif
 endif
 if HAVE_LIBCURL
 pdns_recursor_SOURCES += minicurl.cc minicurl.hh
diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac
index e092533fc0..c86b941a19 100644
--- a/pdns/recursordist/configure.ac
+++ b/pdns/recursordist/configure.ac
@@ -89,7 +89,8 @@ PDNS_CHECK_LIBCURL
 
 PDNS_WITH_NET_SNMP
 
-AM_CONDITIONAL([HAVE_GNUTLS], [false])
+# not runtime selectable at the moment
+#AM_CONDITIONAL([HAVE_GNUTLS], [false])
 AM_CONDITIONAL([HAVE_LIBSSL], [false])
 
 PDNS_ENABLE_DNS_OVER_TLS
@@ -99,8 +100,8 @@ AS_IF([test "x$enable_dns_over_tls" != "xno"], [
   # not runtime selectable at the moment
   # PDNS_WITH_GNUTLS 
 
-  AS_IF([test "x$HAVE_GNUTLS" != "x1" -a "x$HAVE_LIBSSL" != "x1"], [
-    AC_MSG_ERROR([DNS over TLS support requested but neither GnuTLS nor OpenSSL are available])
+  AS_IF([test "x$HAVE_LIBSSL" != "x1"], [
+    AC_MSG_ERROR([DNS over TLS support requested but no OpenSSL available])
   ])
 ])
 
@@ -244,12 +245,12 @@ AS_IF([test "x$enable_dns_over_tls" != "xno"],
   [AC_MSG_NOTICE([DNS over TLS: yes])],
   [AC_MSG_NOTICE([DNS over TLS: no])]
 )
-AS_IF([test "x$enable_dns_over_tls" != "xno"], [
-  AS_IF([test "x$GNUTLS_LIBS" != "x"],
-    [AC_MSG_NOTICE([GnuTLS: yes])],
-    [AC_MSG_NOTICE([GnuTLS: no])]
-  )]
-)
+#AS_IF([test "x$enable_dns_over_tls" != "xno"], [
+#  AS_IF([test "x$GNUTLS_LIBS" != "x"],
+#    [AC_MSG_NOTICE([GnuTLS: yes])],
+#    [AC_MSG_NOTICE([GnuTLS: no])]
+#  )]
+#)
 AS_IF([test "x$enable_dns_over_tls" != "xno"], [
   AS_IF([test "x$LIBSSL_LIBS" != "x"],
     [AC_MSG_NOTICE([OpenSSL: yes])],