diff -Naur bind-9.10.0-P1/configure.in bind-9.10.0-P1.oden/configure.in --- bind-9.10.0-P1/configure.in 2014-05-09 08:18:04.000000000 +0200 +++ bind-9.10.0-P1.oden/configure.in 2014-05-09 08:20:54.000000000 +0200 @@ -1821,7 +1821,6 @@ case "$use_pkcs11" in no) AC_MSG_RESULT(no) - USE_PKCS11="" PKCS11_TEST="" PKCS11_TOOLS="" ISC_PK11_C="" @@ -1879,7 +1878,6 @@ PKCS11_ENGINE='-DPKCS11_ENGINE=NULL' fi - USE_PKCS11='-DUSE_PKCS11' PKCS11_TOOLS=pkcs11 AC_CHECK_FUNC(getpassphrase, AC_DEFINE(HAVE_GETPASSPHRASE),) ISC_PK11_C="pk11.c" @@ -1892,6 +1890,9 @@ ISC_ISCPK11_API_O="unix/pk11_api.$O" ;; esac +# We don't want to automatically load engine because it needs to have openct, +# opencryptoki and friends installed. +USE_PKCS11='' AC_SUBST(USE_PKCS11) AC_SUBST(PKCS11_TOOLS) AC_SUBST(PKCS11_ENGINE)