i18n: hopefully fix -liconv in dependencies

[Zack Weinberg]

This patch should fix the problem of -liconv appearing in the
dependencies lists on some systems.  Unfortunately I don't have access
to any affected system.

If you wish to test this patch, you'll need to regenerate gcc/configure
after applying it.

zw

	* aclocal.m4 (AM_WITH_NLS): Also create and substitute
	INTLDEPS variable, which does not include $LIBICONV.
	* Makefile.in: Use INTLDEPS in LIBDEPS.
	* configure: Regenerate.

===================================================================
Index: aclocal.m4
--- aclocal.m4	2001/10/19 15:17:31	1.53
+++ aclocal.m4	2001/10/20 17:33:00
@@ -1381,7 +1381,9 @@ AC_DEFUN([AM_WITH_NLS],
 
     BUILD_INCLUDED_LIBINTL=no
     USE_INCLUDED_LIBINTL=no
+dnl GCC LOCAL: Separate concept of link command line from dependencies.
     INTLLIBS=
+    INTLDEPS=
 
     dnl If we use NLS figure out what method
     if test "$USE_NLS" = "yes"; then
@@ -1487,6 +1489,7 @@ return (int) gettext ("")]ifelse([$2], n
 	USE_INCLUDED_LIBINTL=yes
         CATOBJEXT=.gmo
 	INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
+	INTLDEPS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a"
 	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
 
@@ -1605,6 +1608,7 @@ changequote([,])dnl
     AC_SUBST(CATOBJEXT)
     AC_SUBST(GMOFILES)
     AC_SUBST(INTLLIBS)
+    AC_SUBST(INTLDEPS)
     AC_SUBST(INTLOBJS)
     AC_SUBST(POFILES)
     AC_SUBST(POSUB)
===================================================================
Index: Makefile.in
--- Makefile.in	2001/10/20 11:24:36	1.756
+++ Makefile.in	2001/10/20 17:33:01
@@ -335,6 +335,7 @@ USE_NLS = @USE_NLS@
 
 # Internationalization library.
 INTLLIBS = @INTLLIBS@
+INTLDEPS = @INTLDEPS@
 
 # Character encoding conversion library.
 LIBICONV = @LIBICONV@
@@ -615,7 +616,7 @@ USE_HOST_STRSTR= ` case "${HOST_STRSTR}"
 # Dependency on obstack or whatever library facilities
 # are not installed in the system libraries.
 # We don't use USE_* because backquote expansion doesn't work in deps.
-LIBDEPS= $(INTLLIBS) $(OBSTACK) $(VFPRINTF) $(DOPRINT) $(STRSTR)
+LIBDEPS= $(INTLDEPS) $(OBSTACK) $(VFPRINTF) $(DOPRINT) $(STRSTR)
 
 # Likewise, for use in the tools that must run on this machine
 # even if we are cross-building GCC.