Index: third_party/yasm/patched-yasm/m4/po.m4 |
=================================================================== |
--- third_party/yasm/patched-yasm/m4/po.m4 (revision 71129) |
+++ third_party/yasm/patched-yasm/m4/po.m4 (working copy) |
@@ -1,5 +1,5 @@ |
-# po.m4 serial 13 (gettext-0.15) |
-dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. |
+# po.m4 serial 15 (gettext-0.17) |
+dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. |
dnl This file is free software; the Free Software Foundation |
dnl gives unlimited permission to copy and/or distribute it, |
dnl with or without modifications, as long as this notice is preserved. |
@@ -27,6 +27,10 @@ |
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, |
dnl because they are needed for "make dist" to work. |
@@ -84,6 +88,10 @@ |
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], [[ |
for ac_file in $CONFIG_FILES; do |
# Support "outfile[:infile[:infile...]]" |
@@ -426,3 +434,16 @@ |
fi |
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" |
+]) |