From e5b5898e1fcc256f8ee60fc84e61c87f9b857a04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Wed, 30 Jan 2019 14:37:17 +0100
Subject: [PATCH] Create feature-test in source directory

Feature-test tool is used in system tests to test compiled in changes.
Because we build more variants of named with different configuration,
compile feature-test for each of them this way.
---
 bin/named/Makefile.am       | 10 ++++++++++
 bin/tests/system/conf.sh.in |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/bin/named/Makefile.am b/bin/named/Makefile.am
index ce783b8..90ebc3a 100644
--- a/bin/named/Makefile.am
+++ b/bin/named/Makefile.am
@@ -34,6 +34,16 @@ AM_CPPFLAGS +=						\
 
 sbin_PROGRAMS = named
 
+bin_PROGRAMS =		\
+	feature-test		\
+
+feature_test_SOURCES =	\
+	$(top_srcdir)/bin/tests/system/feature-test.c
+
+feature_test_CPPFLAGS =		\
+	$(AM_CPPFLAGS)		\
+	$(LIBDNS_CFLAGS)
+
 nodist_named_SOURCES = xsl.c
 BUILT_SOURCES = xsl.c
 CLEANFILES = xsl.c
diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 8ff73f0..dd04278 100644
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -35,7 +35,7 @@ DELV=$TOP_BUILDDIR/bin/delv/delv
 DIG=$TOP_BUILDDIR/bin/dig/dig
 DNSTAPREAD=$TOP_BUILDDIR/bin/tools/dnstap-read
 DSFROMKEY=$TOP_BUILDDIR/bin/dnssec/dnssec-dsfromkey
-FEATURETEST=$TOP_BUILDDIR/bin/tests/system/feature-test
+FEATURETEST=$TOP_BUILDDIR/bin/named/feature-test
 FSTRM_CAPTURE=@FSTRM_CAPTURE@
 HOST=$TOP_BUILDDIR/bin/dig/host
 IMPORTKEY=$TOP_BUILDDIR/bin/dnssec/dnssec-importkey
-- 
2.26.2