diff options
| author | pthomas <pthomas@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-06-25 02:45:23 +0000 |
|---|---|---|
| committer | pthomas <pthomas@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-06-25 02:45:23 +0000 |
| commit | af315aaf8b6c877d427cc8846dad7c41c89473ec (patch) | |
| tree | 79d00c40bf9b3009a7bac21ddba9b73bfb6db227 /gcc/aclocal.m4 | |
| parent | 8ee6c2eeb7031a095791b39bb41a350c3c0f1fd9 (diff) | |
| download | gcc-af315aaf8b6c877d427cc8846dad7c41c89473ec.tar.gz | |
* aclocal.m4 (AM_WITH_NLS): Set create_catalogs=no if no catalog
compiler found.
AM_GNU_GETTEXT: Don't set CATALOGS if create_catalogs=no.
* configure: Rebuilt.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34692 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/aclocal.m4')
| -rw-r--r-- | gcc/aclocal.m4 | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4 index 23369432e7d..0a8747ee775 100644 --- a/gcc/aclocal.m4 +++ b/gcc/aclocal.m4 @@ -381,6 +381,10 @@ AC_DEFUN(AM_WITH_NLS, 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 + AC_MSG_WARN(No program for catalog building found, so disabling building them) + create_catalogs="no" + fi fi AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) @@ -408,8 +412,17 @@ 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 '`"], msgfmt) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) + AC_PATH_PROG(GMSGFMT, gmsgfmt, no) + + 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 + 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)'`"], :) AC_SUBST(MSGFMT) @@ -437,6 +450,8 @@ AC_DEFUN(AM_WITH_NLS, fi fi + + # We need to process the po/ directory. POSUB=po else @@ -507,7 +522,7 @@ strdup __argz_count __argz_stringify __argz_next]) AM_LC_MESSAGES AM_WITH_NLS - if test "x$CATOBJEXT" != "x"; then + if test "x$CATOBJEXT" != "x" && test "x$create_catalogs" != "xno" ; then if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else |