From: Evan Hunt <each@isc.org>
Date: Thu, 2 Jun 2016 17:27:29 +0000 (-0700)
Subject: [master] prevent spurious warning when configuring native-pkcs11
X-Git-Tag: v9.11.0b1~77
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=0187198379120ce8ee099984e42e7f11c4c8abeb;p=thirdparty%2Fbind9.git

[master] prevent spurious warning when configuring native-pkcs11
---

diff --git a/configure b/configure
index 0a3a700b61a..3cddc2722cd 100755
--- 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 b85b636413b..a9aa6832682 100644
--- 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=""