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

@ISC_OPENSSL_INC@ after shipped include directories.
                        [RT #45581]
This commit is contained in:
Mark Andrews
2017-07-20 11:52:03 +10:00
parent b55ae9abd2
commit 124712666e
10 changed files with 17 additions and 16 deletions

View File

@@ -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}\"

View File

@@ -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 =

View File

@@ -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 =

View File

@@ -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 =