Even if 'msgfmt' is not found in $PATH, use gettext in libc.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index ef98e4540d1263ea403d390e9fa61bc90aafd9ac..b509d67604440c5211ce2b19e531db55ea1f7d7e 100644 (file)
--- 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 598aee30643ae157bdf332e803401bb1b996b281..c3bc720257f42bb90a6b388d5b9eff8dd9eb3a67 100644 (file)
--- 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