diff options
| author | pthomas <pthomas@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-06-26 04:47:41 +0000 |
|---|---|---|
| committer | pthomas <pthomas@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-06-26 04:47:41 +0000 |
| commit | e3c65ba3d19c6a3bde7b6405df15442bfc9ec7af (patch) | |
| tree | 71c2ad51d3c5ff70ff54a22b770ff2c57706a022 /gcc/aclocal.m4 | |
| parent | 27fd43ca3b43297ce0c2220c929fe0596dc322d3 (diff) | |
| download | gcc-e3c65ba3d19c6a3bde7b6405df15442bfc9ec7af.tar.gz | |
2000-06-26 Philipp Thomas <pthomas@suse.de>
* aclocal.m4 (AM_WITH_NLS): Don't set MSGFMT or GMSGFMT to no,
test for msgfmt without path instead.
* configure: Rebuilt.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34704 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/aclocal.m4')
| -rw-r--r-- | gcc/aclocal.m4 | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4 index 0a8747ee775..e17e27752fb 100644 --- a/gcc/aclocal.m4 +++ b/gcc/aclocal.m4 @@ -380,8 +380,8 @@ AC_DEFUN(AM_WITH_NLS, AC_PATH_PROG(GMSGFMT, gmsgfmt, no) if test "$GMSGFMT" = "no"; then AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) - if test "$GMSGFMT" = "no"; then + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) + if test "$GMSGFMT" = "msgfmt"; then AC_MSG_WARN(No program for catalog building found, so disabling building them) create_catalogs="no" fi @@ -412,16 +412,13 @@ AC_DEFUN(AM_WITH_NLS, dnl Mark actions used to generate GNU NLS library. INTLOBJS="\$(GETTOBJS)" AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) - AC_PATH_PROG(GMSGFMT, gmsgfmt, no) - + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) dnl If we didn't find either msgfmt or gmsgfmt, don't try to dnl create a catalog. - if test "$MSGFMT" = "no" && test "$GMSGFMT" = "no"; then + if test "$MSGFMT" = "msgfmt" && test "$GMSGFMT" = "msgfmt"; then AC_MSG_WARN(Neither msgfmt nor gmsgfmt found. No catalogs will be built) create_catalogs="no" - MSGFMT=msgfmt - GMSGFMT=msgfmt fi AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) |