[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-271-gb0a2bb9

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

The branch, master has been updated
       via  b0a2bb980b403077656f39d79d3fc796407cd7e8 (commit)
      from  70b3d238c4f3c409780e751f2a0bbef48bb457c1 (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 b0a2bb980b403077656f39d79d3fc796407cd7e8
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Mar 10 17:14:12 2011 +0100

    link libgnutls-extra against libgcrypt if required. Based
    on patch by Andreas Metzler <address@hidden>

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

Summary of changes:
 libextra/Makefile.am |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index 996c7e2..e280527 100644
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -84,6 +84,10 @@ endif
 libgnutls_extra_la_LIBADD = $(LIBSOCKET)
 libgnutls_extra_la_LDFLAGS = -no-undefined
 
+if !ENABLE_NETTLE
+libgnutls_extra_la_LIBADD += $(LTLIBGCRYPT)
+endif
+
 # Rest
 
 if HAVE_LD_OUTPUT_DEF


hooks/post-receive
-- 
GNU gnutls