Detect 0.20 API

diff --git a/m4/pdns_enable_p11kit.m4 b/m4/pdns_enable_p11kit.m4
index 316e9173f3649d985689967564ba1190427022cc..afad79efa78a0abd3f257ce7abd3ae1ab05d2045 100644 (file)
--- a/m4/pdns_enable_p11kit.m4
+++ b/m4/pdns_enable_p11kit.m4
@@ -10,7 +10,10 @@ AC_DEFUN([PDNS_ENABLE_PKCS11],[
 
   AS_IF([test "x$enable_pkcs11" != "xno"], [
     PKG_CHECK_MODULES([P11KIT1], [p11-kit-1],
-      [AC_DEFINE([HAVE_P11KIT1],[1],[Define to 1 if you have p11-kit-1])],
+      [
+        AC_DEFINE([HAVE_P11KIT1],[1],[Define to 1 if you have p11-kit-1])
+        AC_CHECK_LIB([p11-kit], [p11_kit_module_for_name], [AC_DEFINE([HAVE_P11KIT1_V2],[1],[Define to 1 if you have 0.20 or newer P11-kit])], [], [$P11KIT1_LIBS])
+      ],
       [AC_MSG_ERROR([Could not find p11-kit-1])]
     )]
   )