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 9f20681b42695b705c083f005095b655b3f9a159..373043017fbbbdeb3e0569b31f179aaf102e0a26 100644 (file)
--- 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 b851184810daafd8b6026f4ceadea7a4bdfb3c00..fc333d1bda24623f556868f2f0cde1defb84882f 100644 (file)
--- 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 ff341d14edc1497813dae1a385686d262d9cd45d..e856784aec1804bfe8b44fd76820f5037b46ad19 100644 (file)
--- 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 b47df0e8f5d3527198e7fb3fd505be105cd8fb47..0954d7963af59c9667117609497830797f4d8b48 100644 (file)
--- 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 9232be317993df3e29ea0bed1846bf2b24d61613..388bfd7c1ef36bfc20a886fe2627cad512c4cf3e 100644 (file)
--- 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 6319bda4572d6cc0a5e371a7bfec275accc48c02..1203dbedd6a4f95e895bc56237fbcaa17b2b19e8 100644 (file)
--- 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 20585f86d14eceacc4fdb8290c71a6bcee48d3c2..10e55bf4ff1eab30570464d69af16df2fa9d3206 100644 (file)
--- 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 511d30810fde7786ebe6a4cfb66de036db00ea11..4a9e68c140ae6c5af2fed3bf1fd4007ad6d30e74 100644 (file)
--- 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 e823c25c9528a756076284449895bdd48b0adaf5..9964d40b7e809b5aa513f8d06f7a7f27895d0d8b 100644 (file)
--- 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 b2efa2218ff3da0da03cbeb595ffef459338dc10..9cb303b0af51e8594a5b3afcb113723dff2b6572 100644 (file)
--- 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}\"