diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in index 2f8e5b8d87..0a99fc2477 100644 --- a/bin/check/Makefile.in +++ b/bin/check/Makefile.in @@ -16,15 +16,16 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ CINCLUDES = ${NS_INCLUDES} ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISCCFG_INCLUDES} \ - ${ISC_INCLUDES} @OPENSSL_INCLUDES@ + ${ISC_INCLUDES} \ + ${OPENSSL_CFLAGS} CDEFINES = -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\" CWARNINGS = DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} BIND9LIBS = ../../lib/bind9/libbind9.@A@ NSLIBS = ../../lib/ns/libns.@A@ diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in index f32a2083f4..93c71e4d28 100644 --- a/bin/confgen/Makefile.in +++ b/bin/confgen/Makefile.in @@ -27,8 +27,8 @@ CWARNINGS = ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCCLIBS = ../../lib/isccc/libisccc.@A@ -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ diff --git a/bin/delv/Makefile.in b/bin/delv/Makefile.in index 958b160e05..8c66f2da08 100644 --- a/bin/delv/Makefile.in +++ b/bin/delv/Makefile.in @@ -16,7 +16,8 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ CINCLUDES = -I${srcdir}/include ${DNS_INCLUDES} ${ISC_INCLUDES} \ - ${IRS_INCLUDES} ${ISCCFG_INCLUDES} @OPENSSL_INCLUDES@ + ${IRS_INCLUDES} ${ISCCFG_INCLUDES} \ + ${OPENSSL_CFLAGS} CDEFINES = -DVERSION=\"${VERSION}\" \ -DSYSCONFDIR=\"${sysconfdir}\" @@ -24,8 +25,8 @@ CWARNINGS = ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} IRSLIBS = ../../lib/irs/libirs.@A@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@ diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in index f878302d85..e74f560bc6 100644 --- a/bin/dig/Makefile.in +++ b/bin/dig/Makefile.in @@ -19,7 +19,8 @@ READLINE_LIB = @READLINE_LIB@ CINCLUDES = -I${srcdir}/include ${DNS_INCLUDES} \ ${BIND9_INCLUDES} ${ISC_INCLUDES} \ - ${IRS_INCLUDES} ${ISCCFG_INCLUDES} @LIBIDN2_CFLAGS@ @OPENSSL_INCLUDES@ + ${IRS_INCLUDES} ${ISCCFG_INCLUDES} @LIBIDN2_CFLAGS@ \ + ${OPENSSL_CFLAGS} CDEFINES = -DVERSION=\"${VERSION}\" CWARNINGS = @@ -27,8 +28,8 @@ CWARNINGS = ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} IRSLIBS = ../../lib/irs/libirs.@A@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@ diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in index 65bff2aafa..996ad5647f 100644 --- a/bin/dnssec/Makefile.in +++ b/bin/dnssec/Makefile.in @@ -15,14 +15,15 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ +CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} \ + ${OPENSSL_CFLAGS} CDEFINES = -DVERSION=\"${VERSION}\" CWARNINGS = DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSDEPLIBS = ../../lib/dns/libdns.@A@ ISCDEPLIBS = ../../lib/isc/libisc.@A@ diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in index 1ddcf35893..b3b01bd388 100644 --- a/bin/named/Makefile.in +++ b/bin/named/Makefile.in @@ -46,7 +46,8 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \ ${NS_INCLUDES} ${DNS_INCLUDES} \ ${BIND9_INCLUDES} ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} \ ${ISC_INCLUDES} ${DLZDRIVER_INCLUDES} \ - ${DBDRIVER_INCLUDES} @OPENSSL_INCLUDES@ \ + ${DBDRIVER_INCLUDES} \ + ${OPENSSL_CFLAGS} \ ${JSON_C_CFLAGS} \ ${LIBXML2_CFLAGS} @@ -57,8 +58,8 @@ CWARNINGS = DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCCLIBS = ../../lib/isccc/libisccc.@A@ -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} BIND9LIBS = ../../lib/bind9/libbind9.@A@ NSLIBS = ../../lib/ns/libns.@A@ diff --git a/bin/named/unix/Makefile.in b/bin/named/unix/Makefile.in index 01c60e790b..fd9ca8d113 100644 --- a/bin/named/unix/Makefile.in +++ b/bin/named/unix/Makefile.in @@ -15,7 +15,8 @@ top_srcdir = @top_srcdir@ CINCLUDES = -I${srcdir}/include -I${srcdir}/../include \ ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} \ - ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ + ${DNS_INCLUDES} ${ISC_INCLUDES} \ + ${OPENSSL_CFLAGS} CDEFINES = CWARNINGS = diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in index 47823502ad..d213c39358 100644 --- a/bin/nsupdate/Makefile.in +++ b/bin/nsupdate/Makefile.in @@ -21,15 +21,15 @@ DST_GSSAPI_INC = @DST_GSSAPI_INC@ CINCLUDES = ${DNS_INCLUDES} ${BIND9_INCLUDES} ${ISC_INCLUDES} \ ${ISCCFG_INCLUDES} ${IRS_INCLUDES} ${DST_GSSAPI_INC} \ - @OPENSSL_INCLUDES@ + ${OPENSSL_CFLAGS} CDEFINES = -DVERSION=\"${VERSION}\" @USE_GSSAPI@ CWARNINGS = DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ IRSLIBS = ../../lib/irs/libirs.@A@ diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in index 99fedb9fbb..6edc03c746 100644 --- a/bin/pkcs11/Makefile.in +++ b/bin/pkcs11/Makefile.in @@ -17,7 +17,7 @@ CINCLUDES = ${ISC_INCLUDES} CDEFINES = -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCDEPLIBS = ../../lib/isc/libisc.@A@ diff --git a/bin/plugins/Makefile.in b/bin/plugins/Makefile.in index 045f582935..de99561a95 100644 --- a/bin/plugins/Makefile.in +++ b/bin/plugins/Makefile.in @@ -19,7 +19,7 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} NSLIBS = ../../lib/ns/libns.@A@ LIBS = diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in index d88698bca2..f6131edc98 100644 --- a/bin/rndc/Makefile.in +++ b/bin/rndc/Makefile.in @@ -23,8 +23,8 @@ CWARNINGS = ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCCLIBS = ../../lib/isccc/libisccc.@A@ -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in index 7be8fcc947..a10ad34b95 100644 --- a/bin/tests/Makefile.in +++ b/bin/tests/Makefile.in @@ -14,15 +14,15 @@ top_srcdir = @top_srcdir@ @BIND9_MAKE_INCLUDES@ CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \ - @OPENSSL_INCLUDES@ + ${OPENSSL_CFLAGS} CDEFINES = CWARNINGS = BACKTRACECFLAGS = @BACKTRACECFLAGS@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ DNSDEPLIBS = ../../lib/dns/libdns.@A@ diff --git a/bin/tests/optional/Makefile.in b/bin/tests/optional/Makefile.in index fc07abafb6..47065a5bfd 100644 --- a/bin/tests/optional/Makefile.in +++ b/bin/tests/optional/Makefile.in @@ -14,7 +14,7 @@ top_srcdir = @top_srcdir@ @BIND9_MAKE_INCLUDES@ CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \ - @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ + ${OPENSSL_CFLAGS} @DST_GSSAPI_INC@ CDEFINES = @USE_GSSAPI@ @@ -23,8 +23,8 @@ BACKTRACECFLAGS = @BACKTRACECFLAGS@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ -ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} -ISCNOSYMLIBS = ../../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCCFGLIBS = ../../../lib/isccfg/libisccfg.@A@ DNSDEPLIBS = ../../../lib/dns/libdns.@A@ diff --git a/bin/tests/pkcs11/Makefile.in b/bin/tests/pkcs11/Makefile.in index 9569cc1951..41c0e5d761 100644 --- a/bin/tests/pkcs11/Makefile.in +++ b/bin/tests/pkcs11/Makefile.in @@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@ CINCLUDES = ${ISC_INCLUDES} CDEFINES = -ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} LIBS = ${ISCLIBS} @LIBS@ diff --git a/bin/tests/pkcs11/benchmarks/Makefile.in b/bin/tests/pkcs11/benchmarks/Makefile.in index 46a57ff104..0f11426c19 100644 --- a/bin/tests/pkcs11/benchmarks/Makefile.in +++ b/bin/tests/pkcs11/benchmarks/Makefile.in @@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@ CINCLUDES = ${ISC_INCLUDES} CDEFINES = -ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} LIBS = ${ISCLIBS} @LIBS@ diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in index 40a3ffcc60..4446501438 100644 --- a/bin/tests/system/Makefile.in +++ b/bin/tests/system/Makefile.in @@ -23,7 +23,7 @@ CDEFINES = @USE_GSSAPI@ @CONTRIB_DLZ@ CWARNINGS = DNSLIBS = -ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSDEPLIBS = ISCDEPLIBS = diff --git a/bin/tests/system/dlzexternal/Makefile.in b/bin/tests/system/dlzexternal/Makefile.in index f240ea925b..4eee745b03 100644 --- a/bin/tests/system/dlzexternal/Makefile.in +++ b/bin/tests/system/dlzexternal/Makefile.in @@ -15,7 +15,8 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ +CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} \ + ${OPENSSL_CFLAGS} CDEFINES = CWARNINGS = diff --git a/bin/tests/system/dyndb/driver/Makefile.in b/bin/tests/system/dyndb/driver/Makefile.in index ebcf3c659e..7c15c07a13 100644 --- a/bin/tests/system/dyndb/driver/Makefile.in +++ b/bin/tests/system/dyndb/driver/Makefile.in @@ -13,13 +13,14 @@ top_srcdir = @top_srcdir@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ +CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} \ + ${OPENSSL_CFLAGS} CDEFINES = CWARNINGS = DNSLIBS = ../../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ -ISCLIBS = ../../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../../../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSDEPLIBS = ../../../../../lib/dns/libdns.@A@ ISCDEPLIBS = ../../../../../lib/isc/libisc.@A@ diff --git a/bin/tests/system/pipelined/Makefile.in b/bin/tests/system/pipelined/Makefile.in index db7f290bfd..275e4cfb40 100644 --- a/bin/tests/system/pipelined/Makefile.in +++ b/bin/tests/system/pipelined/Makefile.in @@ -15,13 +15,14 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ +CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} \ + ${OPENSSL_CFLAGS} CDEFINES = CWARNINGS = DNSLIBS = ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ -ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSDEPLIBS = ../../../../lib/dns/libdns.@A@ ISCDEPLIBS = ../../../../lib/isc/libisc.@A@ diff --git a/bin/tests/system/rndc/Makefile.in b/bin/tests/system/rndc/Makefile.in index e911bbebec..8aedb8529c 100644 --- a/bin/tests/system/rndc/Makefile.in +++ b/bin/tests/system/rndc/Makefile.in @@ -20,7 +20,7 @@ CINCLUDES = ${ISC_INCLUDES} CDEFINES = CWARNINGS = -ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSDEPLIBS = ISCDEPLIBS = ../../../../lib/isc/libisc.@A@ diff --git a/bin/tests/system/rpz/Makefile.in b/bin/tests/system/rpz/Makefile.in index 81783af0e2..a67f98169e 100644 --- a/bin/tests/system/rpz/Makefile.in +++ b/bin/tests/system/rpz/Makefile.in @@ -21,7 +21,7 @@ CDEFINES = CWARNINGS = DNSLIBS = -ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSDEPLIBS = ISCDEPLIBS = ../../../../lib/isc/libisc.@A@ diff --git a/bin/tests/system/rsabigexponent/Makefile.in b/bin/tests/system/rsabigexponent/Makefile.in index 5244d67a56..5c7abb42d3 100644 --- a/bin/tests/system/rsabigexponent/Makefile.in +++ b/bin/tests/system/rsabigexponent/Makefile.in @@ -15,13 +15,14 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ +CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} \ + ${OPENSSL_CFLAGS} CDEFINES = CWARNINGS = DNSLIBS = ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ -ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSDEPLIBS = ../../../../lib/dns/libdns.@A@ ISCDEPLIBS = ../../../../lib/isc/libisc.@A@ diff --git a/bin/tests/system/tkey/Makefile.in b/bin/tests/system/tkey/Makefile.in index ac47a60165..c02dacc522 100644 --- a/bin/tests/system/tkey/Makefile.in +++ b/bin/tests/system/tkey/Makefile.in @@ -15,13 +15,14 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ +CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} \ + ${OPENSSL_CFLAGS} CDEFINES = CWARNINGS = DNSLIBS = ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ -ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSDEPLIBS = ../../../../lib/dns/libdns.@A@ ISCDEPLIBS = ../../../../lib/isc/libisc.@A@ diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in index 292156b521..5d602f9265 100644 --- a/bin/tools/Makefile.in +++ b/bin/tools/Makefile.in @@ -16,15 +16,16 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \ - ${BIND9_INCLUDES} @OPENSSL_INCLUDES@ + ${BIND9_INCLUDES} \ + ${OPENSSL_CFLAGS} CDEFINES = -DVERSION=\"${VERSION}\" CWARNINGS = DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ DNSDEPLIBS = ../../lib/dns/libdns.@A@ diff --git a/configure b/configure index e7dce69f64..3d4416f410 100755 --- a/configure +++ b/configure @@ -744,8 +744,6 @@ ISC_PLATFORM_HAVEGSSAPI KRB5_CONFIG PKCS11_TOOLS PKCS11_TEST -OPENSSL_LDFLAGS -OPENSSL_INCLUDES OPENSSL_LIBS OPENSSL_CFLAGS INSTALL_LIBRARY @@ -15649,9 +15647,68 @@ fi CRYPTO=OpenSSL # -# was --with-openssl specified? +# OpenSSL/LibreSSL is mandatory # +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcrypto" >&5 +$as_echo_n "checking for libcrypto... " >&6; } + +if test -n "$OPENSSL_CFLAGS"; then + pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcrypto\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libcrypto") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "libcrypto" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$OPENSSL_LIBS"; then + pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcrypto\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libcrypto") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "libcrypto" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcrypto" 2>&1` + else + OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcrypto" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$OPENSSL_PKG_ERRORS" >&5 + + found=false default_ssldirs="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /opt/local /usr/local/opt/openssl /usr/local/opt/libressl /usr" @@ -15757,13 +15814,13 @@ fi if ! $found; then : - OPENSSL_INCLUDES= + OPENSSL_CFLAGS= for ssldir in $ssldirs; do { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl/ssl.h in $ssldir" >&5 $as_echo_n "checking for openssl/ssl.h in $ssldir... " >&6; } if test -f "$ssldir/include/openssl/ssl.h"; then : - OPENSSL_INCLUDES="-I$ssldir/include" + OPENSSL_CFLAGS="-I$ssldir/include" OPENSSL_LIBS="-L$ssldir/lib -lcrypto" found=true { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -15788,12 +15845,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiling and linking against OpenSSL works" >&5 $as_echo_n "checking whether compiling and linking against OpenSSL works... " >&6; } - # AC_MSG_NOTICE([Trying link with OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_INCLUDES=$OPENSSL_INCLUDES]) + # AC_MSG_NOTICE([Trying link with OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_CFLAGS=$OPENSSL_CFLAGS]) save_LIBS="$LIBS" save_CPPFLAGS="$CPPFLAGS" LIBS="$OPENSSL_LIBS $LIBS" - CPPFLAGS="$OPENSSL_INCLUDES $CPPFLAGS" + CPPFLAGS="$OPENSSL_CFLAGS $CPPFLAGS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -15833,6 +15890,198 @@ rm -f core conftest.err conftest.$ac_objext \ +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + + found=false + default_ssldirs="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /opt/local /usr/local/opt/openssl /usr/local/opt/libressl /usr" + +# Check whether --with-openssl was given. +if test "${with_openssl+set}" = set; then : + withval=$with_openssl; + case $with_openssl in #( + ""|y|ye|yes) : + ssldirs="$default_ssldirs" ;; #( + n|no) : + as_fn_error $? "Invalid --with-openssl value" "$LINENO" 5 ;; #( + *) : + ssldirs="$withval" ;; #( + *) : + ssldirs="$default_ssldirs" + ;; +esac + +else + + # if pkg-config is installed and openssl has installed a .pc file, + # then use that information and don't search ssldirs + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypto" >&5 +$as_echo_n "checking for crypto... " >&6; } + +if test -n "$OPENSSL_CFLAGS"; then + pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"crypto\""; } >&5 + ($PKG_CONFIG --exists --print-errors "crypto") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "crypto" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$OPENSSL_LIBS"; then + pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"crypto\""; } >&5 + ($PKG_CONFIG --exists --print-errors "crypto") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "crypto" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "crypto" 2>&1` + else + OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "crypto" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$OPENSSL_PKG_ERRORS" >&5 + + ssldirs="$default_ssldirs" +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ssldirs="$default_ssldirs" +else + OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS + OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + found=true +fi + + + +fi + + + + # note that we #include , so the OpenSSL headers have to be in + # an 'openssl' subdirectory + + if ! $found; then : + + OPENSSL_CFLAGS= + for ssldir in $ssldirs; do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl/ssl.h in $ssldir" >&5 +$as_echo_n "checking for openssl/ssl.h in $ssldir... " >&6; } + if test -f "$ssldir/include/openssl/ssl.h"; then : + + OPENSSL_CFLAGS="-I$ssldir/include" + OPENSSL_LIBS="-L$ssldir/lib -lcrypto" + found=true + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + break + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi + done + + # if the file wasn't found, well, go ahead and try the link anyway -- maybe + # it will just work! + +fi + + # try the preprocessor and linker with our new flags, + # being careful not to pollute the global LIBS, LDFLAGS, and CPPFLAGS + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiling and linking against OpenSSL works" >&5 +$as_echo_n "checking whether compiling and linking against OpenSSL works... " >&6; } + # AC_MSG_NOTICE([Trying link with OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_CFLAGS=$OPENSSL_CFLAGS]) + + save_LIBS="$LIBS" + save_CPPFLAGS="$CPPFLAGS" + LIBS="$OPENSSL_LIBS $LIBS" + CPPFLAGS="$OPENSSL_CFLAGS $CPPFLAGS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + +int +main () +{ + + OPENSSL_free(NULL); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "OpenSSL/LibreSSL not found +See \`config.log' for more details" "$LINENO" 5; } + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" + + + + +else + OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS + OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi @@ -15905,9 +16154,8 @@ rm -f core conftest.err conftest.$ac_objext \ -CFLAGS="$CFLAGS $OPENSSL_INCLUDES" +CFLAGS="$CFLAGS $OPENSSL_CFLAGS" LIBS="$LIBS $OPENSSL_LIBS" -LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL >= 1.0.0 or LibreSSL" >&5 $as_echo_n "checking for OpenSSL >= 1.0.0 or LibreSSL... " >&6; } @@ -16287,7 +16535,6 @@ esac - # # Client Cookie algorithm choice # diff --git a/configure.ac b/configure.ac index 812b0e1b2f..87cab36810 100644 --- a/configure.ac +++ b/configure.ac @@ -714,15 +714,15 @@ AS_IF([test "$enable_pthread_rwlock" = "yes" -a "$enable_developer" != "yes"], CRYPTO=OpenSSL # -# was --with-openssl specified? +# OpenSSL/LibreSSL is mandatory # -AX_CHECK_OPENSSL([:],[AC_MSG_FAILURE([OpenSSL/LibreSSL not found])]) +PKG_CHECK_MODULES([OPENSSL], [libcrypto], [], + [AX_CHECK_OPENSSL([:],[AC_MSG_FAILURE([OpenSSL/LibreSSL not found])])]) AX_SAVE_FLAGS([openssl]) -CFLAGS="$CFLAGS $OPENSSL_INCLUDES" +CFLAGS="$CFLAGS $OPENSSL_CFLAGS" LIBS="$LIBS $OPENSSL_LIBS" -LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS" AC_MSG_CHECKING([for OpenSSL >= 1.0.0 or LibreSSL]) AC_COMPILE_IFELSE( @@ -824,9 +824,8 @@ AS_CASE([$enable_fips_mode], AX_RESTORE_FLAGS([openssl]) -AC_SUBST([OPENSSL_INCLUDES]) +AC_SUBST([OPENSSL_CFLAGS]) AC_SUBST([OPENSSL_LIBS]) -AC_SUBST([OPENSSL_LDFLAGS]) # # Client Cookie algorithm choice diff --git a/contrib/dlz/bin/dlzbdb/Makefile.in b/contrib/dlz/bin/dlzbdb/Makefile.in index 8be4497b98..7a4cd96272 100644 --- a/contrib/dlz/bin/dlzbdb/Makefile.in +++ b/contrib/dlz/bin/dlzbdb/Makefile.in @@ -21,7 +21,7 @@ CDEFINES = @CONTRIB_DLZ@ CWARNINGS = DLZLIBS = @DLZ_DRIVER_LIBS@ -ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} DEPLIBS = ${ISCDEPLIBS} diff --git a/fuzz/Makefile.in b/fuzz/Makefile.in index e81539393d..5b346a4c4c 100644 --- a/fuzz/Makefile.in +++ b/fuzz/Makefile.in @@ -6,10 +6,10 @@ abs_srcdir = @abs_srcdir@ @BIND9_MAKE_INCLUDES@ CINCLUDES = -I. -I.. ${DNS_INCLUDES} ${ISC_INCLUDES} \ - @OPENSSL_INCLUDES@ + ${OPENSSL_CFLAGS} CDEFINES = -DFUZZDIR=\"$(abs_srcdir)\" -ISCLIBS = ../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCDEPLIBS = ../lib/isc/libisc.@A@ DNSLIBS = ../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSDEPLIBS = ../lib/dns/libdns.@A@ diff --git a/lib/bind9/Makefile.in b/lib/bind9/Makefile.in index a4e95950c5..ab53945174 100644 --- a/lib/bind9/Makefile.in +++ b/lib/bind9/Makefile.in @@ -18,12 +18,13 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ CINCLUDES = -I. ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \ - ${ISCCFG_INCLUDES} ${NS_INCLUDES} @OPENSSL_INCLUDES@ + ${ISCCFG_INCLUDES} ${NS_INCLUDES} \ + ${OPENSSL_CFLAGS} CDEFINES = CWARNINGS = -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ NSLIBS = ../../lib/ns/libns.@A@ diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in index 72af41e68f..2e64e7ee02 100644 --- a/lib/dns/Makefile.in +++ b/lib/dns/Makefile.in @@ -27,7 +27,8 @@ VERSION=@BIND9_VERSION@ USE_ISC_SPNEGO = @USE_ISC_SPNEGO@ CINCLUDES = -I. -I${top_srcdir}/lib/dns -Iinclude ${DNS_INCLUDES} \ - ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ \ + ${ISC_INCLUDES} \ + ${OPENSSL_CFLAGS} @DST_GSSAPI_INC@ \ ${JSON_C_CFLAGS} \ ${LIBXML2_CFLAGS} @@ -35,7 +36,7 @@ CDEFINES = @USE_GSSAPI@ ${USE_ISC_SPNEGO} CWARNINGS = -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCDEPLIBS = ../../lib/isc/libisc.@A@ diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in index 6ff55d8f2c..ed1dde5fdf 100644 --- a/lib/dns/tests/Makefile.in +++ b/lib/dns/tests/Makefile.in @@ -16,10 +16,10 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ CINCLUDES = -I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \ - @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ + ${OPENSSL_CFLAGS} @CMOCKA_CFLAGS@ CDEFINES = -DTESTS="\"${top_builddir}/lib/dns/tests/\"" -ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCDEPLIBS = ../../isc/libisc.@A@ DNSLIBS = ../libdns.@A@ @DNS_CRYPTO_LIBS@ DNSDEPLIBS = ../libdns.@A@ diff --git a/lib/irs/Makefile.in b/lib/irs/Makefile.in index f23a78e1a5..0326121077 100644 --- a/lib/irs/Makefile.in +++ b/lib/irs/Makefile.in @@ -19,7 +19,8 @@ VERSION=@BIND9_VERSION@ CINCLUDES = -I. -I./include -I${srcdir}/include \ ${DNS_INCLUDES} ${ISC_INCLUDES} \ - ${ISCCFG_INCLUDES} @OPENSSL_INCLUDES@ + ${ISCCFG_INCLUDES} \ + ${OPENSSL_CFLAGS} CDEFINES = CWARNINGS = diff --git a/lib/irs/tests/Makefile.in b/lib/irs/tests/Makefile.in index 4bb7988762..1ae108db23 100644 --- a/lib/irs/tests/Makefile.in +++ b/lib/irs/tests/Makefile.in @@ -22,7 +22,7 @@ CFGLIBS = ../../isccfg/libisccfg.@A@ CFGDEPLIBS = ../../isccfg/libisccfg.@A@ DNSLIBS = ../../dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSDEPLIBS = ../../dns/libdns.@A@ -ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCDEPLIBS = ../../isc/libisc.@A@ IRSLIBS = ../libirs.@A@ IRSDEPLIBS = ../libirs.@A@ diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in index 81bfc612b0..ddd44e3ef6 100644 --- a/lib/isc/Makefile.in +++ b/lib/isc/Makefile.in @@ -20,7 +20,8 @@ VERSION=@BIND9_VERSION@ CINCLUDES = -I${srcdir}/unix/include \ -I${srcdir}/pthreads/include \ -I./include \ - -I${srcdir}/include ${DNS_INCLUDES} @OPENSSL_INCLUDES@ \ + -I${srcdir}/include ${DNS_INCLUDES} \ + ${OPENSSL_CFLAGS} \ ${JSON_C_CFLAGS} \ ${LIBXML2_CFLAGS} CDEFINES = @@ -78,7 +79,7 @@ SRCS = pk11.c pk11_result.c \ symtab.c task.c taskpool.c timer.c \ tm.c version.c -LIBS = @OPENSSL_LIBS@ @LIBS@ +LIBS = ${OPENSSL_LIBS} @LIBS@ # Note: the order of SUBDIRS is important. # Attempt to disable parallel processing. diff --git a/lib/isc/tests/Makefile.in b/lib/isc/tests/Makefile.in index 2eaac11d2d..1f5e6b2f10 100644 --- a/lib/isc/tests/Makefile.in +++ b/lib/isc/tests/Makefile.in @@ -15,10 +15,11 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = -I. -Iinclude ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ +CINCLUDES = -I. -Iinclude ${ISC_INCLUDES} \ + ${OPENSSL_CFLAGS} @CMOCKA_CFLAGS@ CDEFINES = -DTESTS="\"${top_builddir}/lib/isc/tests/\"" -ISCLIBS = ../libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCDEPLIBS = ../libisc.@A@ LIBS = @LIBS@ @CMOCKA_LIBS@ diff --git a/lib/isc/unix/Makefile.in b/lib/isc/unix/Makefile.in index 905099b51b..5fd4f65f45 100644 --- a/lib/isc/unix/Makefile.in +++ b/lib/isc/unix/Makefile.in @@ -15,7 +15,8 @@ CINCLUDES = -I${srcdir}/include \ -I${srcdir}/../pthreads/include \ -I../include \ -I${srcdir}/../include \ - -I${srcdir}/.. @OPENSSL_INCLUDES@ \ + -I${srcdir}/.. \ + ${OPENSSL_CFLAGS} \ ${JSON_C_CFLAGS} \ ${LIBXML2_CFLAGS} diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in index 2419fdfca0..31b1c18002 100644 --- a/lib/isccc/Makefile.in +++ b/lib/isccc/Makefile.in @@ -18,12 +18,13 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ CINCLUDES = -I. ${DNS_INCLUDES} ${ISC_INCLUDES} \ - ${ISCCC_INCLUDES} @OPENSSL_INCLUDES@ + ${ISCCC_INCLUDES} \ + ${OPENSSL_CFLAGS} CDEFINES = CWARNINGS = -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCCCLIBS = ../../lib/isccc/libisccc.@A@ ISCDEPLIBS = ../../lib/isc/libisc.@A@ diff --git a/lib/isccc/tests/Makefile.in b/lib/isccc/tests/Makefile.in index 582f298b82..fe24dcc650 100644 --- a/lib/isccc/tests/Makefile.in +++ b/lib/isccc/tests/Makefile.in @@ -22,7 +22,7 @@ VERSION=@BIND9_VERSION@ CINCLUDES = -I. -Iinclude ${ISCCC_INCLUDES} ${ISC_INCLUDES} @CMOCKA_CFLAGS@ CDEFINES = -ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCDEPLIBS = ../../isc/libisc.@A@ ISCCCLIBS = ../libisccc.@A@ ISCCCDEPLIBS = ../libisccc.@A@ diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in index 96e05e5b7d..8ce9da1151 100644 --- a/lib/isccfg/Makefile.in +++ b/lib/isccfg/Makefile.in @@ -22,7 +22,7 @@ CINCLUDES = -I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} CDEFINES = CWARNINGS = -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ ISCCFGLIBS = ../../lib/cfg/libisccfg.@A@ diff --git a/lib/isccfg/tests/Makefile.in b/lib/isccfg/tests/Makefile.in index 0628e25f23..eb3b246363 100644 --- a/lib/isccfg/tests/Makefile.in +++ b/lib/isccfg/tests/Makefile.in @@ -17,10 +17,10 @@ VERSION=@BIND9_VERSION@ CINCLUDES = -I. -Iinclude \ ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \ - @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ + ${OPENSSL_CFLAGS} @CMOCKA_CFLAGS@ CDEFINES = -DTESTS="\"${top_builddir}/lib/dns/tests/\"" -ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCDEPLIBS = ../../isc/libisc.@A@ DNSLIBS = ../../dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSDEPLIBS = ../../dns/libdns.@A@ diff --git a/lib/ns/Makefile.in b/lib/ns/Makefile.in index c9af0ed2e1..fe75baeb1e 100644 --- a/lib/ns/Makefile.in +++ b/lib/ns/Makefile.in @@ -26,13 +26,13 @@ USE_ISC_SPNEGO = @USE_ISC_SPNEGO@ CINCLUDES = -I. -I${top_srcdir}/lib/ns -Iinclude \ ${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \ - @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ + ${OPENSSL_CFLAGS} @DST_GSSAPI_INC@ CDEFINES = -DNAMED_PLUGINDIR=\"${plugindir}\" CWARNINGS = -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCDEPLIBS = ../../lib/isc/libisc.@A@ diff --git a/lib/ns/tests/Makefile.in b/lib/ns/tests/Makefile.in index 476db578e9..9f2cc6bd3b 100644 --- a/lib/ns/tests/Makefile.in +++ b/lib/ns/tests/Makefile.in @@ -16,10 +16,11 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ CINCLUDES = -I. -Iinclude ${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \ - @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ + ${OPENSSL_CFLAGS} \ + @CMOCKA_CFLAGS@ CDEFINES = -DTESTS="\"${top_builddir}/lib/ns/tests/\"" -DNAMED_PLUGINDIR=\"${plugindir}\" -ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCDEPLIBS = ../../isc/libisc.@A@ DNSLIBS = ../../dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSDEPLIBS = ../../dns/libdns.@A@ diff --git a/lib/samples/Makefile.in b/lib/samples/Makefile.in index e6e2b216e1..78522f27cf 100644 --- a/lib/samples/Makefile.in +++ b/lib/samples/Makefile.in @@ -18,13 +18,14 @@ VERSION=@BIND9_VERSION@ CINCLUDES = -I${srcdir}/include -I../dns/include \ ${DNS_INCLUDES} ${ISC_INCLUDES} \ -I${top_srcdir}/lib/irs/include \ - -I../../lib/irs/include @OPENSSL_INCLUDES@ + -I../../lib/irs/include \ + ${OPENSSL_CFLAGS} CDEFINES = -DVERSION=\"${VERSION}\" \ -DSYSCONFDIR=\"${sysconfdir}\" CWARNINGS = -ISCLIBS = ../isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSLIBS = ../dns/libdns.@A@ @DNS_CRYPTO_LIBS@ ISCCFGLIBS = ../isccfg/libisccfg.@A@ IRSLIBS = ../irs/libirs.@A@ diff --git a/m4/ax_check_openssl.m4 b/m4/ax_check_openssl.m4 index 13178866ed..85d72b0e45 100644 --- a/m4/ax_check_openssl.m4 +++ b/m4/ax_check_openssl.m4 @@ -11,12 +11,12 @@ # Look for OpenSSL in a number of default spots, or in a user-selected # spot (via --with-openssl). Sets # -# OPENSSL_INCLUDES to the include directives required +# OPENSSL_CFLAGS to the include directives required # OPENSSL_LIBS to the -l directives required # # and calls ACTION-IF-FOUND or ACTION-IF-NOT-FOUND appropriately # -# This macro sets OPENSSL_INCLUDES such that source files should use the +# This macro sets OPENSSL_CFLAGS such that source files should use the # openssl/ directory in include directives: # # #include @@ -62,12 +62,12 @@ AC_DEFUN([AX_CHECK_OPENSSL], [ # an 'openssl' subdirectory AS_IF([! $found],[ - OPENSSL_INCLUDES= + OPENSSL_CFLAGS= for ssldir in $ssldirs; do AC_MSG_CHECKING([for openssl/ssl.h in $ssldir]) AS_IF([test -f "$ssldir/include/openssl/ssl.h"], [ - OPENSSL_INCLUDES="-I$ssldir/include" + OPENSSL_CFLAGS="-I$ssldir/include" OPENSSL_LIBS="-L$ssldir/lib -lcrypto" found=true AC_MSG_RESULT([yes]) @@ -86,12 +86,12 @@ AC_DEFUN([AX_CHECK_OPENSSL], [ # being careful not to pollute the global LIBS, LDFLAGS, and CPPFLAGS AC_MSG_CHECKING([whether compiling and linking against OpenSSL works]) - # AC_MSG_NOTICE([Trying link with OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_INCLUDES=$OPENSSL_INCLUDES]) + # AC_MSG_NOTICE([Trying link with OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_CFLAGS=$OPENSSL_CFLAGS]) save_LIBS="$LIBS" save_CPPFLAGS="$CPPFLAGS" LIBS="$OPENSSL_LIBS $LIBS" - CPPFLAGS="$OPENSSL_INCLUDES $CPPFLAGS" + CPPFLAGS="$OPENSSL_CFLAGS $CPPFLAGS" AC_LINK_IFELSE( [AC_LANG_PROGRAM( [ @@ -110,6 +110,6 @@ AC_DEFUN([AX_CHECK_OPENSSL], [ CPPFLAGS="$save_CPPFLAGS" LIBS="$save_LIBS" - AC_SUBST([OPENSSL_INCLUDES]) + AC_SUBST([OPENSSL_CFLAGS]) AC_SUBST([OPENSSL_LIBS]) ]) diff --git a/make/rules.in b/make/rules.in index 4469a34633..542db6a5cf 100644 --- a/make/rules.in +++ b/make/rules.in @@ -120,6 +120,9 @@ LFS_CFLAGS = @LFS_CFLAGS@ LFS_LDFLAGS = @LFS_LDFLAGS@ LFS_LIBS = @LFS_LIBS@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ + JSON_C_CFLAGS = @JSON_C_CFLAGS@ JSON_C_LIBS = @JSON_C_LIBS@