From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Fri, 15 Feb 2019 14:18:45 +0000 (+0100)
Subject: dnsdist: don't test or show unneeded TLS libs
X-Git-Tag: auth-4.2.0-beta1~20^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F7487%2Fhead;p=thirdparty%2Fpdns.git

dnsdist: don't test or show unneeded TLS libs
---

diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index 1ed08b9999..e28decf08c 100644
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -52,10 +52,12 @@ AC_SUBST([YAHTTP_LIBS], ['$(top_builddir)/ext/yahttp/yahttp/libyahttp.la'])
 PDNS_WITH_LUA([mandatory])
 PDNS_CHECK_LUA_HPP
 
+AM_CONDITIONAL([HAVE_GNUTLS], [false])
+AM_CONDITIONAL([HAVE_LIBSSL], [false])
 DNSDIST_ENABLE_DNS_OVER_TLS
-DNSDIST_WITH_GNUTLS
-DNSDIST_WITH_LIBSSL
 AS_IF([test "x$enable_dns_over_tls" != "xno"], [
+  DNSDIST_WITH_GNUTLS
+  DNSDIST_WITH_LIBSSL
   AS_IF([test "$HAVE_LIBSSL" = "1"], [
     # we need libcrypto if libssl is enabled
     PDNS_CHECK_LIBCRYPTO
@@ -160,16 +162,15 @@ AS_IF([test "x$NET_SNMP_LIBS" != "x"],
   [AC_MSG_NOTICE([SNMP: yes])],
   [AC_MSG_NOTICE([SNMP: no])]
 )
-AS_IF([test "x$enable_dns_over_tls" != "xno"],
-  [AC_MSG_NOTICE([DNS over TLS: yes])],
+AS_IF([test "x$enable_dns_over_tls" != "xno"], [
+  AC_MSG_NOTICE([DNS over TLS: yes])
+  AS_IF([test "x$GNUTLS_LIBS" != "x"],
+    [AC_MSG_NOTICE([GnuTLS: yes])],
+    [AC_MSG_NOTICE([GnuTLS: no])])
+  AS_IF([test "x$LIBSSL_LIBS" != "x"],
+    [AC_MSG_NOTICE([OpenSSL: yes])],
+    [AC_MSG_NOTICE([OpenSSL: no])])
+  ],
   [AC_MSG_NOTICE([DNS over TLS: no])]
 )
-AS_IF([test "x$GNUTLS_LIBS" != "x"],
-  [AC_MSG_NOTICE([GnuTLS: yes])],
-  [AC_MSG_NOTICE([GnuTLS: no])]
-)
-AS_IF([test "x$LIBSSL_LIBS" != "x"],
-  [AC_MSG_NOTICE([OpenSSL: yes])],
-  [AC_MSG_NOTICE([OpenSSL: no])]
-)
 AC_MSG_NOTICE([])