[SCM] GNU gnutls branch, master, updated. gnutls_3_0_7-40-g93faa4c

[Simon Josefsson]

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=93faa4cb6d5c063f982bcb721ada1590f35c63d4

The branch, master has been updated
       via  93faa4cb6d5c063f982bcb721ada1590f35c63d4 (commit)
       via  2adcb013f0499a6fae96e13076fe95aff55ec0f1 (commit)
       via  0db087a07b271329d85c5f806a06ef5199fd323a (commit)
      from  ce43f3cfab492cacbd669ed880552050d0557bf2 (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 93faa4cb6d5c063f982bcb721ada1590f35c63d4
Author: Simon Josefsson <address@hidden>
Date:   Wed Nov 9 10:50:26 2011 +0100

    Fix code coverage rules.

commit 2adcb013f0499a6fae96e13076fe95aff55ec0f1
Author: Simon Josefsson <address@hidden>
Date:   Wed Nov 9 10:50:17 2011 +0100

    Ignore coverage related stuff.

commit 0db087a07b271329d85c5f806a06ef5199fd323a
Author: Simon Josefsson <address@hidden>
Date:   Wed Nov 9 10:16:26 2011 +0100

    Don't add p11-kit to CFLAGS/LIBS globally, just where it is needed.

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

Summary of changes:
 .gitignore      |    6 ++++++
 cfg.mk          |    2 ++
 configure.ac    |    4 +---
 lib/Makefile.am |    5 +++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 14797da..114cfa1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+*.gcda
+*.gcno
+*.gcov
 *.lo
 *.o
 *~
@@ -28,6 +31,7 @@ doc/Makefile
 doc/Makefile.in
 doc/algorithms.texi
 doc/core.c.texi
+doc/coverage/
 doc/credentials/Makefile
 doc/credentials/Makefile.in
 doc/credentials/openpgp/Makefile
@@ -166,6 +170,7 @@ gl/tests/arpa/
 gl/tests/c++defs.h
 gl/tests/fcntl.h
 gl/tests/glthread/.dirstamp
+gl/tests/glthread/glthread
 gl/tests/inttypes.h
 gl/tests/inttypes.h 
 gl/tests/libtests.a
@@ -419,6 +424,7 @@ src/cfg/platon/Makefile.in
 src/cfg/platon/str/Makefile
 src/cfg/platon/str/Makefile.in
 src/crywrap/crywrap
+src/gaa.skel
 src/gnutls-cli
 src/gnutls-cli-debug
 src/gnutls-serv
diff --git a/cfg.mk b/cfg.mk
index 02b5fcd..5c87889 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -78,6 +78,8 @@ glimport:
 # Code Coverage
 
 pre-coverage:
+       ./configure --disable-cxx
+       ln -s . gl/tests/glthread/glthread
        ln -sf /usr/local/share/gaa/gaa.skel src/gaa.skel
 
 web-coverage:
diff --git a/configure.ac b/configure.ac
index 70554cf..5c67940 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,8 +139,6 @@ if test "$with_p11_kit" != "no"; then
        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"
                if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
                        GNUTLS_REQUIRES_PRIVATE="Requires.private: p11-kit-1"
                else
@@ -218,7 +216,7 @@ if test x$ac_zlib != xno; then
     if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then
       GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
     else
-      GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE , zlib"
+      GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib"
     fi
   else
     GNUTLS_ZLIB_LIBS_PRIVATE="$LTLIBZ"
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 90c3369..74258b5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -36,7 +36,8 @@ AM_CPPFLAGS = \
        -I$(builddir)/x509                      \
        -I$(srcdir)/includes                    \
        -I$(builddir)/includes                  \
-       -I$(srcdir)/x509
+       -I$(srcdir)/x509                        \
+       $(P11_KIT_CFLAGS)
 
 if ENABLE_OPENPGP
 SUBDIRS += opencdk
@@ -114,7 +115,7 @@ libgnutls_la_LIBADD = ../gl/libgnu.la 
x509/libgnutls_x509.la \
        accelerated/libaccelerated.la ext/libgnutls_ext.la \
        auth/libgnutls_auth.la algorithms/libgnutls_alg.la \
        $(LTLIBZ)  $(LTLIBINTL) $(LIBSOCKET) $(LTLIBDL) \
-       $(LTLIBPTHREAD)
+       $(LTLIBPTHREAD) $(P11_KIT_LIBS)
 
 if ENABLE_OPENPGP
 libgnutls_la_LIBADD += openpgp/libgnutls_openpgp.la


hooks/post-receive
-- 
GNU gnutls