From 164616cb9c998d234416a7fb14be8bd0618f4eaf Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Fri, 8 Sep 2017 16:15:37 +1000 Subject: [PATCH] don't attempt to link -lcrypto multiple times --- bin/check/Makefile.in | 2 +- bin/confgen/Makefile.in | 2 +- bin/delv/Makefile.in | 2 +- bin/dig/Makefile.in | 2 +- bin/dnssec/Makefile.in | 2 +- bin/named/Makefile.in | 2 +- bin/nsupdate/Makefile.in | 2 +- bin/rndc/Makefile.in | 2 +- bin/tools/Makefile.in | 2 +- configure | 25 ++++++++----------------- configure.in | 11 +++++++---- 11 files changed, 24 insertions(+), 30 deletions(-) diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in index 85b58622aa..e166c4bfb0 100644 --- a/bin/check/Makefile.in +++ b/bin/check/Makefile.in @@ -21,7 +21,7 @@ CWARNINGS = DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCLIBS = ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@ -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @ISC_OPENSSL_LIBS@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ DNSDEPLIBS = ../../lib/dns/libdns.@A@ diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in index b031f31908..0c011b7cd5 100644 --- a/bin/confgen/Makefile.in +++ b/bin/confgen/Makefile.in @@ -21,7 +21,7 @@ CWARNINGS = ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCCLIBS = ../../lib/isccc/libisccc.@A@ ISCLIBS = ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@ -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @ISC_OPENSSL_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 cdc48b3133..47a4a92734 100644 --- a/bin/delv/Makefile.in +++ b/bin/delv/Makefile.in @@ -21,7 +21,7 @@ CWARNINGS = ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @ISC_OPENSSL_LIBS@ ISCLIBS = ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@ IRSLIBS = ../../lib/irs/libirs.@A@ diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in index 28add35cf5..e9d2515853 100644 --- a/bin/dig/Makefile.in +++ b/bin/dig/Makefile.in @@ -25,7 +25,7 @@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ ISCLIBS = ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@ -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @ISC_OPENSSL_LIBS@ LWRESLIBS = ../../lib/lwres/liblwres.@A@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@ diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in index 48f879165e..dddc09e0a9 100644 --- a/bin/dnssec/Makefile.in +++ b/bin/dnssec/Makefile.in @@ -20,7 +20,7 @@ CWARNINGS = DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ ISCLIBS = ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@ -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @ISC_OPENSSL_LIBS@ DNSDEPLIBS = ../../lib/dns/libdns.@A@ ISCDEPLIBS = ../../lib/isc/libisc.@A@ diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in index 9fe652a01d..9b18d15fbd 100644 --- a/bin/named/Makefile.in +++ b/bin/named/Makefile.in @@ -48,7 +48,7 @@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCCLIBS = ../../lib/isccc/libisccc.@A@ ISCLIBS = ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@ -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @ISC_OPENSSL_LIBS@ LWRESLIBS = ../../lib/lwres/liblwres.@A@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in index 824f71b630..c383cc7b64 100644 --- a/bin/nsupdate/Makefile.in +++ b/bin/nsupdate/Makefile.in @@ -27,7 +27,7 @@ LWRESLIBS = ../../lib/lwres/liblwres.@A@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ ISCLIBS = ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@ -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @ISC_OPENSSL_LIBS@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ LWRESDEPLIBS = ../../lib/lwres/liblwres.@A@ diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in index 41ecc2a824..70de5eeabd 100644 --- a/bin/rndc/Makefile.in +++ b/bin/rndc/Makefile.in @@ -21,7 +21,7 @@ CWARNINGS = ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCCLIBS = ../../lib/isccc/libisccc.@A@ ISCLIBS = ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@ -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @ISC_OPENSSL_LIBS@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in index ac62a52627..eea83811eb 100644 --- a/bin/tools/Makefile.in +++ b/bin/tools/Makefile.in @@ -22,7 +22,7 @@ CWARNINGS = DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ ISCLIBS = ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@ -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @ISC_OPENSSL_LIBS@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ LWRESLIBS = ../../lib/lwres/liblwres.@A@ diff --git a/configure b/configure index 12751fbb52..8dfefbd2b5 100755 --- a/configure +++ b/configure @@ -962,7 +962,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -1120,7 +1119,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1373,15 +1371,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1519,7 +1508,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1672,7 +1661,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -16617,8 +16605,6 @@ esac -DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS" - ISC_PLATFORM_WANTAES="#undef ISC_PLATFORM_WANTAES" if test "yes" = "$with_aes" then @@ -16681,7 +16667,7 @@ $as_echo_n "checking for using OpenSSL for hash functions... " >&6; } ISC_PLATFORM_OPENSSLHASH="#undef ISC_PLATFORM_OPENSSLHASH" if test "whenossl" = "$want_openssl_hash" then - if test "$CRYPTO" = "-DOPENSSL" + if test "X$CRYPTO" = "X-DOPENSSL" then want_openssl_hash="yes" else @@ -16690,7 +16676,7 @@ then fi case $want_openssl_hash in yes) - if test "$CRYPTO" != "-DOPENSSL" + if test "X$CRYPTO" != "X-DOPENSSL" then as_fn_error $? "No OpenSSL for hash functions" "$LINENO" 5 fi @@ -16709,6 +16695,11 @@ esac +if test "X${ISC_OPENSSL_LIBS}" != "X${DST_OPENSSL_LIBS}" +then + DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS" +fi + # # PKCS11 (aka crypto hardware) support (--with moved just after openssl) # diff --git a/configure.in b/configure.in index 1808c440f0..f411a49b9a 100644 --- a/configure.in +++ b/configure.in @@ -2031,8 +2031,6 @@ AC_SUBST(OPENSSL_ECDSA) AC_SUBST(OPENSSL_ED25519) AC_SUBST(OPENSSL_GOST) -DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS" - ISC_PLATFORM_WANTAES="#undef ISC_PLATFORM_WANTAES" if test "yes" = "$with_aes" then @@ -2087,7 +2085,7 @@ AC_MSG_CHECKING(for using OpenSSL for hash functions) ISC_PLATFORM_OPENSSLHASH="#undef ISC_PLATFORM_OPENSSLHASH" if test "whenossl" = "$want_openssl_hash" then - if test "$CRYPTO" = "-DOPENSSL" + if test "X$CRYPTO" = "X-DOPENSSL" then want_openssl_hash="yes" else @@ -2096,7 +2094,7 @@ then fi case $want_openssl_hash in yes) - if test "$CRYPTO" != "-DOPENSSL" + if test "X$CRYPTO" != "X-DOPENSSL" then AC_MSG_ERROR([No OpenSSL for hash functions]) fi @@ -2113,6 +2111,11 @@ AC_SUBST(ISC_PLATFORM_OPENSSLHASH) AC_SUBST(ISC_OPENSSL_INC) AC_SUBST(ISC_OPENSSL_LIBS) +if test "X${ISC_OPENSSL_LIBS}" != "X${DST_OPENSSL_LIBS}" +then + DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS" +fi + # # PKCS11 (aka crypto hardware) support (--with moved just after openssl) #