[SCM] GNU gnutls branch, gnutls_2_8_x, updated. gnutls_2_8_5-8-gebc2249

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

The branch, gnutls_2_8_x has been updated
       via  ebc2249c7615c218c59ba96483623f4b4e357dce (commit)
      from  e4558449efb98f1d8898b7097b8431ba43bb5e32 (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 ebc2249c7615c218c59ba96483623f4b4e357dce
Author: Simon Josefsson <address@hidden>
Date:   Fri Nov 6 08:32:04 2009 +0100

    Link to libgcrypt explicitly when libgcrypt functions are used.

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

Summary of changes:
 src/Makefile.am |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 6fdd3b6..c80c6a0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,7 +40,8 @@ noinst_LTLIBRARIES =
 
 gnutls_serv_SOURCES = list.h serv.c common.h common.c certtool-common.h
 gnutls_serv_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la
-gnutls_serv_LDADD += libcmd-serv.la ../gl/libgnu.la $(LIBSOCKET) 
$(GETADDRINFO_LIB)
+gnutls_serv_LDADD += libcmd-serv.la ../gl/libgnu.la
+gnutls_serv_LDADD += $(LTLIBGCRYPT) $(LIBSOCKET) $(GETADDRINFO_LIB)
 noinst_LTLIBRARIES += libcmd-serv.la
 libcmd_serv_la_CFLAGS =
 libcmd_serv_la_SOURCES = serv.gaa serv-gaa.h serv-gaa.c
@@ -61,7 +62,8 @@ libcmd_psk_la_SOURCES = psk.gaa psk-gaa.h psk-gaa.c
 
 gnutls_cli_SOURCES = cli.c common.h common.c
 gnutls_cli_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la
-gnutls_cli_LDADD += libcmd-cli.la ../gl/libgnu.la $(LIBSOCKET) 
$(GETADDRINFO_LIB)
+gnutls_cli_LDADD += libcmd-cli.la ../gl/libgnu.la
+gnutls_cli_LDADD += $(LTLIBGCRYPT) $(LIBSOCKET) $(GETADDRINFO_LIB)
 noinst_LTLIBRARIES += libcmd-cli.la
 libcmd_cli_la_CFLAGS =
 libcmd_cli_la_SOURCES = cli.gaa cli-gaa.h cli-gaa.c
@@ -74,9 +76,9 @@ libcmd_cli_debug_la_CFLAGS =
 libcmd_cli_debug_la_SOURCES = tls_test.gaa tls_test-gaa.h tls_test-gaa.c
 
 certtool_SOURCES = certtool.c prime.c
-certtool_LDADD = libcmd-certtool.la
-certtool_LDADD += ../lib/libgnutls.la ../libextra/libgnutls-extra.la
-certtool_LDADD += ../gl/libgnu.la
+certtool_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la
+certtool_LDADD += libcmd-certtool.la ../gl/libgnu.la
+certtool_LDADD += $(LTLIBGCRYPT)
 if HAVE_LIBCFG
 certtool_LDADD += -lcfg+
 else


hooks/post-receive
-- 
GNU gnutls