Add missing options and conditionals to enable pkcs#11 when needed