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 cd1e71d73114b8f7bd883381a56804dfd532acdb..850b5c778f63cccbff67e20a227c918323281236 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.11.2 released ---

diff --git a/bin/delv/Makefile.in b/bin/delv/Makefile.in
index e14968f7117dc66cd76f6ca40491ad5dfc1e6cb9..f77c94fa6d650b7c9b373cd4884c0fb897a005d9 100644 (file)
--- a/bin/delv/Makefile.in
+++ b/bin/delv/Makefile.in
@@ -13,7 +13,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 bd219c5d055ca798b83e2c8fec7d9bc2cc9b3514..161d0e9ef4068890b079ac773aa5c45fa27b606b 100644 (file)
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -14,9 +14,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 52164d63229bed3d0b4e91d3ec09e5acd0e1eab1..533683090d7d3fc52c1ffe2ab5a552c209bf2e43 100644 (file)
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -10,8 +10,8 @@ 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@
 CWARNINGS =

diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in
index 36d7b8dc01a854627e433fad4c7b32f8c927d0a1..97b75443072b3526831dc3a17c4dff962c7d8764 100644 (file)
--- a/bin/tools/Makefile.in
+++ b/bin/tools/Makefile.in
@@ -12,9 +12,9 @@ VERSION=@BIND9_VERSION@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@ \
+CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} \
                ${ISCCFG_INCLUDES} ${LWRES_INCLUDES} \
-               ${OMAPI_INCLUDES} ${BIND9_INCLUDES}
+               ${OMAPI_INCLUDES} ${BIND9_INCLUDES} @DST_OPENSSL_INC@ 
 
 CDEFINES =     @CRYPTO@ -DVERSION=\"${VERSION}\"
 CWARNINGS =

diff --git a/lib/bind9/Makefile.in b/lib/bind9/Makefile.in
index a98926e733f60a80918d299cd3dd4479c564c991..70d68547c9c6212de27500cefd130d98babfed14 100644 (file)
--- a/lib/bind9/Makefile.in
+++ b/lib/bind9/Makefile.in
@@ -17,7 +17,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 65d3f289caa548af2cf96dbf28e32588c8a0be4c..411fdd334e87fffe12d19622b3ff638ea629821f 100644 (file)
--- a/lib/irs/Makefile.in
+++ b/lib/irs/Makefile.in
@@ -18,7 +18,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 3e0a7e3e5d962d1c074bebb3bf0ad87e472f2579..bd8b109148ee002c45f973554071487945b5e564 100644 (file)
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -20,7 +20,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 8dc43632e758b195c98b20fae7373712f8cd3213..a55ff7e9e35733578b5b3afd56240481df87cca9 100644 (file)
--- a/lib/isc/unix/Makefile.in
+++ b/lib/isc/unix/Makefile.in
@@ -11,8 +11,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 6e2e8a76c2cac5388999ffe6c76e0b7464a81082..cd9c82559c3bd403dd831f0ce10f7d601e1e01f2 100644 (file)
--- a/lib/samples/Makefile.in
+++ b/lib/samples/Makefile.in
@@ -14,8 +14,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}\"