configure.in (enable-nls): Enable if build == host, i.e.

gcc:
	* configure.in (enable-nls): Enable if build == host, i.e. when
	not building a canadian cross compiler.
	(enable-maintainer-mode): Added for use with i18n.
	* aclocal.m4 (AM_GNU_GETTEXT): Only build catalogs that are a
	cross section of ALL_LINGUAS and LINGUAS.
	* configure: Rebuild.

gcc/po:
	* Makefile.in.in: Create compiled catalogs in objdir, not
	srcdir. Create gcc.pot and cat-tbl-id.c only in maintainer
	mode.
	* gcc.pot: Generated and checked in.
	* cat-tbl-id.c: Generated and checked in.
	* stamp-cat-id: Generated and checked in.

From-SVN: r34303

gcc/ChangeLog

+2000-05-31  Philipp Thomas  <pthomas@suse.de>
+
+	* configure.in (enable-nls): Enable if build == host, i.e. when 
+	not building a canadian cross compiler.
+	(enable-maintainer-mode): Added for use with i18n.
+	* aclocal.m4 (AM_GNU_GETTEXT): Only build catalogs that are a
+	cross section of ALL_LINGUAS and LINGUAS.
+	* configure: Rebuild.
+
 2000-05-31  Bruce Korb  <bkorb@gnu.org>
 
 	* fixinc/check.tpl: rework to use test result tree

gcc/aclocal.m4

@@ -513,9 +513,9 @@ strdup __argz_count __argz_stringify __argz_next])
      else
        AC_MSG_CHECKING(for catalogs to be installed)
        NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
+       for lang in $ALL_LINGUAS; do
+         case " $LINGUAS " in
+           *" $lang "*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
          esac
        done
        LINGUAS=$NEW_LINGUAS

gcc/configure.in

@@ -4104,10 +4104,18 @@ AC_SUBST(VERSION)
 
 ALL_LINGUAS="en_UK"
 
-# NLS support is still experimental, so disable it by default for now.
+# Enable NLS support by default
 AC_ARG_ENABLE(nls,
-  [  --enable-nls            use Native Language Support (disabled by default)],
-  , enable_nls=no)
+  [  --enable-nls            use Native Language Support (default)],
+  , enable_nls=yes)
+
+# if cross compiling, disable NLS support.
+# It's not worth the trouble, at least for now.
+
+if test "${build}" != "${host}" && test "x$enable_nls" == "xyes" then
+  AC_MSG_WARN(Disabling NLS support for canadian cross compiler.)
+  enable_nls=no
+fi
 
 AM_GNU_GETTEXT
 XGETTEXT="AWK='$AWK' \$(SHELL) \$(top_srcdir)/exgettext $XGETTEXT"
@@ -4749,6 +4757,25 @@ fi
 AC_DEFINE_UNQUOTED(ENABLE_STD_NAMESPACE, $ac_esn,
   [Define to 1 if you want to enable namespaces (-fhonor-std) by default.])
 
+dnl Very limited version of automake's enable-maintainer-mode
+
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode is disabled by default
+  AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode enable make rules and dependencies not useful
+                          (and sometimes confusing) to the casual installer],
+      maintainer_mode=$enableval,
+      maintainer_mode=no)
+
+AC_MSG_RESULT($maintainer_mode)
+
+if test "$maintainer_mode" = "yes"; then
+  MAINT=''
+else
+  MAINT='#'
+fi
+AC_SUBST(MAINT)dnl
+
 # Make empty files to contain the specs and options for each language.
 # Then add #include lines to for a compiler that has specs and/or options.
 

gcc/po/ChangeLog

+2000-05-30  Philipp Thomas  <pthomas@suse.de>
+
+	* Makefile.in.in: Create compiled catalogs in objdir, not
+	srcdir. Create gcc.pot and cat-tbl-id.c only in maintainer
+	mode.
+	* gcc.pot: Generated and checked in.
+	* cat-tbl-id.c: Generated and checked in.
+	* stamp-cat-id: Generated and checked in.
+
 2000-04-28  Zack Weinberg  <zack@wolery.cumb.org>
 
 	* POTFILES.in: Remove pcp.h.

gcc/po/Makefile.in.in

@@ -69,7 +69,7 @@ INSTOBJEXT = @INSTOBJEXT@
 	$(MSGFMT) -o $@ $<
 
 .po.gmo:
-	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
+	file=`echo $* | sed 's,.*/,,'`.gmo \
 	  && rm -f $$file && $(GMSGFMT) -o $$file $<
 
 .po.cat:
@@ -79,7 +79,7 @@ INSTOBJEXT = @INSTOBJEXT@
 
 all: all-@USE_NLS@
 
-all-yes: $(srcdir)/cat-id-tbl.c $(CATALOGS)
+all-yes: $(CATALOGS) @MAINT@ $(srcdir)/cat-id-tbl.c 
 all-no:
 
 $(srcdir)/$(PACKAGE).pot: $(POTFILES)

gcc/po/stamp-cat-id

+timestamp