downgrade to gettext 0.18.3 for more sane availability

4 files changed, 14 insertions, 72 deletions

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 65184f65c..fabdc76c9 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -8,8 +8,8 @@
 # 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.19
-GETTEXT_MACRO_VERSION = 0.19
+# Origin: gettext-0.18.3
+GETTEXT_MACRO_VERSION = 0.18
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
@@ -77,16 +77,6 @@ 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:
@@ -153,25 +143,15 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
 # 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 '; \
+        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='GNU '; \
         else \
-          package_prefix=''; \
+          package_gnu=''; \
         fi; \
         if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
           msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
@@ -191,7 +171,7 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
               --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
               --files-from=$(srcdir)/POTFILES.in \
               --copyright-holder='$(COPYRIGHT_HOLDER)' \
-              --package-name="$${package_prefix}@PACKAGE@" \
+              --package-name="$${package_gnu}@PACKAGE@" \
               --package-version='@VERSION@' \
               --msgid-bugs-address="$$msgid_bugs_address" \
             ;; \
@@ -219,10 +199,9 @@ $(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): $(POFILESDEPS)
+$(POFILES): $(srcdir)/$(DOMAIN).pot
         @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) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
           cd $(srcdir) \
@@ -383,7 +362,7 @@ maintainer-clean: distclean
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir:
-        test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
+        $(MAKE) update-po
         @$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
 dist2: stamp-po $(DISTFILES)
diff --git a/po/Makevars.template b/po/Makevars.template
index 0648ec759..4a9ff7d23 100644
--- a/po/Makevars.template
+++ b/po/Makevars.template
@@ -20,13 +20,6 @@ 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
@@ -58,21 +51,3 @@ USE_MSGCTXT = no
 #   --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 a9015c08b..5fd10263e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -459,7 +459,6 @@ src/include/gnunet_common.h
 src/include/gnunet_mq_lib.h
 src/include/gnunet_postgres_lib.h
 src/include/gnunet_time_lib.h
-src/nat/test_stun.h
 src/rps/rps-test_util.h
 src/scalarproduct/scalarproduct.h
 src/testbed/testbed_api.h
diff --git a/po/Rules-quot b/po/Rules-quot
index 9dc963076..5931e5392 100644
--- a/po/Rules-quot
+++ b/po/Rules-quot
@@ -1,4 +1,3 @@
-# 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
@@ -21,17 +20,7 @@ en@boldquot.po-update: en@boldquot.po-update-en
         ll=`echo $$lang | sed -e 's/@.*//'`; \
         LC_ALL=C; export LC_ALL; \
         cd $(srcdir); \
-        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 $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -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 cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
             rm -f $$tmpdir/$$lang.new.po; \
           else \