[SCM] GNU gnutls branch, master, updated. gnutls_2_99_0-60-gd8aedd6

[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=d8aedd61d833fe71b3a0707c74b2c491d6dce14c

The branch, master has been updated
       via  d8aedd61d833fe71b3a0707c74b2c491d6dce14c (commit)
       via  cbc845201d51b314bef4f1ded7d6f2a4c20fca82 (commit)
       via  33cc86625ffbfb259eceac38a1982df54f5daf96 (commit)
       via  26aaf59cc2c66e4721b6afd0b60d742b4fd20ded (commit)
       via  9a5ead13ba1747f68748618cc4e8d2b4bdb89f5f (commit)
       via  f801d7e330977639b610ee8b662353d2005abe69 (commit)
      from  6c5fc71830d12aa8ef71ebaa6af062b6370ef671 (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 d8aedd61d833fe71b3a0707c74b2c491d6dce14c
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Apr 16 18:11:33 2011 +0200

    more files to ignore

commit cbc845201d51b314bef4f1ded7d6f2a4c20fca82
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Apr 16 18:05:31 2011 +0200

    COMP-ZLIB -> COMP-DEFLATE

commit 33cc86625ffbfb259eceac38a1982df54f5daf96
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Apr 16 17:52:00 2011 +0200

    Link with pthreads.

commit 26aaf59cc2c66e4721b6afd0b60d742b4fd20ded
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Apr 16 16:18:47 2011 +0200

    read API from new directories as well.

commit 9a5ead13ba1747f68748618cc4e8d2b4bdb89f5f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Apr 16 16:14:58 2011 +0200

    corrected filename

commit f801d7e330977639b610ee8b662353d2005abe69
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Apr 16 16:12:57 2011 +0200

    removed conditional compilation

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

Summary of changes:
 .gitignore                  |    2 ++
 doc/Makefile.am             |    2 +-
 lib/Makefile.am             |    3 ++-
 lib/accelerated/Makefile.am |    2 +-
 lib/ext/session_ticket.c    |    4 ----
 m4/hooks.m4                 |    2 +-
 src/tests.c                 |    2 +-
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 42008a7..2b60786 100644
--- a/.gitignore
+++ b/.gitignore
@@ -451,3 +451,5 @@ lib/accelerated/libaccelerated.la
 gl/time.h
 lib/accelerated/intel/libintel.la
 doc/cyclo/cyclo-gnutls.html
+lib/ext/libgnutls_ext.la
+lib/auth/libgnutls_auth.la
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3b47aca..0f12324 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -106,7 +106,7 @@ gnutls_TEXINFOS += gnutls-api.texi extra-api.texi \
 MAINTAINERCLEANFILES += gnutls-api.texi extra-api.texi \
        x509-api.texi pgp-api.texi
 
-gnutls-api.texi: $(srcdir)/../lib/*.c
+gnutls-api.texi: $(srcdir)/../lib/*.c $(srcdir)/../lib/ext/*.c 
$(srcdir)/../lib/auth/*.c
        echo "" > address@hidden
        for i in $^; do \
                echo -n "Creating documentation for file $$i... " && \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0e7751e..7afe690 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -113,7 +113,8 @@ libgnutls_la_LDFLAGS = -no-undefined \
 libgnutls_la_LIBADD = ../gl/libgnu.la x509/libgnutls_x509.la \
        accelerated/libaccelerated.la ext/libgnutls_ext.la \
        auth/libgnutls_auth.la \
-       $(LTLIBZ)  $(LTLIBINTL) $(LIBSOCKET) $(LTLIBDL)
+       $(LTLIBZ)  $(LTLIBINTL) $(LIBSOCKET) $(LTLIBDL) \
+       $(LTLIBPTHREAD)
 
 if ENABLE_OPENPGP
 libgnutls_la_LIBADD += openpgp/libgnutls_openpgp.la
diff --git a/lib/accelerated/Makefile.am b/lib/accelerated/Makefile.am
index 7657ab2..f964572 100644
--- a/lib/accelerated/Makefile.am
+++ b/lib/accelerated/Makefile.am
@@ -35,7 +35,7 @@ endif
 
 noinst_LTLIBRARIES = libaccelerated.la
 
-EXTRA_DIST = x86.h accelerated.h gnutls_cryptodev.h
+EXTRA_DIST = x86.h accelerated.h cryptodev.h
 libaccelerated_la_SOURCES = accelerated.c cryptodev.c
 libaccelerated_la_LIBADD =
 
diff --git a/lib/ext/session_ticket.c b/lib/ext/session_ticket.c
index 34bbad7..5bc8ab6 100644
--- a/lib/ext/session_ticket.c
+++ b/lib/ext/session_ticket.c
@@ -36,8 +36,6 @@
 #include <gnutls_extensions.h>
 #include <gnutls_constate.h>
 
-#ifdef ENABLE_SESSION_TICKET
-
 #define KEY_NAME_SIZE SESSION_TICKET_KEY_NAME_SIZE
 #define KEY_SIZE SESSION_TICKET_KEY_SIZE
 #define IV_SIZE SESSION_TICKET_IV_SIZE
@@ -739,5 +737,3 @@ error:
   
   return ret;
 }
-
-#endif
diff --git a/m4/hooks.m4 b/m4/hooks.m4
index d99dd82..5af3831 100644
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -97,7 +97,7 @@ if test "$cryptolib" = "nettle";then
     AC_DEFINE([NETTLE_GCM], 1, [Nettle supports GCM])
   ], [
   ])
-    NETTLE_LIBS="-lgmp -lpthread -lhogweed"
+    NETTLE_LIBS="-lgmp -lhogweed"
 else
   AC_MSG_RESULT(no)
 fi
diff --git a/src/tests.c b/src/tests.c
index d844800..aecad73 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -545,7 +545,7 @@ test_zlib (gnutls_session_t session)
   int ret;
 
   sprintf (prio_str,
-           INIT_STR ALL_CIPHERS ":+COMP-ZLIB:" ALL_CERTTYPES ":%s:" ALL_MACS
+           INIT_STR ALL_CIPHERS ":+COMP-DEFLATE:" ALL_CERTTYPES ":%s:" ALL_MACS
            ":" ALL_KX ":%s", protocol_str, rest);
   _gnutls_priority_set_direct (session, prio_str);
 


hooks/post-receive
-- 
GNU gnutls