[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_18-27-g2d04
From: |
Nikos Mavrogiannopoulos |
Subject: |
[SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_18-27-g2d047d6 |
Date: |
Sat, 14 Apr 2012 09:09:48 +0000 |
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=2d047d6e97a33654b8346115609027e7e516176b
The branch, gnutls_3_0_x-2 has been updated
via 2d047d6e97a33654b8346115609027e7e516176b (commit)
from cd40e343e78d2605dc77a1685b03501f7b9b3c10 (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 2d047d6e97a33654b8346115609027e7e516176b
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Apr 14 00:20:44 2012 +0200
No need to include gettext.h. Link against libintl when needed.
-----------------------------------------------------------------------
Summary of changes:
src/Makefile.am | 22 +++++++++++++---------
src/cli.c | 1 -
src/srptool.c | 1 -
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index d7595b2..5550f3b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,7 +63,7 @@ gnutls_serv_SOURCES = \
certtool-common.h \
$(PKCS11_SRCS)
gnutls_serv_LDADD = ../lib/libgnutls.la
-gnutls_serv_LDADD += libcmd-serv.la ../gl/libgnu.la $(LIBOPTS_LDADD)
+gnutls_serv_LDADD += libcmd-serv.la ../gl/libgnu.la $(LIBOPTS_LDADD)
$(LTLIBINTL)
gnutls_serv_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB)
noinst_LTLIBRARIES += libcmd-serv.la
libcmd_serv_la_CFLAGS =
@@ -71,7 +71,8 @@ libcmd_serv_la_SOURCES = serv-args.def serv-args.c serv-args.h
if ENABLE_SRP
srptool_SOURCES = srptool.c
-srptool_LDADD = ../lib/libgnutls.la libcmd-srp.la ../gl/libgnu.la
$(LIBOPTS_LDADD)
+srptool_LDADD = ../lib/libgnutls.la libcmd-srp.la ../gl/libgnu.la
+srptool_LDADD += $(LIBOPTS_LDADD)
noinst_LTLIBRARIES += libcmd-srp.la
libcmd_srp_la_CFLAGS =
libcmd_srp_la_SOURCES = srptool-args.def srptool-args.c srptool-args.h
@@ -80,15 +81,16 @@ endif
if ENABLE_OCSP
ocsptool_SOURCES = ocsptool.c ocsptool-common.h ocsptool-common.c \
socket.c socket.h
-ocsptool_LDADD = ../lib/libgnutls.la libcmd-ocsp.la ../gl/libgnu.la
$(LIBOPTS_LDADD) \
- $(GETADDRINFO_LIB)
+ocsptool_LDADD = ../lib/libgnutls.la libcmd-ocsp.la ../gl/libgnu.la
+ocsptool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) $(GETADDRINFO_LIB)
noinst_LTLIBRARIES += libcmd-ocsp.la
libcmd_ocsp_la_CFLAGS =
libcmd_ocsp_la_SOURCES = ocsptool-args.def ocsptool-args.h ocsptool-args.c
endif
psktool_SOURCES = psk.c
-psktool_LDADD = ../lib/libgnutls.la libcmd-psk.la ../gl/libgnu.la
$(LIBOPTS_LDADD)
+psktool_LDADD = ../lib/libgnutls.la libcmd-psk.la ../gl/libgnu.la
+psktool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL)
noinst_LTLIBRARIES += libcmd-psk.la
libcmd_psk_la_CFLAGS =
libcmd_psk_la_SOURCES = psk-args.def psk-args.c psk-args.h
@@ -99,7 +101,7 @@ gnutls_cli_SOURCES = cli.c common.h common.c \
socket.c socket.h ocsptool-common.c \
$(PKCS11_SRCS) $(BENCHMARK_SRCS)
gnutls_cli_LDADD = ../lib/libgnutls.la
-gnutls_cli_LDADD += libcmd-cli.la ../gl/libgnu.la $(LIBOPTS_LDADD)
+gnutls_cli_LDADD += libcmd-cli.la ../gl/libgnu.la $(LIBOPTS_LDADD) $(LTLIBINTL)
gnutls_cli_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB) $(LIB_CLOCK_GETTIME) \
$(SERVENT_LIB)
noinst_LTLIBRARIES += libcmd-cli.la
@@ -109,7 +111,8 @@ libcmd_cli_la_SOURCES = cli-args.def cli-args.c cli-args.h
gnutls_cli_debug_SOURCES = tls_test.c tests.h tests.c \
socket.c socket.h common.h common.c \
$(PKCS11_SRCS)
-gnutls_cli_debug_LDADD = ../lib/libgnutls.la libcmd-cli-debug.la
$(LIBOPTS_LDADD)
+gnutls_cli_debug_LDADD = ../lib/libgnutls.la libcmd-cli-debug.la
+gnutls_cli_debug_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL)
gnutls_cli_debug_LDADD += ../gl/libgnu.la $(LIBSOCKET) $(GETADDRINFO_LIB)
noinst_LTLIBRARIES += libcmd-cli-debug.la
libcmd_cli_debug_la_CFLAGS =
@@ -125,7 +128,8 @@ noinst_LTLIBRARIES += libcmd-certtool.la
libcmd_certtool_la_CFLAGS =
libcmd_certtool_la_SOURCES = certtool-args.c certtool-args.def certtool-args.h
\
certtool-cfg.h certtool-cfg.c
-libcmd_certtool_la_LIBADD = ../gl/libgnu.la $(LTLIBREADLINE) $(LIBOPTS_LDADD)
+libcmd_certtool_la_LIBADD = ../gl/libgnu.la $(LTLIBREADLINE)
+libcmd_certtool_la_LIBADD += $(LIBOPTS_LDADD) $(LTLIBINTL)
libcmd_certtool_la_LIBADD += ../lib/libgnutls.la
libcmd_certtool_la_LIBADD += ../gl/libgnu.la $(INET_PTON_LIB)
@@ -133,7 +137,7 @@ libcmd_certtool_la_LIBADD += ../gl/libgnu.la
$(INET_PTON_LIB)
if ENABLE_PKCS11
p11tool_SOURCES = p11tool-args.def p11tool.c pkcs11.c certtool-common.c
p11tool.h $(PKCS11_SRCS)
-p11tool_LDADD = ../lib/libgnutls.la $(LIBOPTS_LDADD)
+p11tool_LDADD = ../lib/libgnutls.la $(LIBOPTS_LDADD) $(LTLIBINTL)
p11tool_LDADD += libcmd-p11tool.la ../gl/libgnu.la
noinst_LTLIBRARIES += libcmd-p11tool.la
diff --git a/src/cli.c b/src/cli.c
index 3f13a46..1cdc1df 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -58,7 +58,6 @@
#include <common.h>
#include <socket.h>
-#include <gettext.h>
#include <cli-args.h>
#include <ocsptool-common.h>
diff --git a/src/srptool.c b/src/srptool.c
index 8c09294..b653034 100644
--- a/src/srptool.c
+++ b/src/srptool.c
@@ -42,7 +42,6 @@
#include <progname.h>
#include <version-etc.h>
-#include <gettext.h>
#include <srptool-args.h>
/* This may need some rewrite. A lot of stuff which should be here
hooks/post-receive
--
GNU gnutls
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_18-27-g2d047d6,
Nikos Mavrogiannopoulos <=