We need libcurl dev lib for the zone-to-cache function.

Also fix config summary line and print curl feature on --version

diff --git a/builder-support/debian/recursor/debian-buster/control b/builder-support/debian/recursor/debian-buster/control
index f7dfb30e7ad9d93f6e24de75c7f09569f96436ce..dcc305e440b6b1a1ee83b3ad6f89b486e284047e 100644 (file)
--- a/builder-support/debian/recursor/debian-buster/control
+++ b/builder-support/debian/recursor/debian-buster/control
@@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 10),
                dh-autoreconf,
                libboost-all-dev,
                libcap-dev,
+               libcurl4-openssl-dev,
                libluajit-5.1-dev [!arm64 !s390x],
                liblua5.3-dev [arm64 s390x],
                libfstrm-dev,

diff --git a/builder-support/specs/pdns-recursor.spec b/builder-support/specs/pdns-recursor.spec
index 812cb5329db5d2dc58246f2ccc540c6c7c8492d8..db73951d30b4234e47b2ef698129eae9686427ef 100644 (file)
--- a/builder-support/specs/pdns-recursor.spec
+++ b/builder-support/specs/pdns-recursor.spec
@@ -17,6 +17,7 @@ BuildRequires: openssl-devel
 BuildRequires: net-snmp-devel
 BuildRequires: libsodium-devel
 BuildRequires: fstrm-devel
+BuildRequires: libcurl-devel
 
 %ifarch aarch64
 BuildRequires: lua-devel

diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac
index d54177cdee180b161c1dc909cc4c9103505d65bb..e092533fc061a7e35daac35dbb95694c5f0f1e17 100644 (file)
--- a/pdns/recursordist/configure.ac
+++ b/pdns/recursordist/configure.ac
@@ -96,7 +96,8 @@ PDNS_ENABLE_DNS_OVER_TLS
 
 AS_IF([test "x$enable_dns_over_tls" != "xno"], [
   PDNS_WITH_LIBSSL
-  PDNS_WITH_GNUTLS
+  # 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])
@@ -255,7 +256,7 @@ AS_IF([test "x$enable_dns_over_tls" != "xno"], [
     [AC_MSG_NOTICE([OpenSSL: no])]
   )]
 )
-AS_IF([test "x$HAVE_LIBCURL" != "x"],
+AS_IF([test "x$HAVE_LIBCURL" != "xn"],
   [AC_MSG_NOTICE([libcurl: yes])],
   [AC_MSG_NOTICE([libcurl: no])]
 )

diff --git a/pdns/version.cc b/pdns/version.cc
index 7b6d154753c57db81cf4a3dab442d86f1a51f0b7..6440d88887365dd95b9d7b38c2d95fc9b1900714 100644 (file)
--- a/pdns/version.cc
+++ b/pdns/version.cc
@@ -135,6 +135,9 @@ void showBuildConfiguration()
 #ifdef HAVE_LIBSODIUM
     "sodium " <<
 #endif
+#ifdef HAVE_LIBCURL
+    "curl " <<
+#endif
 #ifdef VERBOSELOG
     "verboselog" <<
 #endif