From 71877806e8923b624b443ccc8f5c7cfe4e5b5948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 23 Jul 2018 22:10:52 +0200 Subject: [PATCH] Fix ax_check_openssl to accept yes and improve it to modern autotools standard --- bin/check/Makefile.in | 4 +- bin/confgen/Makefile.in | 4 +- bin/delv/Makefile.in | 4 +- bin/dig/Makefile.in | 4 +- bin/dnssec/Makefile.in | 4 +- bin/named/Makefile.in | 4 +- bin/nsupdate/Makefile.in | 4 +- bin/pkcs11/Makefile.in | 2 +- bin/rndc/Makefile.in | 4 +- bin/tests/Makefile.in | 4 +- bin/tests/optional/Makefile.in | 4 +- bin/tests/pkcs11/Makefile.in | 2 +- bin/tests/pkcs11/benchmarks/Makefile.in | 2 +- bin/tests/system/Makefile.in | 2 +- bin/tests/system/dyndb/driver/Makefile.in | 2 +- bin/tests/system/pipelined/Makefile.in | 2 +- bin/tests/system/rndc/Makefile.in | 2 +- bin/tests/system/rpz/Makefile.in | 2 +- bin/tests/system/rsabigexponent/Makefile.in | 2 +- bin/tests/system/tkey/Makefile.in | 2 +- bin/tools/Makefile.in | 4 +- configure | 231 +++++++++----------- contrib/dlz/bin/dlzbdb/Makefile.in | 2 +- isc-config.sh.in | 2 +- lib/bind9/Makefile.in | 2 +- lib/dns/Makefile.in | 2 +- lib/dns/tests/Makefile.in | 2 +- lib/irs/tests/Makefile.in | 2 +- lib/isc/Makefile.in | 2 +- lib/isc/tests/Makefile.in | 2 +- lib/isccc/Makefile.in | 2 +- lib/isccfg/Makefile.in | 2 +- lib/isccfg/tests/Makefile.in | 2 +- lib/ns/Makefile.in | 2 +- lib/ns/tests/Makefile.in | 2 +- lib/samples/Makefile-postinstall.in | 2 +- lib/samples/Makefile.in | 2 +- m4/ax_check_openssl.m4 | 75 +++---- 38 files changed, 187 insertions(+), 213 deletions(-) diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in index 137bb1c204..1a26c359ed 100644 --- 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 5e81981090..0588f8b7da 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_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 fe3fef2e29..ea106f8063 100644 --- 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 fe7f30e128..e91f9c7ab5 100644 --- 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 8a97ebc20b..b19fa0626a 100644 --- 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 3ff6006ec7..3b20df7346 100644 --- 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 04bdbbe0d9..1d26ea0d0d 100644 --- 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 c6e7698524..2fd986168d 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_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 8d7e8f2ee6..ef5c65ea50 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_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 691c6343dd..76f010b450 100644 --- 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 50fb749650..834b547a10 100644 --- 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 cb15f135f2..848816292e 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_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 7b3f6669d8..94ebff48fb 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_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 61424528b0..6a4309905f 100644 --- 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 81c6147c1e..3d09330c0a 100644 --- 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 7e596a6adc..66817d5c0a 100644 --- 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 232de7e455..e2fb4464e4 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_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 f75f3f990b..d7835884da 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_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 ea4d7e5f9c..a15d26400b 100644 --- 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 ebbc121fbd..be0cf03256 100644 --- 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 a8d996a6e0..0fd28471d9 100644 --- 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 955095a42d..58493db241 100755 --- 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 -fi -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; } +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 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + 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; } -fi +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 -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 + ssldirs="$default_ssldirs" +elif test $pkg_failed = untried; 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 + ssldirs="$default_ssldirs" else - PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" + 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 - 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 fi @@ -15937,50 +15916,56 @@ fi # note that we #include , 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 + + #include + 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 34acd370a2..0dcf434cff 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_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 16603a3209..40f9bba5a3 100644 --- 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 06edd70155..5a9760c0e0 100644 --- 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 f3e977b0d0..e376afbbf8 100644 --- 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 be09fb1d8e..205c74f4c4 100644 --- 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 58afc64ded..80d37c98b9 100644 --- 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 eede04eaf1..785ac6892b 100644 --- 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 cac434ee82..3349845d0d 100644 --- 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 ae368c7332..e7f3f55806 100644 --- 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 4813274c75..fbc237f475 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_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 9e152687c2..2058396153 100644 --- 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 d2e81ef93f..51d21377c6 100644 --- 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 8a075c51ca..930f0c509a 100644 --- 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 f9932a7f0e..142ffc3fbd 100644 --- 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 bd076f44de..339e4f7f06 100644 --- 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 28e48cbefb..fd308476e4 100644 --- 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 , 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 ], [SSL_new(NULL)])], + [AC_LANG_PROGRAM( + [ + #include + ], + [ + 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]) ])