diff options
| author | Bruno Haible <bruno@clisp.org> | 2001-10-22 08:47:57 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2001-10-22 08:47:57 +0000 |
| commit | ebe49149280ce2c9f44c6cda0b3056c776809a09 (patch) | |
| tree | 769fc0e4a415aabbdb28802876e8a5228cfe5301 /m4 | |
| parent | baa9f2d89f8651e5a51ca045d15a9794ace9720f (diff) | |
| download | external_gettext-ebe49149280ce2c9f44c6cda0b3056c776809a09.zip external_gettext-ebe49149280ce2c9f44c6cda0b3056c776809a09.tar.gz external_gettext-ebe49149280ce2c9f44c6cda0b3056c776809a09.tar.bz2 | |
Use the msgmerge --update option.
Don't use or mention the .pox suffix any more.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ChangeLog | 5 | ||||
| -rw-r--r-- | m4/gettext.m4 | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index 24f9f12..5dcdead 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2001-09-18 Bruno Haible <haible@clisp.cons.org> + + * gettext.m4 (AM_WITH_NLS): Test for msgmerge which understands the + --update option. + 2001-10-20 Bruno Haible <haible@clisp.cons.org> Assume strchr() exists. diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 4362d8c..0513cdc 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -202,6 +202,10 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :) + dnl Search for GNU msgmerge 0.11 or newer in the PATH. + AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, + [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. dnl Test whether we really found GNU msgfmt. if test "$GMSGFMT" != ":"; then |