[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_1-7-g0afa0ff

[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=0afa0ff850bce075d15c27fda121f2b801fb5f49

The branch, gnutls_2_12_x has been updated
       via  0afa0ff850bce075d15c27fda121f2b801fb5f49 (commit)
       via  f6cf6f814b4e9e60eb99a5b7fcd84527205f5fe5 (commit)
      from  df6bda03100b4a1a4b00083e67b1b0b1aae0db6b (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 0afa0ff850bce075d15c27fda121f2b801fb5f49
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Apr 3 23:46:10 2011 +0200

    Compile ex-cert-select-pkcs11 as a separate program.

commit f6cf6f814b4e9e60eb99a5b7fcd84527205f5fe5
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Apr 3 22:27:12 2011 +0200

    gcrypt.h is not really needed. Reported by David Reiser.

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

Summary of changes:
 doc/examples/Makefile.am |    3 ++-
 lib/nettle/init.c        |    1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index ef9d1d6..068d7fc 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -43,6 +43,7 @@ CXX_LDADD = $(LDADD) \
 
 noinst_PROGRAMS = ex-client2 ex-client-resume
 noinst_PROGRAMS += ex-cert-select ex-rfc2818
+noinst_PROGRAMS += ex-cert-select-pkcs11
 
 if ENABLE_PKI
 noinst_PROGRAMS += ex-crq ex-serv1
@@ -77,4 +78,4 @@ noinst_LTLIBRARIES = libexamples.la
 
 libexamples_la_SOURCES = examples.h ex-alert.c ex-pkcs12.c             \
        ex-session-info.c ex-x509-info.c ex-verify.c    \
-       tcp.c ex-cert-select-pkcs11.c
+       tcp.c 
diff --git a/lib/nettle/init.c b/lib/nettle/init.c
index 446083c..14c3715 100644
--- a/lib/nettle/init.c
+++ b/lib/nettle/init.c
@@ -26,7 +26,6 @@
 #include <gnutls_errors.h>
 #include <gnutls_num.h>
 #include <gnutls_mpi.h>
-#include <gcrypt.h>
 
 /* Functions that refer to the initialization of the libgcrypt library.
  */


hooks/post-receive
-- 
GNU gnutls