From b8fc8742e568a9afcf9d2254ea31272cf8abe65c Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 22 Dec 2020 11:29:29 +1100
Subject: [PATCH] Re-order include directories

${FSTRM_CFLAGS} ${PROTOBUF_C_CFLAGS} ${OPENSSL_CFLAGS} ${LMDB_CFLAGS}
need to appear after all directories in the build tree.
---
 bin/check/Makefile.in     | 5 ++---
 bin/named/Makefile.in     | 1 +
 bin/tools/Makefile.in     | 2 +-
 lib/bind9/Makefile.in     | 2 +-
 lib/dns/tests/Makefile.in | 3 ++-
 make/includes.in          | 4 +---
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
index 8a58f9bf8d..07417e5392 100644
--- a/bin/check/Makefile.in
+++ b/bin/check/Makefile.in
@@ -15,9 +15,8 @@ VERSION=@BIND9_VERSION@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	${NS_INCLUDES} ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISCCFG_INCLUDES} \
-		${ISC_INCLUDES} \
-		${OPENSSL_CFLAGS}
+CINCLUDES =	${NS_INCLUDES} ${BIND9_INCLUDES} ${DNS_INCLUDES} \
+		${ISCCFG_INCLUDES} ${ISC_INCLUDES} ${OPENSSL_CFLAGS}
 
 CDEFINES = 	-DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
 CWARNINGS =
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index cbed0da58d..dc76332904 100644
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -49,6 +49,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include -I. \
 		${DBDRIVER_INCLUDES} \
 		${LIBUV_CFLAGS} \
 		${FSTRM_CFLAGS} \
+		${LMDB_CFLAGS} \
 		${OPENSSL_CFLAGS} \
 		${PROTOBUF_C_CFLAGS} \
 		${JSON_C_CFLAGS} \
diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in
index 0d683ec61c..fed5323bac 100644
--- a/bin/tools/Makefile.in
+++ b/bin/tools/Makefile.in
@@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@
 
 CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
 		${BIND9_INCLUDES} \
-		${OPENSSL_CFLAGS} \
+		${LMDB_CFLAGS} ${OPENSSL_CFLAGS} \
 		${PROTOBUF_C_CFLAGS} \
 		${MAXMINDDB_CFLAGS} \
 		${LMDB_CFLAGS}
diff --git a/lib/bind9/Makefile.in b/lib/bind9/Makefile.in
index da27f5f8f1..3a0cc39630 100644
--- a/lib/bind9/Makefile.in
+++ b/lib/bind9/Makefile.in
@@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@
 
 CINCLUDES =	-I. ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
 		${ISCCFG_INCLUDES} ${NS_INCLUDES} \
-		${OPENSSL_CFLAGS}
+		${FSTRM_CFLAGS} ${OPENSSL_CFLAGS}
 
 CDEFINES =
 CWARNINGS =
diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index a56c7d3b02..3bb5e01c09 100644
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -16,7 +16,8 @@ VERSION=@BIND9_VERSION@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =	-I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \
-		${OPENSSL_CFLAGS} ${MAXMINDDB_CFLAGS} @CMOCKA_CFLAGS@
+		${FSTRM_CFLAGS} ${OPENSSL_CFLAGS} \
+		${PROTOBUF_C_CFLAGS} ${MAXMINDDB_CFLAGS} @CMOCKA_CFLAGS@
 CDEFINES =	-DTESTS="\"${top_builddir}/lib/dns/tests/\""
 
 ISCLIBS =	../../isc/libisc.@A@ @NO_LIBTOOL_ISCLIBS@
diff --git a/make/includes.in b/make/includes.in
index 5373a7e882..b8317d3d24 100644
--- a/make/includes.in
+++ b/make/includes.in
@@ -26,9 +26,7 @@ ISCCFG_INCLUDES = @BIND9_ISCCFG_BUILDINCLUDE@ \
        -I${top_srcdir}/lib/isccfg/include
 
 DNS_INCLUDES = @BIND9_DNS_BUILDINCLUDE@ \
-	-I${top_srcdir}/lib/dns/include \
-	${FSTRM_CFLAGS} ${PROTOBUF_C_CFLAGS} \
-	${OPENSSL_CFLAGS} ${LMDB_CFLAGS}
+	-I${top_srcdir}/lib/dns/include
 
 NS_INCLUDES = @BIND9_NS_BUILDINCLUDE@ \
 	-I${top_srcdir}/lib/ns/include