From 0e03d097ade12cfb170154b6065bd6c3115606c3 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 31 Aug 2011 17:43:29 +0200
Subject: [PATCH] do not exit configure if p11-kit is not found.

---
 lib/configure.ac | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/configure.ac b/lib/configure.ac
index 27c806472..63164ce37 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -102,11 +102,18 @@ AC_ARG_WITH(p11-kit,
 		[Build without p11-kit and PKCS#11 support]))
 AM_CONDITIONAL(ENABLE_PKCS11, test "$with_p11_kit" != "no")
 if test "$with_p11_kit" != "no"; then
-	PKG_CHECK_MODULES(P11_KIT, [p11-kit-1])
-	AC_DEFINE(ENABLE_PKCS11, 1, [Build PKCS#11 support])
-	CFLAGS="$CFLAGS $P11_KIT_CFLAGS"
-	LIBS="$LIBS $P11_KIT_LIBS"
-	with_p11_kit=yes
+	PKG_CHECK_MODULES(P11_KIT, [p11-kit-1 >= 0.4], [with_p11_kit=yes], [with_p11_kit=no])
+	if test "$with_p11_kit" != "no";then
+		AC_DEFINE([ENABLE_PKCS11], 1, [Build PKCS#11 support])
+		CFLAGS="$CFLAGS $P11_KIT_CFLAGS"
+		LIBS="$LIBS $P11_KIT_LIBS"
+	else
+	        AC_MSG_WARN([[
+*** 
+*** p11-kit was not found. PKCS #11 support will be disabled.
+*** You may get it from http://p11-glue.freedesktop.org/p11-kit.html
+*** ]])
+	fi
 fi
 
 lgl_INIT
-- 
2.11.4.GIT