From: Josh Soref <jsoref@users.noreply.github.com>
Date: Thu, 4 Oct 2018 05:43:54 +0000 (-0400)
Subject: configure: with-gnutls
X-Git-Tag: auth-4.2.0-alpha1~18^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04c46adca3b7040dffbadcd6fd41160f94caeca1;p=thirdparty%2Fpdns.git

configure: with-gnutls
---

diff --git a/builder-support/debian/dnsdist/debian-jessie/rules b/builder-support/debian/dnsdist/debian-jessie/rules
index 32b57cc8a8..5c780fb23f 100755
--- a/builder-support/debian/dnsdist/debian-jessie/rules
+++ b/builder-support/debian/dnsdist/debian-jessie/rules
@@ -37,7 +37,7 @@ override_dh_auto_configure:
 	  --infodir=\$${prefix}/share/info \
 	  --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)' \
 	  --libexecdir='$${prefix}/lib' \
-	  --disable-gnutls \
+	  --without-gnutls \
 	  --enable-dns-over-tls \
 	  --enable-dnscrypt \
 	  --enable-libsodium \
diff --git a/builder-support/debian/dnsdist/debian-stretch/rules b/builder-support/debian/dnsdist/debian-stretch/rules
index 0a88327b5c..470a4c62c0 100755
--- a/builder-support/debian/dnsdist/debian-stretch/rules
+++ b/builder-support/debian/dnsdist/debian-stretch/rules
@@ -40,7 +40,7 @@ override_dh_auto_configure:
 	  --enable-dns-over-tls \
 	  --enable-dnscrypt \
 	  --enable-fstrm \
-	  --enable-gnutls \
+	  --with-gnutls \
 	  --enable-libsodium \
 	  --enable-re2 \
 	  --with-ebpf \
diff --git a/builder-support/debian/dnsdist/ubuntu-trusty/rules b/builder-support/debian/dnsdist/ubuntu-trusty/rules
index 4ae3848715..64ade97c68 100755
--- a/builder-support/debian/dnsdist/ubuntu-trusty/rules
+++ b/builder-support/debian/dnsdist/ubuntu-trusty/rules
@@ -30,7 +30,7 @@ override_dh_auto_configure:
 	  --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)' \
 	  --libexecdir='$${prefix}/lib' \
 	  --disable-dnscrypt \
-	  --disable-gnutls \
+	  --without-gnutls \
 	  --disable-libsodium \
 	  --disable-re2 \
 	  --enable-dns-over-tls \
diff --git a/builder-support/specs/dnsdist.spec b/builder-support/specs/dnsdist.spec
index 20d1ddce53..b2a56d4218 100644
--- a/builder-support/specs/dnsdist.spec
+++ b/builder-support/specs/dnsdist.spec
@@ -94,7 +94,7 @@ sed -i '/^ExecStart/ s/dnsdist/dnsdist -u dnsdist -g dnsdist/' dnsdist.service.i
 %endif
 %if 0%{?rhel} >= 7
   --enable-fstrm \
-  --enable-gnutls \
+  --with-gnutls \
   --with-protobuf \
   --with-lua=%{lua_implementation} \
   --enable-libsodium \
diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index f55e394eee..00617f6534 100644
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -51,7 +51,7 @@ PDNS_WITH_LUA([mandatory])
 PDNS_CHECK_LUA_HPP
 
 DNSDIST_ENABLE_DNS_OVER_TLS
-DNSDIST_CHECK_GNUTLS
+DNSDIST_WITH_GNUTLS
 DNSDIST_CHECK_LIBSSL
 AS_IF([test "x$enable_dns_over_tls" != "xno"], [
   AS_IF([test "$HAVE_LIBSSL" = "1"], [
diff --git a/pdns/dnsdistdist/m4/dnsdist_check_gnutls.m4 b/pdns/dnsdistdist/m4/dnsdist_with_gnutls.m4
similarity index 65%
rename from pdns/dnsdistdist/m4/dnsdist_check_gnutls.m4
rename to pdns/dnsdistdist/m4/dnsdist_with_gnutls.m4
index 77bb03f14f..c1d849c156 100644
--- a/pdns/dnsdistdist/m4/dnsdist_check_gnutls.m4
+++ b/pdns/dnsdistdist/m4/dnsdist_with_gnutls.m4
@@ -1,15 +1,15 @@
-AC_DEFUN([DNSDIST_CHECK_GNUTLS], [
+AC_DEFUN([DNSDIST_WITH_GNUTLS], [
   AC_MSG_CHECKING([whether we will be linking in GnuTLS])
   HAVE_GNUTLS=0
-  AC_ARG_ENABLE([gnutls],
-    AS_HELP_STRING([--enable-gnutls],[use GnuTLS @<:@default=auto@:>@]),
-    [enable_gnutls=$enableval],
-    [enable_gnutls=auto],
+  AC_ARG_WITH([gnutls],
+    AS_HELP_STRING([--with-gnutls],[use GnuTLS @<:@default=auto@:>@]),
+    [with_gnutls=$withval],
+    [with_gnutls=auto],
   )
-  AC_MSG_RESULT([$enable_gnutls])
+  AC_MSG_RESULT([$with_gnutls])
 
-  AS_IF([test "x$enable_gnutls" != "xno"], [
-    AS_IF([test "x$enable_gnutls" = "xyes" -o "x$enable_gnutls" = "xauto"], [
+  AS_IF([test "x$with_gnutls" != "xno"], [
+    AS_IF([test "x$with_gnutls" = "xyes" -o "x$with_gnutls" = "xauto"], [
       # we require gnutls_certificate_set_x509_key_file, added in 3.1.11
       PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.1.11], [
         [HAVE_GNUTLS=1]
@@ -26,7 +26,7 @@ AC_DEFUN([DNSDIST_CHECK_GNUTLS], [
     ])
   ])
   AM_CONDITIONAL([HAVE_GNUTLS], [test "x$GNUTLS_LIBS" != "x"])
-  AS_IF([test "x$enable_gnutls" = "xyes"], [
+  AS_IF([test "x$with_gnutls" = "xyes"], [
     AS_IF([test x"$GNUTLS_LIBS" = "x"], [
       AC_MSG_ERROR([GnuTLS requested but libraries were not found])
     ])