Changeset 7bbc2548f92696457164ebf7f4f86dc815ef80c7 for po/Makefile.in.in

Timestamp:

23/03/08 21:01:24 (7 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1206302484 +0200

git-parent:

[6abf349d0ab414b10c31c8a5b1772bda356eb141]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1206302484 +0200

Message:

Switch to gettext 0.17

The whole point of keeping the m4 and po/Makefile.in.in is to not need
to have the same version all over the place anyway, otherwise we might
as well put all these files to .gitignore...

Remove some old m4 macros as well.

Files:

• po/Makefile.in.in (modified) (5 diffs)

po/Makefile.in.in

@@ -1 +1 @@
-# Makefile for PO directory in any package using GNU gettext.
-6
+7
-#
-# This file can be copied and used freely without restrictions.  It can
@@ -9 +9 @@
-# General Public License and is *not* in the public domain.
-#
-
+
+
-
-PACKAGE = @PACKAGE@
@@ -96 +97 @@
-
-
-
+check-macro-version 
-
-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
@@ -131 +139 @@
-# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
-$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+    if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
+      package_gnu='GNU '; \
+    else \
+      package_gnu=''; \
+    fi; \
-    if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
-      msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
@@ -136 +149 @@
-      msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
-    fi; \
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    test ! -f $(DOMAIN).po || { \
-      if test -f $(srcdir)/$(DOMAIN).pot; then \