[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_9-9-g0e03d09

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=0e03d097ade12cfb170154b6065bd6c3115606c3

The branch, gnutls_2_12_x has been updated
       via  0e03d097ade12cfb170154b6065bd6c3115606c3 (commit)
      from  d1b1294cc53a8efb069fc9454370f74cca72fef2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0e03d097ade12cfb170154b6065bd6c3115606c3
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Aug 31 17:43:29 2011 +0200

    do not exit configure if p11-kit is not found.

-----------------------------------------------------------------------

Summary of changes:
 lib/configure.ac |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/configure.ac b/lib/configure.ac
index 27c8064..63164ce 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


hooks/post-receive
-- 
GNU gnutls