-gettext and libtoolize updates

5 files changed, 150 insertions, 20 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 7ff113c61..05526fb76 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-18  gettextize  <bug-gnu-gettext@gnu.org>
+
+        * Makefile.in.in: Upgrade to gettext-0.19.3.
+        * Rules-quot: Upgrade to gettext-0.19.3.
+
 2007-02-08  gettextize  <bug-gnu-gettext@gnu.org>
 
         * Makefile.in.in: Upgrade to gettext-0.16.1.
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 5022b8b18..65184f65c 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,5 +1,5 @@
 # Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU General Public
@@ -8,12 +8,14 @@
 # Please note that the actual code of GNU gettext is covered by the GNU
 # General Public License and is *not* in the public domain.
 #
-# Origin: gettext-0.16
+# Origin: gettext-0.19
+GETTEXT_MACRO_VERSION = 0.19
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
+SED = @SED@
 SHELL = /bin/sh
 @SET_MAKE@
 
@@ -75,6 +77,16 @@ POTFILES = \
 
 CATALOGS = @CATALOGS@
 
+POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
+POFILESDEPS_yes = $(POFILESDEPS_)
+POFILESDEPS_no =
+POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
+
+DISTFILESDEPS_ = update-po
+DISTFILESDEPS_yes = $(DISTFILESDEPS_)
+DISTFILESDEPS_no =
+DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
+
 # Makevars gets inserted here. (Don't remove this line!)
 
 .SUFFIXES:
@@ -87,8 +99,8 @@ CATALOGS = @CATALOGS@
 .po.gmo:
         @lang=`echo $* | sed -e 's,.*/,,'`; \
         test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-        echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
-        cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+        echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
+        cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
 
 .sin.sed:
         sed -e '/^#/d' $< > t-$@
@@ -100,6 +112,13 @@ all: all-@USE_NLS@
 all-yes: stamp-po
 all-no:
 
+# Ensure that the gettext macros and this Makefile.in.in are in sync.
+CHECK_MACRO_VERSION = \
+        test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+          || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
+               exit 1; \
+             }
+
 # $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
 # internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
 # we don't want to bother translators with empty POT files). We assume that
@@ -115,6 +134,7 @@ all-no:
 # $(POFILES) has been designed to not touch files that don't need to be
 # changed.
 stamp-po: $(srcdir)/$(DOMAIN).pot
+        @$(CHECK_MACRO_VERSION)
         test ! -f $(srcdir)/$(DOMAIN).pot || \
           test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
         @test ! -f $(srcdir)/$(DOMAIN).pot || { \
@@ -129,17 +149,53 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
 
 # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
 # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+# The determination of whether the package xyz is a GNU one is based on the
+# heuristic whether some file in the top level directory mentions "GNU xyz".
+# If GNU 'find' is available, we avoid grepping through monster files.
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+        package_gnu="$(PACKAGE_GNU)"; \
+        test -n "$$package_gnu" || { \
+          if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
+                 LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
+                               -size -10000000c -exec grep 'GNU @PACKAGE@' \
+                               /dev/null '{}' ';' 2>/dev/null; \
+               else \
+                 LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
+               fi; \
+             } | grep -v 'libtool:' >/dev/null; then \
+             package_gnu=yes; \
+           else \
+             package_gnu=no; \
+           fi; \
+        }; \
+        if test "$$package_gnu" = "yes"; then \
+          package_prefix='GNU '; \
+        else \
+          package_prefix=''; \
+        fi; \
         if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
           msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
         else \
           msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
         fi; \
-        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
-          --files-from=$(srcdir)/POTFILES.in \
-          --copyright-holder='$(COPYRIGHT_HOLDER)' \
-          --msgid-bugs-address="$$msgid_bugs_address"
+        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
+            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+              --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+              --files-from=$(srcdir)/POTFILES.in \
+              --copyright-holder='$(COPYRIGHT_HOLDER)' \
+              --msgid-bugs-address="$$msgid_bugs_address" \
+            ;; \
+          *) \
+            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+              --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+              --files-from=$(srcdir)/POTFILES.in \
+              --copyright-holder='$(COPYRIGHT_HOLDER)' \
+              --package-name="$${package_prefix}@PACKAGE@" \
+              --package-version='@VERSION@' \
+              --msgid-bugs-address="$$msgid_bugs_address" \
+            ;; \
+        esac
         test ! -f $(DOMAIN).po || { \
           if test -f $(srcdir)/$(DOMAIN).pot; then \
             sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
@@ -163,12 +219,20 @@ $(srcdir)/$(DOMAIN).pot:
 
 # This target rebuilds a PO file if $(DOMAIN).pot has changed.
 # Note that a PO file is not touched if it doesn't need to be changed.
-$(POFILES): $(srcdir)/$(DOMAIN).pot
+$(POFILES): $(POFILESDEPS)
         @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
         if test -f "$(srcdir)/$${lang}.po"; then \
+          test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
           test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-          echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
-          cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+          echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
+          cd $(srcdir) \
+            && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+                   '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+                     $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
+                   *) \
+                     $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
+                 esac; \
+               }; \
         else \
           $(MAKE) $${lang}.po-create; \
         fi
@@ -191,7 +255,6 @@ install-data: install-data-@USE_NLS@
         fi
 install-data-no: all
 install-data-yes: all
-        $(mkdir_p) $(DESTDIR)$(datadir)
         @catalogs='$(CATALOGS)'; \
         for cat in $$catalogs; do \
           cat=`basename $$cat`; \
@@ -243,7 +306,6 @@ installdirs-data: installdirs-data-@USE_NLS@
         fi
 installdirs-data-no:
 installdirs-data-yes:
-        $(mkdir_p) $(DESTDIR)$(datadir)
         @catalogs='$(CATALOGS)'; \
         for cat in $$catalogs; do \
           cat=`basename $$cat`; \
@@ -321,7 +383,7 @@ maintainer-clean: distclean
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir:
-        $(MAKE) update-po
+        test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
         @$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
 dist2: stamp-po $(DISTFILES)
@@ -369,9 +431,15 @@ update-po: Makefile
         tmpdir=`pwd`; \
         echo "$$lang:"; \
         test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-        echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+        echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
         cd $(srcdir); \
-        if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+        if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+               '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+                 $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+               *) \
+                 $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+             esac; \
+           }; then \
           if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
             rm -f $$tmpdir/$$lang.new.po; \
           else \
@@ -392,9 +460,13 @@ $(DUMMYPOFILES):
 update-gmo: Makefile $(GMOFILES)
         @:
 
+# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
+# because execution permission bits may not work on the current file system.
+# Use @SHELL@, which is the shell determined by autoconf for the use by its
+# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
 Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
         cd $(top_builddir) \
-          && $(SHELL) ./config.status $(subdir)/$@.in po-directories
+          && @SHELL@ ./config.status $(subdir)/$@.in po-directories
 
 force:
 
diff --git a/po/Makevars.template b/po/Makevars.template
index 32692ab4b..0648ec759 100644
--- a/po/Makevars.template
+++ b/po/Makevars.template
@@ -20,6 +20,13 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
 # their copyright.
 COPYRIGHT_HOLDER = Free Software Foundation, Inc.
 
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU =
+
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
 # - Strings which are not entire sentences, see the maintainer guidelines
@@ -39,3 +46,33 @@ MSGID_BUGS_ADDRESS =
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a36c57f33..b350ea996 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -98,6 +98,11 @@ src/dht/gnunet-service-dht_hello.c
 src/dht/gnunet-service-dht_neighbours.c
 src/dht/gnunet-service-dht_nse.c
 src/dht/gnunet-service-dht_routing.c
+src/dht/gnunet-service-wdht.c
+src/dht/gnunet-service-wdht_clients.c
+src/dht/gnunet-service-wdht_datacache.c
+src/dht/gnunet-service-wdht_neighbours.c
+src/dht/gnunet-service-wdht_nse.c
 src/dht/gnunet-service-xdht.c
 src/dht/gnunet-service-xdht_clients.c
 src/dht/gnunet-service-xdht_datacache.c
diff --git a/po/Rules-quot b/po/Rules-quot
index 9c2a995e3..9dc963076 100644
--- a/po/Rules-quot
+++ b/po/Rules-quot
@@ -1,3 +1,4 @@
+# This file, Rules-quot, can be copied and used freely without restrictions.
 # Special Makefile rules for English message catalogs with quotation marks.
 
 DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
@@ -14,13 +15,23 @@ en@boldquot.po-update: en@boldquot.po-update-en
 
 .insert-header.po-update-en:
         @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
-        if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+        if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
         tmpdir=`pwd`; \
         echo "$$lang:"; \
         ll=`echo $$lang | sed -e 's/@.*//'`; \
         LC_ALL=C; export LC_ALL; \
         cd $(srcdir); \
-        if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+        if $(MSGINIT) $(MSGINIT_OPTIONS) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \
+           | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \
+           { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+             '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \
+               $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \
+               ;; \
+             *) \
+               $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \
+               ;; \
+             esac } 2>/dev/null > $$tmpdir/$$lang.new.po \
+             ; then \
           if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
             rm -f $$tmpdir/$$lang.new.po; \
           else \