summaryrefslogtreecommitdiffstats
path: root/gettext-tools
diff options
context:
space:
mode:
Diffstat (limited to 'gettext-tools')
-rw-r--r--gettext-tools/po/ChangeLog8
-rw-r--r--gettext-tools/po/Makefile.in.in14
2 files changed, 19 insertions, 3 deletions
diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog
index 3ba0b0d..bbd91ff 100644
--- a/gettext-tools/po/ChangeLog
+++ b/gettext-tools/po/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-08 Bruno Haible <bruno@clisp.org>
+
+ Check that the gettext macros and Makefile.in.in are in sync.
+ * Makefile.in.in (GETTEXT_MACRO_VERSION): New macro.
+ (check-macro-version): New target.
+ (all): Depend on it.
+ Suggested by Daniel Leidert <daniel.leidert@gmx.net>.
+
2007-06-11 Bruno Haible <bruno@clisp.org>
* fr.po: Update from Christophe Combelles <ccomb@free.fr>.
diff --git a/gettext-tools/po/Makefile.in.in b/gettext-tools/po/Makefile.in.in
index 5022b8b..42f0237 100644
--- a/gettext-tools/po/Makefile.in.in
+++ b/gettext-tools/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 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,7 +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.16
+# Origin: gettext-0.16.2
+GETTEXT_MACRO_VERSION = 0.16.2
PACKAGE = @PACKAGE@
VERSION = @VERSION@
@@ -95,11 +96,18 @@ CATALOGS = @CATALOGS@
mv t-$@ $@
-all: all-@USE_NLS@
+all: check-macro-version 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