This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Next round aclocal.m4 patches commited
- To: gcc-patches at gcc dot gnu dot org
- Subject: Next round aclocal.m4 patches commited
- From: Philipp Thomas <pthomas at suse dot de>
- Date: Mon, 26 Jun 2000 07:26:20 +0200
- Cc: Mark Mitchell <mark at codesourcery dot com>,Martin von Loewis <loewis at informatik dot hu-berlin dot de>
Hopefully I've got it right this time :) To check for whether msgfmt and/or
gmsgfmt where found I set them to no, overlooking the fact that then MSGFMT
and GMSGFMT in po/Makefile get also set to this. This patch just checks if
both contain the program name without path.
Hopefully I'll someday really understand the autoconf macros Ulrich wrote
and then come up with a more readable solution.
Mark, Martin, so far I only disable building the catalogs by setting
CATALOGS to be empty. Should this possibly disable NLS completely (seems to
be much harder to achieve)?
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.
Index: aclocal.m4
===================================================================
RCS file: /cvs/gcc/egcs/gcc/aclocal.m4,v
retrieving revision 1.31
diff -u -p -r1.31 aclocal.m4
--- aclocal.m4 2000/06/25 02:45:23 1.31
+++ aclocal.m4 2000/06/26 04:33:12
@@ -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)'`"], :)
--
Philipp Thomas <pthomas@suse.de>
Development, SuSE GmbH, Schanzaecker Str. 10, D-90443 Nuremberg, Germany
#define NINODE 50 /* number of in core inodes */
#define NPROC 30 /* max number of processes */
-- Version 7 UNIX for PDP 11, /usr/include/sys/param.h