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