diff options
Diffstat (limited to 'm4/po.m4')
-rw-r--r-- | m4/po.m4 | 29 |
1 files changed, 25 insertions, 4 deletions
@@ -1,5 +1,5 @@ | |||
1 | # po.m4 serial 13 (gettext-0.15) | 1 | # po.m4 serial 17 (gettext-0.18) |
2 | dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. | 2 | dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. |
3 | dnl This file is free software; the Free Software Foundation | 3 | dnl This file is free software; the Free Software Foundation |
4 | dnl gives unlimited permission to copy and/or distribute it, | 4 | dnl gives unlimited permission to copy and/or distribute it, |
5 | dnl with or without modifications, as long as this notice is preserved. | 5 | dnl with or without modifications, as long as this notice is preserved. |
@@ -17,7 +17,7 @@ dnl Authors: | |||
17 | dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. | 17 | dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. |
18 | dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. | 18 | dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. |
19 | 19 | ||
20 | AC_PREREQ(2.50) | 20 | AC_PREREQ([2.50]) |
21 | 21 | ||
22 | dnl Checks for all prerequisites of the po subdirectory. | 22 | dnl Checks for all prerequisites of the po subdirectory. |
23 | AC_DEFUN([AM_PO_SUBDIRS], | 23 | AC_DEFUN([AM_PO_SUBDIRS], |
@@ -27,6 +27,10 @@ AC_DEFUN([AM_PO_SUBDIRS], | |||
27 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake | 27 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake |
28 | AC_REQUIRE([AM_NLS])dnl | 28 | AC_REQUIRE([AM_NLS])dnl |
29 | 29 | ||
30 | dnl Release version of the gettext macros. This is used to ensure that | ||
31 | dnl the gettext macros and po/Makefile.in.in are in sync. | ||
32 | AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) | ||
33 | |||
30 | dnl Perform the following tests also if --disable-nls has been given, | 34 | dnl Perform the following tests also if --disable-nls has been given, |
31 | dnl because they are needed for "make dist" to work. | 35 | dnl because they are needed for "make dist" to work. |
32 | 36 | ||
@@ -37,7 +41,7 @@ AC_DEFUN([AM_PO_SUBDIRS], | |||
37 | [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && | 41 | [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && |
38 | (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], | 42 | (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], |
39 | :) | 43 | :) |
40 | AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) | 44 | AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT]) |
41 | 45 | ||
42 | dnl Test whether it is GNU msgfmt >= 0.15. | 46 | dnl Test whether it is GNU msgfmt >= 0.15. |
43 | changequote(,)dnl | 47 | changequote(,)dnl |
@@ -84,6 +88,10 @@ changequote([,])dnl | |||
84 | test -n "$localedir" || localedir='${datadir}/locale' | 88 | test -n "$localedir" || localedir='${datadir}/locale' |
85 | AC_SUBST([localedir]) | 89 | AC_SUBST([localedir]) |
86 | 90 | ||
91 | dnl Support for AM_XGETTEXT_OPTION. | ||
92 | test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= | ||
93 | AC_SUBST([XGETTEXT_EXTRA_OPTIONS]) | ||
94 | |||
87 | AC_CONFIG_COMMANDS([po-directories], [[ | 95 | AC_CONFIG_COMMANDS([po-directories], [[ |
88 | for ac_file in $CONFIG_FILES; do | 96 | for ac_file in $CONFIG_FILES; do |
89 | # Support "outfile[:infile[:infile...]]" | 97 | # Support "outfile[:infile[:infile...]]" |
@@ -426,3 +434,16 @@ EOF | |||
426 | fi | 434 | fi |
427 | mv "$ac_file.tmp" "$ac_file" | 435 | mv "$ac_file.tmp" "$ac_file" |
428 | ]) | 436 | ]) |
437 | |||
438 | dnl Initializes the accumulator used by AM_XGETTEXT_OPTION. | ||
439 | AC_DEFUN([AM_XGETTEXT_OPTION_INIT], | ||
440 | [ | ||
441 | XGETTEXT_EXTRA_OPTIONS= | ||
442 | ]) | ||
443 | |||
444 | dnl Registers an option to be passed to xgettext in the po subdirectory. | ||
445 | AC_DEFUN([AM_XGETTEXT_OPTION], | ||
446 | [ | ||
447 | AC_REQUIRE([AM_XGETTEXT_OPTION_INIT]) | ||
448 | XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1" | ||
449 | ]) | ||