diff --git a/configure b/configure
index 96a47c54bc..8f64c0648f 100755
--- a/configure
+++ b/configure
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: configure,v 1.468 2009/10/05 12:09:35 fdupont Exp $
+# $Id: configure,v 1.469 2009/10/06 20:31:10 each Exp $
 #
 # Portions Copyright (C) 1996-2001  Nominum, Inc.
 #
@@ -29,7 +29,7 @@
 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# From configure.in Revision: 1.482 .
+# From configure.in Revision: 1.483 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -896,8 +896,8 @@ DST_OPENSSL_INC
 ISC_PLATFORM_OPENSSLHASH
 ISC_OPENSSL_INC
 USE_PKCS11
-PKCS11_PROVIDER
 PKCS11_TOOLS
+PKCS11_PROVIDER
 ISC_PLATFORM_HAVEGSSAPI
 ISC_PLATFORM_GSSAPIHEADER
 USE_GSSAPI
@@ -22857,15 +22857,18 @@ case "$use_pkcs11" in
 		{ echo "$as_me:$LINENO: result: disabled" >&5
 echo "${ECHO_T}disabled" >&6; }
 		USE_PKCS11=''
+		PKCS11_TOOLS=''
 		;;
 	yes|*)
 		{ echo "$as_me:$LINENO: result: using OpenSSL with PKCS11 support" >&5
 echo "${ECHO_T}using OpenSSL with PKCS11 support" >&6; }
 		USE_PKCS11='-DUSE_PKCS11'
+		PKCS11_TOOLS=pkcs11
 		;;
 esac
 
 
+
 { echo "$as_me:$LINENO: checking for PKCS11 tools" >&5
 echo $ECHO_N "checking for PKCS11 tools... $ECHO_C" >&6; }
 case "$use_pkcs11" in
@@ -22873,18 +22876,15 @@ case "$use_pkcs11" in
 		{ echo "$as_me:$LINENO: result: disabled" >&5
 echo "${ECHO_T}disabled" >&6; }
 		PKCS11_PROVIDER="undefined"
-		PKCS11_TOOLS=''
 		;;
        *)
 		{ echo "$as_me:$LINENO: result: PKCS11 provider is \"$use_pkcs11\"" >&5
 echo "${ECHO_T}PKCS11 provider is \"$use_pkcs11\"" >&6; }
 		PKCS11_PROVIDER="$use_pkcs11"
-		PKCS11_TOOLS=pkcs11
 		;;
 esac
 
 
-
 { echo "$as_me:$LINENO: checking for GSSAPI library" >&5
 echo $ECHO_N "checking for GSSAPI library... $ECHO_C" >&6; }
 
@@ -34229,8 +34229,8 @@ DST_OPENSSL_INC!$DST_OPENSSL_INC$ac_delim
 ISC_PLATFORM_OPENSSLHASH!$ISC_PLATFORM_OPENSSLHASH$ac_delim
 ISC_OPENSSL_INC!$ISC_OPENSSL_INC$ac_delim
 USE_PKCS11!$USE_PKCS11$ac_delim
-PKCS11_PROVIDER!$PKCS11_PROVIDER$ac_delim
 PKCS11_TOOLS!$PKCS11_TOOLS$ac_delim
+PKCS11_PROVIDER!$PKCS11_PROVIDER$ac_delim
 ISC_PLATFORM_HAVEGSSAPI!$ISC_PLATFORM_HAVEGSSAPI$ac_delim
 ISC_PLATFORM_GSSAPIHEADER!$ISC_PLATFORM_GSSAPIHEADER$ac_delim
 USE_GSSAPI!$USE_GSSAPI$ac_delim