[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_11_6-106-g618ace3

[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=618ace37a378c960c11e5e3b45366083a7b41e37

The branch, gnutls_2_12_x has been updated
       via  618ace37a378c960c11e5e3b45366083a7b41e37 (commit)
       via  7e60b55d64c4906ea09039176b0e9ae95d1f30ea (commit)
      from  04458ba914735a38a059fb6c7e9ec426441beb21 (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 618ace37a378c960c11e5e3b45366083a7b41e37
Author: Simon Josefsson <address@hidden>
Date:   Sun Feb 20 16:48:10 2011 +0100

    Link with -lnettle too.

commit 7e60b55d64c4906ea09039176b0e9ae95d1f30ea
Author: Simon Josefsson <address@hidden>
Date:   Sun Feb 20 16:42:31 2011 +0100

    Ignore more.

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

Summary of changes:
 .gitignore      |    2 ++
 lib/Makefile.am |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 24ba213..d286453 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,6 +136,7 @@ gl/tests/Makefile
 gl/tests/Makefile.in
 gl/tests/arg-nonnull.h
 gl/tests/c++defs.h
+gl/tests/fcntl.h
 gl/tests/libtests.a
 gl/tests/sys/
 gl/tests/test-alignof
@@ -231,6 +232,7 @@ lib/gl/tests/Makefile
 lib/gl/tests/Makefile.in
 lib/gl/tests/arg-nonnull.h
 lib/gl/tests/c++defs.h
+lib/gl/tests/fcntl.h
 lib/gl/tests/libtests.a
 lib/gl/tests/test-alloca-opt
 lib/gl/tests/test-binary-io
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 74aa1a3..0bb55b1 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -144,7 +144,7 @@ endif
 libgnutls_la_LDFLAGS += $(LTLIBPAKCHOIS)
 
 if ENABLE_NETTLE
-libgnutls_la_LDFLAGS += $(NETTLE_LIBS)
+libgnutls_la_LDFLAGS += $(LTLIBNETTLE) $(NETTLE_LIBS)
 libgnutls_la_LIBADD += nettle/libcrypto.la
 else
 libgnutls_la_LDFLAGS += $(LTLIBGCRYPT)


hooks/post-receive
-- 
GNU gnutls