diff options
| author | Bruno Haible <bruno@clisp.org> | 2001-04-11 19:52:36 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2001-04-11 19:52:36 +0000 |
| commit | 61b6c6e7d0388c61146257b9e9e8305741ec8424 (patch) | |
| tree | 0fdd3b4ab31a06ff7fea1b90a2628e1d6e903408 | |
| parent | 5ad0ed9b258934070517e1dbe428794eecc7d648 (diff) | |
| download | external_gettext-61b6c6e7d0388c61146257b9e9e8305741ec8424.zip external_gettext-61b6c6e7d0388c61146257b9e9e8305741ec8424.tar.gz external_gettext-61b6c6e7d0388c61146257b9e9e8305741ec8424.tar.bz2 | |
Even if 'msgfmt' is not found in $PATH, use gettext in libc.
| -rw-r--r-- | m4/ChangeLog | 5 | ||||
| -rw-r--r-- | m4/gettext.m4 | 30 |
2 files changed, 20 insertions, 15 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index ef98e45..b509d67 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2001-04-11 Bruno Haible <haible@clisp.cons.org> + + * gettext.m4 (AM_WITH_NLS): Even if 'msgfmt' is not found in $PATH, + set CATOBJEXT=.gmo and use the gettext in libc or libintl. + 2001-04-04 Bruno Haible <haible@clisp.cons.org> * mbswidth.m4: New file, from textutils-2.0.13 with modifications. diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 598aee3..c3bc720 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -96,21 +96,21 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" if test "$gt_cv_func_gnugettext_libc" = "yes" \ || test "$gt_cv_func_gnugettext_libintl" = "yes"; then - AC_DEFINE(HAVE_GETTEXT, 1, - [Define if the GNU gettext() function is already present or preinstalled.]) - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - AC_CHECK_FUNCS(dcgettext) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - CATOBJEXT=.gmo - fi - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then - INTLLIBS="-lintl" - fi - fi + AC_DEFINE(HAVE_GETTEXT, 1, + [Define if the GNU gettext() function is already present or preinstalled.]) + AC_CHECK_FUNCS(dcgettext) + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + fi + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + CATOBJEXT=.gmo + if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + INTLLIBS="-lintl" + fi + fi ]) if test "$CATOBJEXT" = "NONE"; then |