ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

[master] prevent spurious warning when configuring native-pkcs11

Browse Source
This commit is contained in:
Evan Hunt
2016-06-02 10:27:29 -07:00
parent 8a5140ab3f
commit 0187198379
2 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
configure vendored
View File

@@ -15623,21 +15623,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

@@ -1415,21 +1415,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=""