mirror of
https://github.com/isc-projects/bind9.git
synced 2026-04-29 01:49:02 -04:00
4653. [bug] Reorder includes to move @DST_OPENSSL_INC@ and
@ISC_OPENSSL_INC@ after shipped include directories.
[RT #45581]
This commit is contained in:
parent
b55ae9abd2
commit
124712666e
10 changed files with 17 additions and 16 deletions
3
CHANGES
3
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]
|
||||
|
||||
4652. [bug] Nsupdate could attempt to use a zeroed address on
|
||||
|
|
|
|||
|
|
@ -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}\"
|
||||
|
|
|
|||
|
|
@ -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 =
|
||||
|
|
|
|||
|
|
@ -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 =
|
||||
|
|
|
|||
|
|
@ -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 =
|
||||
|
|
|
|||
|
|
@ -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 =
|
||||
|
|
|
|||
|
|
@ -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 =
|
||||
|
|
|
|||
|
|
@ -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 =
|
||||
|
||||
|
|
|
|||
|
|
@ -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 =
|
||||
|
|
|
|||
|
|
@ -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}\"
|
||||
|
|
|
|||
Loading…
Reference in a new issue