Changeset 7bbc2548f92696457164ebf7f4f86dc815ef80c7 for m4/po.m4

Timestamp:

03/23/08 21:01:24 (5 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:

• m4/po.m4 (modified) (4 diffs)

m4/po.m4

@@ -1 @@
-3 (gettext-0.15
-6
+5 (gettext-0.17
+7
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
@@ -27 +27 @@
-  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
-  AC_REQUIRE([AM_NLS])dnl
+
+  dnl Release version of the gettext macros. This is used to ensure that
+  dnl the gettext macros and po/Makefile.in.in are in sync.
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
-
-  dnl Perform the following tests also if --disable-nls has been given,
@@ -84 +88 @@
-  test -n "$localedir" || localedir='${datadir}/locale'
-  AC_SUBST([localedir])
+
+  dnl Support for AM_XGETTEXT_OPTION.
+  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
-
-  AC_CONFIG_COMMANDS([po-directories], [[
@@ -427 +435 @@
-  mv "$ac_file.tmp" "$ac_file"
-])
+
+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
+[
+  XGETTEXT_EXTRA_OPTIONS=
+])
+
+dnl Registers an option to be passed to xgettext in the po subdirectory.
+AC_DEFUN([AM_XGETTEXT_OPTION],
+[
+  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+])