From: Michał Kępień <michal@isc.org>
Date: Thu, 23 Apr 2020 06:34:11 +0000 (+0200)
Subject: Ensure fstrm_capture is looked for
X-Git-Tag: v9.17.2~121^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51188b33f801ade652211e5751bdecb9d5dd44b9;p=thirdparty%2Fbind9.git

Ensure fstrm_capture is looked for

fstrm_capture is not an essential utility, but its corresponding
Makefile token needs to substituted even if it is not found in PATH or
else the "dnstap" system test will consistently fail.
---

diff --git a/configure.ac b/configure.ac
index 592f40f169c..36fdcfb3b0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1248,7 +1248,8 @@ AC_ARG_ENABLE([dnstap],
 AS_IF([test "$enable_dnstap" != "no"],
       [PKG_CHECK_MODULES([DNSTAP], [libfstrm libprotobuf-c], [],
 			 [AC_MSG_FAILURE([Required libraries (fstrm, protobuf-c) were not found, please install them.])])
-       AC_PATH_PROG([PROTOC_C], [protoc-c], [])
+       AC_PATH_PROG([FSTRM_CAPTURE], [fstrm_capture])
+       AC_PATH_PROG([PROTOC_C], [protoc-c])
        AS_IF([test -z "$PROTOC_C"],
 	     [AC_MSG_ERROR([protoc-c compiler not found])])
        AC_DEFINE([HAVE_DNSTAP], 1, [Define to 1 to enable dnstap support])