From: Mark Andrews <marka@isc.org>
Date: Thu, 20 Jul 2017 01:52:03 +0000 (+1000)
Subject: 4653.   [bug]           Reorder includes to move @DST_OPENSSL_INC@ and
X-Git-Tag: v9.10.6rc2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d93339a4b5c10961debfa5cb887b9070e5ca1a23;p=thirdparty%2Fbind9.git

4653.   [bug]           Reorder includes to move @DST_OPENSSL_INC@ and
                        @ISC_OPENSSL_INC@ after shipped include directories.
                        [RT #45581]

(cherry picked from commit 124712666e71b5f0323ffb91a89573f1bc2064fa)
---

diff --git a/CHANGES b/CHANGES
index 9f20681b426..373043017fb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
-4653.	[bug]		Reorder includes in bin/nsupdate/Makefile.in.
+4653.	[bug]		Reorder includes to move @DST_OPENSSL_INC@ and
+			@ISC_OPENSSL_INC@ after shipped include directories.
 			[RT #45581]
 
 	--- 9.10.6 released ---
diff --git a/bin/delv/Makefile.in b/bin/delv/Makefile.in
index b851184810d..fc333d1bda2 100644
--- a/bin/delv/Makefile.in
+++ b/bin/delv/Makefile.in
@@ -21,7 +21,7 @@ VERSION=@BIND9_VERSION@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =	-I${srcdir}/include ${DNS_INCLUDES} ${ISC_INCLUDES} \
-		@DST_OPENSSL_INC@ ${IRS_INCLUDES} ${ISCCFG_INCLUDES}
+		${IRS_INCLUDES} ${ISCCFG_INCLUDES} @DST_OPENSSL_INC@
 
 CDEFINES =	@CRYPTO@ -DVERSION=\"${VERSION}\" \
 		-DSYSCONFDIR=\"${sysconfdir}\"
diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
index ff341d14edc..e856784aec1 100644
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -25,9 +25,9 @@ VERSION=@BIND9_VERSION@
 
 READLINE_LIB = @READLINE_LIB@
 
-CINCLUDES =	-I${srcdir}/include ${DNS_INCLUDES} ${BIND9_INCLUDES} \
-		${ISC_INCLUDES} @DST_OPENSSL_INC@ \
-		${LWRES_INCLUDES} ${ISCCFG_INCLUDES}
+CINCLUDES =	-I${srcdir}/include ${DNS_INCLUDES} \
+		${BIND9_INCLUDES} ${ISC_INCLUDES} \
+		${LWRES_INCLUDES} ${ISCCFG_INCLUDES} @DST_OPENSSL_INC@
 
 CDEFINES =	-DVERSION=\"${VERSION}\" @CRYPTO@
 CWARNINGS =
diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index b47df0e8f5d..0954d7963af 100644
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -19,9 +19,9 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@ \
-		${ISCCFG_INCLUDES} ${LWRES_INCLUDES} ${OMAPI_INCLUDES} \
-		${BIND9_INCLUDES}
+CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
+		${LWRES_INCLUDES} ${OMAPI_INCLUDES} \
+		${BIND9_INCLUDES} @DST_OPENSSL_INC@
 
 CDEFINES =	@CRYPTO@
 CWARNINGS =
diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in
index 9232be31799..388bfd7c1ef 100644
--- a/bin/tools/Makefile.in
+++ b/bin/tools/Makefile.in
@@ -18,8 +18,9 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@ \
-		${ISCCFG_INCLUDES} ${LWRES_INCLUDES} ${OMAPI_INCLUDES}
+CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES} \
+		${ISCCFG_INCLUDES} ${LWRES_INCLUDES} \
+		${OMAPI_INCLUDES} @DST_OPENSSL_INC@
 
 CDEFINES =	@CRYPTO@
 
diff --git a/lib/bind9/Makefile.in b/lib/bind9/Makefile.in
index 6319bda4572..1203dbedd6a 100644
--- a/lib/bind9/Makefile.in
+++ b/lib/bind9/Makefile.in
@@ -26,7 +26,7 @@ VERSION=@BIND9_VERSION@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =	-I. ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
-		@ISC_OPENSSL_INC@ ${ISCCFG_INCLUDES}
+		${ISCCFG_INCLUDES} @ISC_OPENSSL_INC@
 
 CDEFINES =	@CRYPTO@
 CWARNINGS =
diff --git a/lib/irs/Makefile.in b/lib/irs/Makefile.in
index 20585f86d14..10e55bf4ff1 100644
--- a/lib/irs/Makefile.in
+++ b/lib/irs/Makefile.in
@@ -26,7 +26,7 @@ VERSION=@BIND9_VERSION@
 
 CINCLUDES =	-I. -I./include -I${srcdir}/include \
 		${DNS_INCLUDES} ${ISC_INCLUDES} \
-		@ISC_OPENSSL_INC@ ${ISCCFG_INCLUDES}
+		${ISCCFG_INCLUDES} @ISC_OPENSSL_INC@
 
 CDEFINES =	@CRYPTO@
 CWARNINGS =
diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index 511d30810fd..4a9e68c140a 100644
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -29,7 +29,7 @@ CINCLUDES =	-I${srcdir}/unix/include \
 		-I${srcdir}/@ISC_THREAD_DIR@/include \
 		-I${srcdir}/@ISC_ARCH_DIR@/include \
 		-I./include \
-		-I${srcdir}/include @ISC_OPENSSL_INC@ ${DNS_INCLUDES}
+		-I${srcdir}/include ${DNS_INCLUDES} @ISC_OPENSSL_INC@
 CDEFINES =	@CRYPTO@ -DPK11_LIB_LOCATION=\"${PROVIDER}\"
 CWARNINGS =
 
diff --git a/lib/isc/unix/Makefile.in b/lib/isc/unix/Makefile.in
index e823c25c952..9964d40b7e8 100644
--- a/lib/isc/unix/Makefile.in
+++ b/lib/isc/unix/Makefile.in
@@ -20,8 +20,8 @@ top_srcdir =	@top_srcdir@
 CINCLUDES =	-I${srcdir}/include \
 		-I${srcdir}/../@ISC_THREAD_DIR@/include \
 		-I../include \
-		-I${srcdir}/../include @ISC_OPENSSL_INC@ \
-		-I${srcdir}/..
+		-I${srcdir}/../include \
+		-I${srcdir}/.. @ISC_OPENSSL_INC@
 
 CDEFINES =	@CRYPTO@
 CWARNINGS =
diff --git a/lib/samples/Makefile.in b/lib/samples/Makefile.in
index b2efa2218ff..9cb303b0af5 100644
--- a/lib/samples/Makefile.in
+++ b/lib/samples/Makefile.in
@@ -22,8 +22,8 @@ VERSION=@BIND9_VERSION@
 
 CINCLUDES =	-I${srcdir}/include -I../dns/include \
 		${DNS_INCLUDES} ${ISC_INCLUDES} \
-		@ISC_OPENSSL_INC@ -I${top_srcdir}/lib/irs/include \
-		-I../../lib/irs/include
+		-I${top_srcdir}/lib/irs/include \
+		-I../../lib/irs/include @ISC_OPENSSL_INC@
 
 CDEFINES =	@CRYPTO@ -DVERSION=\"${VERSION}\" \
 		-DSYSCONFDIR=\"${sysconfdir}\"