upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-03-12 05:32:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[v9_10] prevent spurious warning when configuring native-pkcs11

Browse source
This commit is contained in:
Evan Hunt 2016-06-02 10:27:53 -07:00
parent 93a78ae9f1
commit 84d5e1dbe2
2 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
configure vendored
View file

@ -15605,21 +15605,23 @@ fi
$as_echo_n "checking for OpenSSL library... " >&6; }
OPENSSL_WARNING=
openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg /usr/sfw"
if test "$want_native_pkcs11" = "yes"
then
use_openssl="native_pkcs11"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: use of native PKCS11 instead" >&5
$as_echo "use of native PKCS11 instead" >&6; }
fi
if test "$use_openssl" = "auto"
then
if test "$want_native_pkcs11" = "yes"
then
use_openssl="native_pkcs11"
else
for d in $openssldirs
do
if test -f $d/include/openssl/opensslv.h
then
use_openssl=$d
break
fi
done
fi
for d in $openssldirs
do
if test -f $d/include/openssl/opensslv.h
then
use_openssl=$d
break
fi
done
fi
OPENSSL_ECDSA=""
OPENSSL_GOST=""

27
configure.in
View file

@ -1414,21 +1414,22 @@ fi
AC_MSG_CHECKING(for OpenSSL library)
OPENSSL_WARNING=
openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg /usr/sfw"
if test "$want_native_pkcs11" = "yes"
then
use_openssl="native_pkcs11"
AC_MSG_RESULT(use of native PKCS11 instead)
fi
if test "$use_openssl" = "auto"
then
if test "$want_native_pkcs11" = "yes"
then
use_openssl="native_pkcs11"
else
for d in $openssldirs
do
if test -f $d/include/openssl/opensslv.h
then
use_openssl=$d
break
fi
done
fi
for d in $openssldirs
do
if test -f $d/include/openssl/opensslv.h
then
use_openssl=$d
break
fi
done
fi
OPENSSL_ECDSA=""
OPENSSL_GOST=""