From e33710de9cd42d1d9fc00685cd27625df06fa152 Mon Sep 17 00:00:00 2001
From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 3 Sep 2019 16:14:15 +0200
Subject: [PATCH] Parameterize dnstap configure default (rec=no, dndist=auto)

---
 m4/pdns_check_dnstap.m4        | 4 ++--
 pdns/dnsdistdist/configure.ac  | 2 +-
 pdns/recursordist/configure.ac | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/m4/pdns_check_dnstap.m4 b/m4/pdns_check_dnstap.m4
index 790094204..1be83c676 100644
--- a/m4/pdns_check_dnstap.m4
+++ b/m4/pdns_check_dnstap.m4
@@ -1,9 +1,9 @@
 AC_DEFUN([PDNS_CHECK_DNSTAP], [
   AC_MSG_CHECKING([whether we will have dnstap])
   AC_ARG_ENABLE([dnstap],
-    AS_HELP_STRING([--enable-dnstap],[enable dnstap support @<:@default=auto@:>@]),
+    AS_HELP_STRING([--enable-dnstap],[enable dnstap support @<:@default=$1@:>@]),
     [enable_dnstap=$enableval],
-    [enable_dnstap=auto],
+    [enable_dnstap=$1],
   )
   AC_MSG_RESULT([$enable_dnstap])
 
diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index 8a27a917e..544a9bb1b 100644
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -21,7 +21,7 @@ CFLAGS="-Wall -g -O3 $CFLAGS"
 CXXFLAGS="-Wall -g -O3 $CXXFLAGS"
 
 PDNS_WITH_LIBSODIUM
-PDNS_CHECK_DNSTAP
+PDNS_CHECK_DNSTAP([auto])
 PDNS_CHECK_RAGEL([dnslabeltext.cc], [www.dnsdist.org])
 PDNS_CHECK_LIBEDIT
 PDNS_CHECK_CLOCK_GETTIME
diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac
index acdbea9f1..8f9849a3f 100644
--- a/pdns/recursordist/configure.ac
+++ b/pdns/recursordist/configure.ac
@@ -119,7 +119,7 @@ AC_ARG_WITH([nod-cache-dir],
   [nodcachedir="$withval"]
 )
 
-PDNS_CHECK_DNSTAP
+PDNS_CHECK_DNSTAP([no])
 
 AC_MSG_CHECKING([whether we will enable compiler security checks])
 AC_ARG_ENABLE([hardening],
-- 
2.40.0