From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 9 Dec 2020 10:42:49 +0000 (+0100)
Subject: dnsdist: Use the generic dnstap m4 again
X-Git-Tag: rec-4.5.0-alpha1~38^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a4232ec2af2d9c958a384c2e1bb267c972cd7a4;p=thirdparty%2Fpdns.git

dnsdist: Use the generic dnstap m4 again
---

diff --git a/pdns/dnsdistdist/m4/pdns_check_dnstap.m4 b/pdns/dnsdistdist/m4/pdns_check_dnstap.m4
deleted file mode 100644
index 1be83c676f..0000000000
--- a/pdns/dnsdistdist/m4/pdns_check_dnstap.m4
+++ /dev/null
@@ -1,31 +0,0 @@
-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=$1@:>@]),
-    [enable_dnstap=$enableval],
-    [enable_dnstap=$1],
-  )
-  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/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