From: Aki Tuomi <cmouse@cmouse.fi>
Date: Thu, 17 Jul 2014 14:13:54 +0000 (+0300)
Subject: Detect 0.20 API
X-Git-Tag: auth-3.4.0-rc1~66^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d22bf2d2b95ca11eb79844a9c34b6952dcd0fc31;p=thirdparty%2Fpdns.git

Detect 0.20 API
---

diff --git a/m4/pdns_enable_p11kit.m4 b/m4/pdns_enable_p11kit.m4
index 316e9173f3..afad79efa7 100644
--- 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])]
     )]
   )