[SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_22-9-g4fa2188

[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=4fa2188f4c2ed817fb24fad40dbe22cb4296ee6f

The branch, gnutls_3_0_x-2 has been updated
       via  4fa2188f4c2ed817fb24fad40dbe22cb4296ee6f (commit)
       via  d478af8140c2c7667355a01f65cba2c789bfff48 (commit)
       via  60c379292d1200e5a261409bf627d56b59bdd00d (commit)
       via  eea0960e07000ee5190fa8d063b3655f94a86888 (commit)
      from  03309820c27babeb719b0ccd0cff6ce761e0cf62 (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 4fa2188f4c2ed817fb24fad40dbe22cb4296ee6f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Aug 15 09:55:17 2012 +0200

    Link srptool with libintl. Suggested by B. Scott Michel.

commit d478af8140c2c7667355a01f65cba2c789bfff48
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Aug 11 09:29:40 2012 +0200

    the new makeinfo sets the FLOAT_NAME by default.

commit 60c379292d1200e5a261409bf627d56b59bdd00d
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Aug 10 22:32:14 2012 +0200

    corrected html generation

commit eea0960e07000ee5190fa8d063b3655f94a86888
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Aug 8 18:34:28 2012 +0200

    updated html doc

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

Summary of changes:
 cfg.mk          |    2 +-
 doc/Makefile.am |    2 +-
 src/Makefile.am |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 9e71e3f..a84f772 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -143,7 +143,7 @@ upload:
 web:
        echo generating documentation for $(PACKAGE)
        cd doc && $(SHELL) ../build-aux/gendocs.sh \
-               --html "--css-include=texinfo.css" \
+               --html "--css-include=./texinfo.css" \
                -o ../$(htmldir)/manual/ $(PACKAGE) "$(PACKAGE_NAME)"
        -cd doc && make gnutls.epub && cp gnutls.epub ../$(htmldir)/manual/
        cd doc && cp *.png ../$(htmldir)/manual/html_node/
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f2b695a..873e740 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -169,7 +169,7 @@ images_DATA = \
 AM_MAKEINFOFLAGS = -I $(top_srcdir)/doc
 TEXI2DVI = texi2dvi $(AM_MAKEINFOFLAGS)
 AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) \
-       --set FLOAT_NAME_IN_XREF=1 --no-split 
--css-include=$(srcdir)/texinfo.css
+       --no-split --css-include=$(srcdir)/texinfo.css
 
 MAINTAINERCLEANFILES =
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 8b3b578..378a71b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,7 +72,7 @@ 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 
-srptool_LDADD += $(LIBOPTS_LDADD) 
+srptool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL)
 noinst_LTLIBRARIES += libcmd-srp.la
 libcmd_srp_la_CFLAGS =
 libcmd_srp_la_SOURCES = srptool-args.def srptool-args.c srptool-args.h


hooks/post-receive
-- 
GNU gnutls