From: Michał Kępień <michal@isc.org>
Date: Mon, 29 Jun 2020 08:23:23 +0000 (+0200)
Subject: Fix libdns CFLAGS
X-Git-Tag: v9.17.3~32^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0975eeedd787f3171cca2f38c766364ca1ebb0a9;p=thirdparty%2Fbind9.git

Fix libdns CFLAGS

Since lib/dns/include/dns/view.h unconditionally defines dnstap-related
fields in struct dns_view (and includes <dns/dnstap.h>), care must be
taken to ensure that any source file which includes <dns/view.h> gets
built with a set of CFLAGS which allows <dns/dnstap.h> to be properly
processed (particularly its <fstrm.h> and <protobuf-c/protobuf-c.h>
conditional dependencies which are only included for dnstap-enabled
builds).  Ensure that by making LIBDNS_CFLAGS include DNSTAP_CFLAGS when
building with dnstap support.

The same reasoning applies for LMDB_CFLAGS.
---

diff --git a/Makefile.top b/Makefile.top
index b7d711c77c7..140ab4406e0 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -42,6 +42,16 @@ LIBDNS_CFLAGS = \
 LIBDNS_LIBS = \
 	$(top_builddir)/lib/dns/libdns.la
 
+if HAVE_DNSTAP
+LIBDNS_CFLAGS +=					\
+	$(DNSTAP_CFLAGS)
+endif HAVE_DNSTAP
+
+if HAVE_LMDB
+LIBDNS_CFLAGS +=					\
+	$(LMDB_CFLAGS)
+endif HAVE_LMDB
+
 LIBNS_CFLAGS = \
 	-I$(top_srcdir)/lib/ns/include