Fix ax_check_openssl to accept yes and improve it to modern autotools standard

diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
index 137bb1c20427e393fd31a5be5171d94fb3ae2113..1a26c359ed1e8d487712b8bf9045699b2e3d9025 100644 (file)
--- a/bin/check/Makefile.in
+++ b/bin/check/Makefile.in
@@ -23,8 +23,8 @@ CWARNINGS =
 
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@
-ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
-ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
+ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
 BIND9LIBS =    ../../lib/bind9/libbind9.@A@
 NSLIBS =       ../../lib/ns/libns.@A@
 

diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
index 5e81981090b422ca4368a854d97ecdfcc966ed48..0588f8b7dabec84ba728ac337491e972a4383a99 100644 (file)
--- 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_LDFLAGS@ @OPENSSL_LIBS@
-ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
+ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @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 fe3fef2e29ec245abbd375761e8d41fad952796c..ea106f80632457fb0511c3d1496ac4149fce016d 100644 (file)
--- a/bin/delv/Makefile.in
+++ b/bin/delv/Makefile.in
@@ -24,8 +24,8 @@ CWARNINGS =
 
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
-ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
 IRSLIBS =      ../../lib/irs/libirs.@A@
 
 ISCCFGDEPLIBS =        ../../lib/isccfg/libisccfg.@A@

diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
index fe7f30e128c3c4ca836735ce2e5f2c6efa0f45d1..e91f9c7ab5c42e5c3830050db5d133a0365aeb02 100644 (file)
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -27,8 +27,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_LDFLAGS@ @OPENSSL_LIBS@
-ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
+ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
 IRSLIBS =      ../../lib/irs/libirs.@A@
 
 ISCCFGDEPLIBS =        ../../lib/isccfg/libisccfg.@A@

diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
index 8a97ebc20b8f1c8ffa4e753aa6d3365732b4184a..b19fa0626a0a124f9fffc7d8bf5f72c43230db19 100644 (file)
--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in
@@ -21,8 +21,8 @@ CDEFINES =    -DVERSION=\"${VERSION}\"
 CWARNINGS =
 
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
-ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
+ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @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 3ff6006ec7ac44f1470fe916a9138c0ac58a13c6..3b20df73463546448080e319a6ebca1f80180cfe 100644 (file)
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -55,8 +55,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_LDFLAGS@ @OPENSSL_LIBS@
-ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
+ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
 BIND9LIBS =    ../../lib/bind9/libbind9.@A@
 NSLIBS =       ../../lib/ns/libns.@A@
 

diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in
index 04bdbbe0d982ded8b1cac794e1b0dd1e2a68933d..1d26ea0d0d6660dd2c0370639a3009bf2a0fd1b9 100644 (file)
--- a/bin/nsupdate/Makefile.in
+++ b/bin/nsupdate/Makefile.in
@@ -28,8 +28,8 @@ CWARNINGS =
 
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 BIND9LIBS =    ../../lib/bind9/libbind9.@A@
-ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
-ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
+ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@
 IRSLIBS =      ../../lib/irs/libirs.@A@
 

diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in
index c6e7698524d23836492e6a26dd84c6caeb3b10d5..2fd986168dbc23a61e7264d2573c3e00ee6f7696 100644 (file)
--- a/bin/pkcs11/Makefile.in
+++ b/bin/pkcs11/Makefile.in
@@ -17,7 +17,7 @@ CINCLUDES =   ${ISC_INCLUDES}
 
 CDEFINES =
 
-ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
 
 ISCDEPLIBS =   ../../lib/isc/libisc.@A@
 

diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in
index 8d7e8f2ee6113de64625d0c3d3b731013e77b931..ef5c65ea50c8a89083a268e32b762bf771c6350d 100644 (file)
--- 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_LDFLAGS@ @OPENSSL_LIBS@
-ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
+ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_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 691c6343ddb8ddd1e08dea26bb60f6757aa0a924..76f010b450306286860616b7c3f5112931a6f1ef 100644 (file)
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -21,8 +21,8 @@ CWARNINGS =
 BACKTRACECFLAGS = @BACKTRACECFLAGS@
 
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
-ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
+ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_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 50fb749650f4bfc66cb81186f83a0d37bb55e77b..834b547a10a27df71630b9d81aac661265875063 100644 (file)
--- a/bin/tests/optional/Makefile.in
+++ b/bin/tests/optional/Makefile.in
@@ -22,8 +22,8 @@ CWARNINGS =
 BACKTRACECFLAGS = @BACKTRACECFLAGS@
 
 DNSLIBS =      ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-ISCLIBS =      ../../../lib/isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
-ISCNOSYMLIBS = ../../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
+ISCNOSYMLIBS = ../../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_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 cb15f135f27982466609a1ac1cf00391799a2651..848816292eb6ddc1e37335b41f07401fc6273da3 100644 (file)
--- 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_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
 
 LIBS =         ${ISCLIBS} @LIBS@
 

diff --git a/bin/tests/pkcs11/benchmarks/Makefile.in b/bin/tests/pkcs11/benchmarks/Makefile.in
index 7b3f6669d878b37be110a3982f509ba1624b474d..94ebff48fb4f86902eaa7d7741ccd70bd8b683b6 100644 (file)
--- 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_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
 
 LIBS =         ${ISCLIBS} @LIBS@
 

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index 61424528b05d5142b4d623e9311da75742c8a317..6a4309905f52fee350e10d7c10161ba47c18648e 100644 (file)
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -23,7 +23,7 @@ CDEFINES =    @USE_GSSAPI@
 CWARNINGS =
 
 DNSLIBS =
-ISCLIBS =      ../../../lib/isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
 
 DNSDEPLIBS =
 ISCDEPLIBS =

diff --git a/bin/tests/system/dyndb/driver/Makefile.in b/bin/tests/system/dyndb/driver/Makefile.in
index 81c6147c1e7e9d2b1c26a3b43a732672d6b16623..3d09330c0a2c72fc0a8a8f838a24312e2cfc9a3a 100644 (file)
--- a/bin/tests/system/dyndb/driver/Makefile.in
+++ b/bin/tests/system/dyndb/driver/Makefile.in
@@ -19,7 +19,7 @@ CDEFINES =
 CWARNINGS =
 
 DNSLIBS =      ../../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-ISCLIBS =      ../../../../../lib/isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../../../../lib/isc/libisc.@A@ @OPENSSL_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 7e596a6adc93a61c040addd70c93e73ca2d4bc48..66817d5c0aa00dc3fd0ed1312a065e069c84f938 100644 (file)
--- a/bin/tests/system/pipelined/Makefile.in
+++ b/bin/tests/system/pipelined/Makefile.in
@@ -21,7 +21,7 @@ CDEFINES =
 CWARNINGS =
 
 DNSLIBS =      ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-ISCLIBS =      ../../../../lib/isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../../../lib/isc/libisc.@A@ @OPENSSL_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 232de7e4558e8c4a211e6a58c521c7a1bd6cb82e..e2fb4464e45cba9b07888b5c7040e13a61d17504 100644 (file)
--- 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_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
 
 DNSDEPLIBS =
 ISCDEPLIBS =   ../../../../lib/isc/libisc.@A@

diff --git a/bin/tests/system/rpz/Makefile.in b/bin/tests/system/rpz/Makefile.in
index f75f3f990ba2b977416f62ff56654763cb9c8291..d7835884daa92c65c65af81f94ac88a55d5a4e48 100644 (file)
--- 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_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
 
 DNSDEPLIBS =
 ISCDEPLIBS =    ../../../../lib/isc/libisc.@A@

diff --git a/bin/tests/system/rsabigexponent/Makefile.in b/bin/tests/system/rsabigexponent/Makefile.in
index ea4d7e5f9c520d69a03cf29c1798de9bb810caf2..a15d26400beb82d132e4eba3bc571a3c15aff065 100644 (file)
--- a/bin/tests/system/rsabigexponent/Makefile.in
+++ b/bin/tests/system/rsabigexponent/Makefile.in
@@ -21,7 +21,7 @@ CDEFINES =
 CWARNINGS =
 
 DNSLIBS =      ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-ISCLIBS =      ../../../../lib/isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../../../lib/isc/libisc.@A@ @OPENSSL_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 ebbc121fbdd24b7594b079918aa8739bb54b50fd..be0cf032567cde962cb9875ef002d001fdc807fa 100644 (file)
--- a/bin/tests/system/tkey/Makefile.in
+++ b/bin/tests/system/tkey/Makefile.in
@@ -21,7 +21,7 @@ CDEFINES =
 CWARNINGS =
 
 DNSLIBS =      ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-ISCLIBS =      ../../../../lib/isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
 
 DNSDEPLIBS =   ../../../../lib/dns/libdns.@A@
 ISCDEPLIBS =   ../../../../lib/isc/libisc.@A@

diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in
index a8d996a6e0af38a816d896dd8dcfad17e2ae7d76..0fd28471d9344ab250dac8a979f55cec24927be6 100644 (file)
--- a/bin/tools/Makefile.in
+++ b/bin/tools/Makefile.in
@@ -23,8 +23,8 @@ CWARNINGS =
 
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 BIND9LIBS =    ../../lib/bind9/libbind9.@A@
-ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
-ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
+ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@
 
 DNSDEPLIBS =   ../../lib/dns/libdns.@A@

diff --git a/configure b/configure
index 955095a42deae64790d883edce5e4a6db55a13a7..58493db241e85c62e9ac759c8ba595ada48efef4 100755 (executable)
--- a/configure
+++ b/configure
@@ -802,8 +802,9 @@ KRB5_CONFIG
 PKCS11_TOOLS
 PKCS11_TEST
 OPENSSL_LDFLAGS
-OPENSSL_LIBS
 OPENSSL_INCLUDES
+OPENSSL_LIBS
+OPENSSL_CFLAGS
 INSTALL_LIBRARY
 ISC_THREAD_DIR
 THREADOPTSRCS
@@ -1027,6 +1028,8 @@ CPP
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
+OPENSSL_CFLAGS
+OPENSSL_LIBS
 LIBIDN2_CFLAGS
 LIBIDN2_LIBS
 CMOCKA_CFLAGS
@@ -1767,6 +1770,10 @@ Some influential environment variables:
               directories to add to pkg-config's search path
   PKG_CONFIG_LIBDIR
               path overriding pkg-config's built-in search path
+  OPENSSL_CFLAGS
+              C compiler flags for OPENSSL, overriding pkg-config
+  OPENSSL_LIBS
+              linker flags for OPENSSL, overriding pkg-config
   LIBIDN2_CFLAGS
               C compiler flags for LIBIDN2, overriding pkg-config
   LIBIDN2_LIBS
@@ -15807,127 +15814,99 @@ CRYPTO=OpenSSL
 #
 
     found=false
+    default_ssldirs="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/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 "$withval" in
-            "" | y | ye | yes | n | no)
-            as_fn_error $? "Invalid --with-openssl value" "$LINENO" 5
-              ;;
-            *) ssldirs="$withval"
-              ;;
-            esac
+           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
-            if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$PKG_CONFIG"; then
-  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
 
+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
-PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
 fi
 
 
-fi
-if test -z "$ac_cv_prog_PKG_CONFIG"; then
-  ac_ct_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_PKG_CONFIG"; then
-  ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
 
-fi
-fi
-ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
-if test -n "$ac_ct_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
-$as_echo "$ac_ct_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-fi
 
-  if test "x$ac_ct_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_ct_PKG_CONFIG
-  fi
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
 else
-  PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+        _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
 
-            if test x"$PKG_CONFIG" != x""; then
-                OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null`
-                if test $? = 0; then
-                    OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null`
-                    OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null`
-                    found=true
-                fi
-            fi
+       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
 
-            # no such luck; use some default ssldirs
-            if ! $found; then
-                ssldirs="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr"
-            fi
 
 
 fi
@@ -15937,50 +15916,56 @@ fi
     # note that we #include <openssl/foo.h>, so the OpenSSL headers have to be in
     # an 'openssl' subdirectory
 
-    if ! $found; then
+    if ! $found; then :
+
         OPENSSL_INCLUDES=
         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_LDFLAGS="-L$ssldir/lib"
-                OPENSSL_LIBS="-lssl -lcrypto"
-                found=true
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+           if test -f "$ssldir/include/openssl/ssl.h"; then :
+
+                   OPENSSL_INCLUDES="-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
+                    break
+
+else
+
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-            fi
+
+fi
         done
 
         # if the file wasn't found, well, go ahead and try the link anyway -- maybe
         # it will just work!
-    fi
+
+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; }
-    echo "Trying link with OPENSSL_LDFLAGS=$OPENSSL_LDFLAGS;" \
-        "OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_INCLUDES=$OPENSSL_INCLUDES" >&5
+    # AC_MSG_NOTICE([Trying link with OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_INCLUDES=$OPENSSL_INCLUDES])
 
     save_LIBS="$LIBS"
-    save_LDFLAGS="$LDFLAGS"
     save_CPPFLAGS="$CPPFLAGS"
-    LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS"
     LIBS="$OPENSSL_LIBS $LIBS"
     CPPFLAGS="$OPENSSL_INCLUDES $CPPFLAGS"
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <openssl/ssl.h>
+
+                #include <openssl/crypto.h>
+
 int
 main ()
 {
-SSL_new(NULL)
+
+               OPENSSL_free(NULL);
+
   ;
   return 0;
 }
@@ -16004,14 +15989,12 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
     LIBS="$save_LIBS"
 
 
 
 
 
-
 save_CFLAGS="$CFLAGS"
 save_LIBS="$LIBS"
 save_LDFLAGS="$LDFLAGS"

diff --git a/contrib/dlz/bin/dlzbdb/Makefile.in b/contrib/dlz/bin/dlzbdb/Makefile.in
index 34acd370a23d456e755ae872f7d31f09b20b6708..0dcf434cff402a503ed41518925fa98f4919f15e 100644 (file)
--- 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_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
 
 DEPLIBS =      ${ISCDEPLIBS}
 

diff --git a/isc-config.sh.in b/isc-config.sh.in
index 16603a3209b648e123bf76854be2ae589089f1f5..40f9bba5a3764c3b75b1e5acf051c8ee0202b4e5 100644 (file)
--- a/isc-config.sh.in
+++ b/isc-config.sh.in
@@ -146,7 +146,7 @@ if test x"$echo_libs" = x"true"; then
                libs="$libs -lisccc"
        fi
        if test x"$libisc" = x"true" ; then
-               libs="$libs -lisc @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@"
+               libs="$libs -lisc @OPENSSL_LIBS@"
                needothers=true
        fi
        if test x"$needothers" = x"true" ; then

diff --git a/lib/bind9/Makefile.in b/lib/bind9/Makefile.in
index 06edd70155e97fa6c9028d151bb6a57bb102c199..5a9760c0e0cd54f97d4cba12ad2bca1e870dfb0b 100644 (file)
--- a/lib/bind9/Makefile.in
+++ b/lib/bind9/Makefile.in
@@ -23,7 +23,7 @@ CINCLUDES =   -I. ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
 CDEFINES =
 CWARNINGS =
 
-ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
 ISCCFGLIBS =    ../../lib/isccfg/libisccfg.@A@
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 

diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index f3e977b0d08de237025c91a0023eb8b7b572a5eb..e376afbbf8885a21c38a16e06363540c2ecd8c82 100644 (file)
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -33,7 +33,7 @@ CDEFINES =    -DUSE_MD5 @USE_GSSAPI@ ${USE_ISC_SPNEGO}
 
 CWARNINGS =
 
-ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
 
 ISCDEPLIBS =   ../../lib/isc/libisc.@A@
 

diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index be09fb1d8eb3758736ec5f76dc7431d5c543247c..205c74f4c4cace1d31000bf31689e80f012db327 100644 (file)
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -23,7 +23,7 @@ CINCLUDES =   -I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \
                @OPENSSL_INCLUDES@
 CDEFINES =     -DTESTS="\"${top_builddir}/lib/dns/tests/\""
 
-ISCLIBS =      ../../isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../isc/libisc.@A@ @OPENSSL_LIBS@
 ISCDEPLIBS =   ../../isc/libisc.@A@
 DNSLIBS =      ../libdns.@A@ @DNS_CRYPTO_LIBS@
 DNSDEPLIBS =   ../libdns.@A@

diff --git a/lib/irs/tests/Makefile.in b/lib/irs/tests/Makefile.in
index 58afc64ded4bb86de54cd03dd79d79781ef96cd0..80d37c98b9736d862f1f77726d1a3f6ff7517ba9 100644 (file)
--- a/lib/irs/tests/Makefile.in
+++ b/lib/irs/tests/Makefile.in
@@ -26,7 +26,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_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../isc/libisc.@A@ @OPENSSL_LIBS@
 ISCDEPLIBS =   ../../isc/libisc.@A@
 IRSLIBS =      ../libirs.@A@
 IRSDEPLIBS =   ../libirs.@A@

diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index eede04eaf168354db8e00ba07edc4fd0d1a68833..785ac6892b264507828426882dbba1de390f803c 100644 (file)
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -79,7 +79,7 @@ SRCS =                @ISC_EXTRA_SRCS@ pk11.c pk11_result.c \
                strtoul.c symtab.c task.c taskpool.c timer.c \
                tm.c version.c
 
-LIBS =         @OPENSSL_LDFLAGS@ @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 cac434ee82c093d78237401e18b50a823f558a59..3349845d0d494d41ea00ad242e65955c46578c5f 100644 (file)
--- a/lib/isc/tests/Makefile.in
+++ b/lib/isc/tests/Makefile.in
@@ -22,7 +22,7 @@ VERSION=@BIND9_VERSION@
 CINCLUDES =    -I. -Iinclude ${ISC_INCLUDES} @OPENSSL_INCLUDES@
 CDEFINES =     -DTESTS="\"${top_builddir}/lib/isc/tests/\""
 
-ISCLIBS =      ../libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../libisc.@A@ @OPENSSL_LIBS@
 ISCDEPLIBS =   ../libisc.@A@
 
 LIBS =         @LIBS@ @ATFLIBS@

diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in
index ae368c73326531ccfb65ff09cde0e47a54b93c1f..e7f3f55806e4589ff98a01950fea7cea53ef63f2 100644 (file)
--- a/lib/isccc/Makefile.in
+++ b/lib/isccc/Makefile.in
@@ -23,7 +23,7 @@ CINCLUDES =   -I. ${DNS_INCLUDES} ${ISC_INCLUDES} \
 CDEFINES =
 CWARNINGS =
 
-ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
 ISCCCLIBS =    ../../lib/isccc/libisccc.@A@
 
 ISCDEPLIBS =   ../../lib/isc/libisc.@A@

diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in
index 4813274c75d47edf3fdf45897ce6dff36589097c..fbc237f4754050e081c2d99e2fe2d9961f909923 100644 (file)
--- 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_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_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 9e152687c2bc675347c6450e07621a2619bcf601..2058396153b7bb507507b9c8392629330d66582a 100644 (file)
--- a/lib/isccfg/tests/Makefile.in
+++ b/lib/isccfg/tests/Makefile.in
@@ -24,7 +24,7 @@ CINCLUDES =   -I. -Iinclude \
                @OPENSSL_INCLUDES@
 CDEFINES =     -DTESTS="\"${top_builddir}/lib/dns/tests/\""
 
-ISCLIBS =      ../../isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../isc/libisc.@A@ @OPENSSL_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 d2e81ef93f4d2395e1b78ca85948663af8b4ff55..51d21377c67bcba8e70ba80428389071e37f5650 100644 (file)
--- a/lib/ns/Makefile.in
+++ b/lib/ns/Makefile.in
@@ -32,7 +32,7 @@ CDEFINES =
 
 CWARNINGS =
 
-ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
 
 ISCDEPLIBS =   ../../lib/isc/libisc.@A@
 

diff --git a/lib/ns/tests/Makefile.in b/lib/ns/tests/Makefile.in
index 8a075c51cafca396180c9d979faa0dfc707e23d2..930f0c509afed00bac2a70fab7e7dd18bbc20e18 100644 (file)
--- a/lib/ns/tests/Makefile.in
+++ b/lib/ns/tests/Makefile.in
@@ -23,7 +23,7 @@ CINCLUDES =   -I. -Iinclude ${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
                @OPENSSL_INCLUDES@
 CDEFINES =     -DTESTS="\"${top_builddir}/lib/ns/tests/\""
 
-ISCLIBS =      ../../isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../../isc/libisc.@A@ @OPENSSL_LIBS@
 ISCDEPLIBS =   ../../isc/libisc.@A@
 DNSLIBS =      ../../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 DNSDEPLIBS =   ../../dns/libdns.@A@

diff --git a/lib/samples/Makefile-postinstall.in b/lib/samples/Makefile-postinstall.in
index f9932a7f0e470d54bf3276d52df5b0ac0a4da8a3..142ffc3fbda0113da19813b127f34d3c57d9c7f2 100644 (file)
--- a/lib/samples/Makefile-postinstall.in
+++ b/lib/samples/Makefile-postinstall.in
@@ -15,7 +15,7 @@ CDEFINES =
 CWARNINGS =
 
 DNSLIBS =      -ldns @DNS_CRYPTO_LIBS@
-ISCLIBS =      -lisc @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      -lisc @OPENSSL_LIBS@
 ISCCFGLIBS =   -lisccfg
 IRSLIBS =      -lirs
 

diff --git a/lib/samples/Makefile.in b/lib/samples/Makefile.in
index bd076f44de12615bc7f7d97ee530493748ef1ff2..339e4f7f06d388acf15b6df8da12496d788e29ab 100644 (file)
--- a/lib/samples/Makefile.in
+++ b/lib/samples/Makefile.in
@@ -24,7 +24,7 @@ CDEFINES =    -DVERSION=\"${VERSION}\" \
                -DSYSCONFDIR=\"${sysconfdir}\"
 CWARNINGS =
 
-ISCLIBS =      ../isc/libisc.@A@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ISCLIBS =      ../isc/libisc.@A@ @OPENSSL_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 28e48cbefb68a402a0643d68a38bd5b0aaf848dd..fd308476e4f0380d504178038960671cbefe7e4b 100644 (file)
--- a/m4/ax_check_openssl.m4
+++ b/m4/ax_check_openssl.m4
@@ -13,7 +13,6 @@
 #
 #     OPENSSL_INCLUDES to the include directives required
 #     OPENSSL_LIBS to the -l directives required
-#     OPENSSL_LDFLAGS to the -L or -R flags required
 #
 #   and calls ACTION-IF-FOUND or ACTION-IF-NOT-FOUND appropriately
 #
@@ -37,76 +36,70 @@
 AU_ALIAS([CHECK_SSL], [AX_CHECK_OPENSSL])
 AC_DEFUN([AX_CHECK_OPENSSL], [
     found=false
+    default_ssldirs="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr/local/opt/openssl /usr/local/opt/libressl /usr"
     AC_ARG_WITH([openssl],
         [AS_HELP_STRING([--with-openssl=DIR],
             [root of the OpenSSL directory])],
         [
-            case "$withval" in
-            "" | y | ye | yes | n | no)
-            AC_MSG_ERROR([Invalid --with-openssl value])
-              ;;
-            *) ssldirs="$withval"
-              ;;
-            esac
+           AS_CASE([$with_openssl],
+               [""|y|ye|yes],[ssldirs="$default_ssldirs"],
+               [n|no],[AC_MSG_ERROR([Invalid --with-openssl value])],
+               [*],[ssldirs="$withval"],
+               [ssldirs="$default_ssldirs"]
+           )
         ], [
             # if pkg-config is installed and openssl has installed a .pc file,
             # then use that information and don't search ssldirs
-            AC_CHECK_TOOL([PKG_CONFIG], [pkg-config])
-            if test x"$PKG_CONFIG" != x""; then
-                OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null`
-                if test $? = 0; then
-                    OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null`
-                    OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null`
-                    found=true
-                fi
-            fi
-
-            # no such luck; use some default ssldirs
-            if ! $found; then
-                ssldirs="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr"
-            fi
+           PKG_CHECK_MODULES([OPENSSL], [crypto],
+               [found=true],
+               [ssldirs="$default_ssldirs"])
+       
         ]
-        )
+    )
 
 
     # note that we #include <openssl/foo.h>, so the OpenSSL headers have to be in
     # an 'openssl' subdirectory
 
-    if ! $found; then
+    AS_IF([! $found],[
         OPENSSL_INCLUDES=
         for ssldir in $ssldirs; do
             AC_MSG_CHECKING([for openssl/ssl.h in $ssldir])
-            if test -f "$ssldir/include/openssl/ssl.h"; then
-                OPENSSL_INCLUDES="-I$ssldir/include"
-                OPENSSL_LDFLAGS="-L$ssldir/lib"
-                OPENSSL_LIBS="-lssl -lcrypto"
-                found=true
-                AC_MSG_RESULT([yes])
-                break
-            else
-                AC_MSG_RESULT([no])
-            fi
+           AS_IF([test -f "$ssldir/include/openssl/ssl.h"],
+               [
+                   OPENSSL_INCLUDES="-I$ssldir/include"
+                    OPENSSL_LIBS="-L$ssldir/lib -lcrypto"
+                    found=true
+                    AC_MSG_RESULT([yes])
+                    break
+               ],
+               [
+                   AC_MSG_RESULT([no])
+               ])
         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
 
     AC_MSG_CHECKING([whether compiling and linking against OpenSSL works])
-    echo "Trying link with OPENSSL_LDFLAGS=$OPENSSL_LDFLAGS;" \
-        "OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_INCLUDES=$OPENSSL_INCLUDES" >&AS_MESSAGE_LOG_FD
+    # AC_MSG_NOTICE([Trying link with OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_INCLUDES=$OPENSSL_INCLUDES])
 
     save_LIBS="$LIBS"
-    save_LDFLAGS="$LDFLAGS"
     save_CPPFLAGS="$CPPFLAGS"
-    LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS"
     LIBS="$OPENSSL_LIBS $LIBS"
     CPPFLAGS="$OPENSSL_INCLUDES $CPPFLAGS"
     AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM([#include <openssl/ssl.h>], [SSL_new(NULL)])],
+        [AC_LANG_PROGRAM(
+            [
+                #include <openssl/crypto.h>
+            ],
+            [
+               OPENSSL_free(NULL);
+           ])],
         [
             AC_MSG_RESULT([yes])
             $1
@@ -115,10 +108,8 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
             $2
         ])
     CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
     LIBS="$save_LIBS"
 
     AC_SUBST([OPENSSL_INCLUDES])
     AC_SUBST([OPENSSL_LIBS])
-    AC_SUBST([OPENSSL_LDFLAGS])
 ])