From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 29 Sep 2011 10:58:15 +0000 (+0200)
Subject: fixed compilation without p11-kit
X-Git-Tag: gnutls_3_0_4~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3edaf986b6dd126397cede1f23d3c35edb5452ae;p=thirdparty%2Fgnutls.git

fixed compilation without p11-kit
---

diff --git a/configure.ac b/configure.ac
index b3b6fb36d1..e60c58a3e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,6 +136,7 @@ if test "$with_p11_kit" != "no"; then
 			GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, p11-kit-1"
 		fi
 	else
+	        with_p11_kit=no
 	        AC_MSG_WARN([[
 *** 
 *** p11-kit was not found. PKCS #11 support will be disabled.
diff --git a/src/p11common.c b/src/p11common.c
index 0a8cf85299..8deda79ab7 100644
--- a/src/p11common.c
+++ b/src/p11common.c
@@ -28,6 +28,8 @@
 #include <gnutls/pkcs11.h>
 #include <p11common.h>
 
+#ifdef ENABLE_PKCS11
+
 #define MIN(x,y) ((x)<(y))?(x):(y)
 
 #define MAX_CACHE_TRIES 5
@@ -130,3 +132,4 @@ pkcs11_common (void)
 
 }
 
+#endif