[master] prevent spurious warning when configuring native-pkcs11

diff --git a/configure b/configure
index 0a3a700b61ab17c05e2e5c62fb5557ca74fb03e8..3cddc2722cde490872a4a6586e6c9944aac77a32 100755 (executable)
--- a/configure
+++ b/configure
@@ -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=""

diff --git a/configure.in b/configure.in
index b85b636413bc646a8b829634080a8417f1b4beb9..a9aa6832682ed6c5c5bd580522909d0f6475bc3f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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=""