Adam Tkac 2fc1c6
diff -up bind-9.7.0b1/configure.in.dist-pkcs11 bind-9.7.0b1/configure.in
Adam Tkac 2fc1c6
--- bind-9.7.0b1/configure.in.dist-pkcs11	2009-11-03 11:37:25.481430279 +0100
Adam Tkac 2fc1c6
+++ bind-9.7.0b1/configure.in	2009-11-03 11:41:04.573930858 +0100
Adam Tkac 2fc1c6
@@ -721,15 +721,16 @@ AC_ARG_WITH(pkcs11,
Adam Tkac 2fc1c6
 case "$use_pkcs11" in
Adam Tkac 2fc1c6
 	no|'')
Adam Tkac 2fc1c6
 		AC_MSG_RESULT(disabled)
Adam Tkac 2fc1c6
-		USE_PKCS11=''
Adam Tkac 2fc1c6
 		PKCS11_TOOLS=''
Adam Tkac 2fc1c6
 		;;
Adam Tkac 2fc1c6
 	yes|*)
Adam Tkac 2fc1c6
 		AC_MSG_RESULT(using OpenSSL with PKCS11 support)
Adam Tkac 2fc1c6
-		USE_PKCS11='-DUSE_PKCS11'
Adam Tkac 2fc1c6
 		PKCS11_TOOLS=pkcs11
Adam Tkac 2fc1c6
 		;;
Adam Tkac 2fc1c6
 esac
Adam Tkac 2fc1c6
+# We don't want to automatically load engine because it needs to have openct,
Adam Tkac 2fc1c6
+# opencryptoki and friends installed.
Adam Tkac 2fc1c6
+USE_PKCS11=''
Adam Tkac 2fc1c6
 AC_SUBST(USE_PKCS11)
Adam Tkac 2fc1c6
 AC_SUBST(PKCS11_TOOLS)
Adam Tkac 2fc1c6