NLS update

Philipp Thomas pthomas@suse.de
Mon Oct 9 01:28:00 GMT 2000


When I implemented the disabling of building message catalogs when no
suitable tools are found, I forgot to adapt the code in the path taken
when the included libintl isn't used. That's why building gcc failed on
hosts where the gettext tools weren't installed, when I switched the
default to not force the use of the included libintl.

Gerald, this should fix the failing on your bare bones SuSE system.
Could you please verify?

2000-10-08  Philipp Thomas  <pthomas@suse.de>
	* aclocal.m4 (AM_WITH_NLS): When not using included gettext,
	disable catalog building if no suitable program was found.
	Move warning message from here
	(AM_GNU_GETTEXT): To here.
	* configure: Rebuilt.

Index: aclocal.m4
===================================================================
RCS file: /cvs/gcc/egcs/gcc/aclocal.m4,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- aclocal.m4	2000/10/09 03:19:37	1.35
+++ aclocal.m4	2000/10/09 08:12:34	1.36
@@ -1,4 +1,4 @@
-dnl See whether we can include both string.h and strings.h.
+Fdnl See whether we can include both string.h and strings.h.
 AC_DEFUN(gcc_AC_HEADER_STRING,
 [AC_CACHE_CHECK([whether string.h and strings.h may both be included],
   gcc_cv_header_string,
@@ -404,6 +404,8 @@
 		  [CATOBJEXT=.mo
 		   DATADIRNAME=lib])
 		INSTOBJEXT=.mo
+	      else
+		create_catalogs="no"
 	      fi
 	    fi
 	])
@@ -428,7 +430,6 @@
 		   GCC_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
 		    [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
 		 fi
@@ -463,7 +464,6 @@
         dnl If we didn't find either msgfmt or gmsgfmt, don't try to
         dnl create a catalog.
 	if test "$MSGFMT" = "msgfmt" && test "$GMSGFMT" = "msgfmt"; then
-	  AC_MSG_WARN(Neither msgfmt nor gmsgfmt found. No catalogs will be built)
 	  create_catalogs="no"
 	fi
         GCC_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
@@ -564,6 +564,10 @@
 
    AM_LC_MESSAGES
    AM_WITH_NLS
+
+   if test "x$create_catalogs" == "xno"; then
+     AC_MSG_WARN([No program for building catalogs found -> building disabled])
+   fi
 
    if test "x$CATOBJEXT" != "x" && test "x$create_catalogs" != "xno" ; then
      if test "x$ALL_LINGUAS" = "x"; then

-- 
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


More information about the Gcc-patches mailing list