[SCM] GNU gnutls branch, gnutls_3_0_x, updated. gnutls_3_0_1-58-g1a35fc3

[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=1a35fc3499e30898ea5966b0e1cbb3529690c047

The branch, gnutls_3_0_x has been updated
       via  1a35fc3499e30898ea5966b0e1cbb3529690c047 (commit)
       via  34365450fd427b4eb98290c73b161b85d1d90b5f (commit)
      from  2eaca501440bf2fdfd59e26420a7f714c32b4071 (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 1a35fc3499e30898ea5966b0e1cbb3529690c047
Merge: 2eaca50 3436545
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Aug 31 18:19:45 2011 +0200

    Merge branch 'master' into gnutls_3_0_x

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

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

diff --git a/configure.ac b/configure.ac
index 6971470..be6573b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,11 +125,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 >= 0.4])
-       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
 
 dnl Check for libcfg+


hooks/post-receive
-- 
GNU gnutls