Commit 12471266 authored by Mark Andrews's avatar Mark Andrews

4653. [bug] Reorder includes to move @DST_OPENSSL_INC@ and

                        @ISC_OPENSSL_INC@ after shipped include directories.
                        [RT #45581]
parent b55ae9ab
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] [RT #45581]
4652. [bug] Nsupdate could attempt to use a zeroed address on 4652. [bug] Nsupdate could attempt to use a zeroed address on
......
...@@ -13,7 +13,7 @@ VERSION=@BIND9_VERSION@ ...@@ -13,7 +13,7 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@ @BIND9_MAKE_INCLUDES@
CINCLUDES = -I${srcdir}/include ${DNS_INCLUDES} ${ISC_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}\" \ CDEFINES = @CRYPTO@ -DVERSION=\"${VERSION}\" \
-DSYSCONFDIR=\"${sysconfdir}\" -DSYSCONFDIR=\"${sysconfdir}\"
......
...@@ -14,9 +14,9 @@ VERSION=@BIND9_VERSION@ ...@@ -14,9 +14,9 @@ VERSION=@BIND9_VERSION@
READLINE_LIB = @READLINE_LIB@ READLINE_LIB = @READLINE_LIB@
CINCLUDES = -I${srcdir}/include ${DNS_INCLUDES} ${BIND9_INCLUDES} \ CINCLUDES = -I${srcdir}/include ${DNS_INCLUDES} \
${ISC_INCLUDES} @DST_OPENSSL_INC@ \ ${BIND9_INCLUDES} ${ISC_INCLUDES} \
${LWRES_INCLUDES} ${ISCCFG_INCLUDES} ${LWRES_INCLUDES} ${ISCCFG_INCLUDES} @DST_OPENSSL_INC@
CDEFINES = -DVERSION=\"${VERSION}\" @CRYPTO@ CDEFINES = -DVERSION=\"${VERSION}\" @CRYPTO@
CWARNINGS = CWARNINGS =
......
...@@ -10,8 +10,8 @@ top_srcdir = @top_srcdir@ ...@@ -10,8 +10,8 @@ top_srcdir = @top_srcdir@
@BIND9_MAKE_INCLUDES@ @BIND9_MAKE_INCLUDES@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@ \ CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
${ISCCFG_INCLUDES} ${LWRES_INCLUDES} ${OMAPI_INCLUDES} ${LWRES_INCLUDES} ${OMAPI_INCLUDES} @DST_OPENSSL_INC@
CDEFINES = @CRYPTO@ CDEFINES = @CRYPTO@
CWARNINGS = CWARNINGS =
......
...@@ -12,9 +12,9 @@ VERSION=@BIND9_VERSION@ ...@@ -12,9 +12,9 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@ @BIND9_MAKE_INCLUDES@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@ \ CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} \
${ISCCFG_INCLUDES} ${LWRES_INCLUDES} \ ${ISCCFG_INCLUDES} ${LWRES_INCLUDES} \
${OMAPI_INCLUDES} ${BIND9_INCLUDES} ${OMAPI_INCLUDES} ${BIND9_INCLUDES} @DST_OPENSSL_INC@
CDEFINES = @CRYPTO@ -DVERSION=\"${VERSION}\" CDEFINES = @CRYPTO@ -DVERSION=\"${VERSION}\"
CWARNINGS = CWARNINGS =
......
...@@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@ ...@@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@ @BIND9_MAKE_INCLUDES@
CINCLUDES = -I. ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \ CINCLUDES = -I. ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
@ISC_OPENSSL_INC@ ${ISCCFG_INCLUDES} ${ISCCFG_INCLUDES} @ISC_OPENSSL_INC@
CDEFINES = @CRYPTO@ CDEFINES = @CRYPTO@
CWARNINGS = CWARNINGS =
......
...@@ -18,7 +18,7 @@ VERSION=@BIND9_VERSION@ ...@@ -18,7 +18,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = -I. -I./include -I${srcdir}/include \ CINCLUDES = -I. -I./include -I${srcdir}/include \
${DNS_INCLUDES} ${ISC_INCLUDES} \ ${DNS_INCLUDES} ${ISC_INCLUDES} \
@ISC_OPENSSL_INC@ ${ISCCFG_INCLUDES} ${ISCCFG_INCLUDES} @ISC_OPENSSL_INC@
CDEFINES = @CRYPTO@ CDEFINES = @CRYPTO@
CWARNINGS = CWARNINGS =
......
...@@ -20,7 +20,7 @@ CINCLUDES = -I${srcdir}/unix/include \ ...@@ -20,7 +20,7 @@ CINCLUDES = -I${srcdir}/unix/include \
-I${srcdir}/@ISC_THREAD_DIR@/include \ -I${srcdir}/@ISC_THREAD_DIR@/include \
-I${srcdir}/@ISC_ARCH_DIR@/include \ -I${srcdir}/@ISC_ARCH_DIR@/include \
-I./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}\" CDEFINES = @CRYPTO@ -DPK11_LIB_LOCATION=\"${PROVIDER}\"
CWARNINGS = CWARNINGS =
......
...@@ -11,8 +11,8 @@ top_srcdir = @top_srcdir@ ...@@ -11,8 +11,8 @@ top_srcdir = @top_srcdir@
CINCLUDES = -I${srcdir}/include \ CINCLUDES = -I${srcdir}/include \
-I${srcdir}/../@ISC_THREAD_DIR@/include \ -I${srcdir}/../@ISC_THREAD_DIR@/include \
-I../include \ -I../include \
-I${srcdir}/../include @ISC_OPENSSL_INC@ \ -I${srcdir}/../include \
-I${srcdir}/.. -I${srcdir}/.. @ISC_OPENSSL_INC@
CDEFINES = @CRYPTO@ CDEFINES = @CRYPTO@
CWARNINGS = CWARNINGS =
......
...@@ -14,8 +14,8 @@ VERSION=@BIND9_VERSION@ ...@@ -14,8 +14,8 @@ VERSION=@BIND9_VERSION@
CINCLUDES = -I${srcdir}/include -I../dns/include \ CINCLUDES = -I${srcdir}/include -I../dns/include \
${DNS_INCLUDES} ${ISC_INCLUDES} \ ${DNS_INCLUDES} ${ISC_INCLUDES} \
@ISC_OPENSSL_INC@ -I${top_srcdir}/lib/irs/include \ -I${top_srcdir}/lib/irs/include \
-I../../lib/irs/include -I../../lib/irs/include @ISC_OPENSSL_INC@
CDEFINES = @CRYPTO@ -DVERSION=\"${VERSION}\" \ CDEFINES = @CRYPTO@ -DVERSION=\"${VERSION}\" \
-DSYSCONFDIR=\"${sysconfdir}\" -DSYSCONFDIR=\"${sysconfdir}\"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment