From: Josh Soref <jsoref@users.noreply.github.com>
Date: Fri, 5 Oct 2018 03:01:27 +0000 (-0400)
Subject: configure: enable-dnstap
X-Git-Tag: auth-4.2.0-alpha1~18^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3bbbeb11e5f8029f8f47a39afda7070b669b8f9d;p=thirdparty%2Fpdns.git

configure: enable-dnstap
---

diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh
index 95dc1f3ccf..d5e9151f29 100755
--- a/build-scripts/travis.sh
+++ b/build-scripts/travis.sh
@@ -462,7 +462,7 @@ build_dnsdist(){
     --with-libsodium \
     --enable-dnscrypt \
     --enable-dns-over-tls \
-    --enable-fstrm \
+    --enable-dnstap \
     --prefix=$HOME/dnsdist \
     --disable-silent-rules"
   run "make -k -j3"
diff --git a/builder-support/debian/dnsdist/debian-stretch/rules b/builder-support/debian/dnsdist/debian-stretch/rules
index eafbd4e166..fb65e47ef9 100755
--- a/builder-support/debian/dnsdist/debian-stretch/rules
+++ b/builder-support/debian/dnsdist/debian-stretch/rules
@@ -39,7 +39,7 @@ override_dh_auto_configure:
 	  --libexecdir='$${prefix}/lib' \
 	  --enable-dns-over-tls \
 	  --enable-dnscrypt \
-	  --enable-fstrm \
+	  --enable-dnstap \
 	  --with-gnutls \
 	  --with-libsodium \
 	  --with-re2 \
diff --git a/builder-support/specs/dnsdist.spec b/builder-support/specs/dnsdist.spec
index cf92e2ed47..e028e25edc 100644
--- a/builder-support/specs/dnsdist.spec
+++ b/builder-support/specs/dnsdist.spec
@@ -93,7 +93,7 @@ sed -i '/^ExecStart/ s/dnsdist/dnsdist -u dnsdist -g dnsdist/' dnsdist.service.i
   --without-net-snmp
 %endif
 %if 0%{?rhel} >= 7
-  --enable-fstrm \
+  --enable-dnstap \
   --with-gnutls \
   --with-protobuf \
   --with-lua=%{lua_implementation} \
diff --git a/m4/pdns_check_dnstap.m4 b/m4/pdns_check_dnstap.m4
new file mode 100644
index 0000000000..7900942043
--- /dev/null
+++ b/m4/pdns_check_dnstap.m4
@@ -0,0 +1,31 @@
+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@:>@]),
+    [enable_dnstap=$enableval],
+    [enable_dnstap=auto],
+  )
+  AC_MSG_RESULT([$enable_dnstap])
+
+  AS_IF([test "x$enable_dnstap" != "xno"], [
+    AS_IF([test "x$enable_dnstap" = "xyes" -o "x$enable_dnstap" = "xauto"], [
+      PKG_CHECK_MODULES([FSTRM], [libfstrm], [
+        AC_DEFINE([HAVE_FSTRM], [1], [Define to 1 if you have libfstrm])
+        save_CFLAGS=$CFLAGS
+        save_LIBS=$LIBS
+        CFLAGS="$FSTRM_CFLAGS $CFLAGS"
+        LIBS="$FSTRM_LIBS $LIBS"
+        AC_CHECK_FUNCS([fstrm_tcp_writer_init])
+        CFLAGS=$save_CFLAGS
+        LIBS=$save_LIBS
+      ], [ : ])
+    ])
+  ])
+
+  AM_CONDITIONAL([FSTRM], [test "x$FSTRM_LIBS" != "x"])
+  AS_IF([test "x$enable_dnstap" = "xyes"], [
+    AS_IF([test x"$FSTRM_LIBS" = "x"], [
+      AC_MSG_ERROR([dnstap requested but libfstrm was not found])
+    ])
+  ])
+])
diff --git a/m4/pdns_check_fstrm.m4 b/m4/pdns_check_fstrm.m4
deleted file mode 100644
index 2eb7936a81..0000000000
--- a/m4/pdns_check_fstrm.m4
+++ /dev/null
@@ -1,30 +0,0 @@
-AC_DEFUN([PDNS_CHECK_FSTRM], [
-  AC_MSG_CHECKING([whether we will be linking in fstrm])
-  AC_ARG_ENABLE([fstrm],
-    AS_HELP_STRING([--enable-fstrm],[use fstrm @<:@default=auto@:>@]),
-    [enable_fstrm=$enableval],
-    [enable_fstrm=auto],
-  )
-  AC_MSG_RESULT([$enable_fstrm])
-
-  AS_IF([test "x$enable_fstrm" != "xno"], [
-    AS_IF([test "x$enable_fstrm" = "xyes" -o "x$enable_fstrm" = "xauto"], [
-      PKG_CHECK_MODULES([FSTRM], [libfstrm], [
-        AC_DEFINE([HAVE_FSTRM], [1], [Define to 1 if you have libfstrm])
-        save_CFLAGS=$CFLAGS
-        save_LIBS=$LIBS
-        CFLAGS="$FSTRM_CFLAGS $CFLAGS"
-        LIBS="$FSTRM_LIBS $LIBS"
-        AC_CHECK_FUNCS([fstrm_tcp_writer_init])
-        CFLAGS=$save_CFLAGS
-        LIBS=$save_LIBS
-      ], [ : ])
-    ])
-  ])
-  AM_CONDITIONAL([FSTRM], [test "x$FSTRM_LIBS" != "x"])
-  AS_IF([test "x$enable_fstrm" = "xyes"], [
-    AS_IF([test x"$FSTRM_LIBS" = "x"], [
-      AC_MSG_ERROR([fstrm requested but libfstrm was not found])
-    ])
-  ])
-])
diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index dda139319d..a1b41989cf 100644
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -18,7 +18,7 @@ LT_PREREQ([2.2.2])
 LT_INIT([disable-static])
 
 PDNS_WITH_LIBSODIUM
-PDNS_CHECK_FSTRM
+PDNS_CHECK_DNSTAP
 PDNS_CHECK_RAGEL([dnslabeltext.cc], [www.dnsdist.org])
 PDNS_CHECK_LIBEDIT
 PDNS_CHECK_CLOCK_GETTIME
@@ -147,8 +147,8 @@ AS_IF([test "x$enable_dnscrypt" != "xno"],
   [AC_MSG_NOTICE([DNSCrypt: no])]
 )
 AS_IF([test "x$FSTRM_LIBS" != "x"],
-  [AC_MSG_NOTICE([fstrm: yes])],
-  [AC_MSG_NOTICE([fstrm: no])]
+  [AC_MSG_NOTICE([dnstap: yes])],
+  [AC_MSG_NOTICE([dnstap: no])]
 )
 AS_IF([test "x$RE2_LIBS" != "x"],
   [AC_MSG_NOTICE([re2: yes])],
diff --git a/pdns/dnsdistdist/m4/pdns_check_dnstap.m4 b/pdns/dnsdistdist/m4/pdns_check_dnstap.m4
new file mode 120000
index 0000000000..ed71845d97
--- /dev/null
+++ b/pdns/dnsdistdist/m4/pdns_check_dnstap.m4
@@ -0,0 +1 @@
+../../../m4/pdns_check_dnstap.m4
\ No newline at end of file
diff --git a/pdns/dnsdistdist/m4/pdns_check_fstrm.m4 b/pdns/dnsdistdist/m4/pdns_check_fstrm.m4
deleted file mode 120000
index f6852dee73..0000000000
--- a/pdns/dnsdistdist/m4/pdns_check_fstrm.m4
+++ /dev/null
@@ -1 +0,0 @@
-../../../m4/pdns_check_fstrm.m4
\ No newline at end of file