--- libobjc/configure.in	16 Dec 2002 18:22:53 -0000	1.19
+++ libobjc/configure.in	5 Jan 2003 00:45:29 -0000
@@ -22,6 +22,7 @@
 AC_PREREQ(2.13)
 AC_INIT(objc/objc.h)
 AC_CONFIG_HEADER(config.h)
+AC_NO_EXECUTABLES
 
 # This works around the fact that libtool configuration may change LD
 # for this particular configuration, but some shells, instead of
--- libobjc/Makefile.in 23 Sep 2002 03:52:53 -0000      1.22
+++ libobjc/Makefile.in 5 Jan 2003 00:39:03 -0000
@@ -35,7 +35,7 @@
 gcc_version = @gcc_version@
 gcc_version_trigger = @gcc_version_trigger@
 top_srcdir = @top_srcdir@
-toplevel_srcdir = @toplevel_srcdir@
+toplevel_srcdir = @top_srcdir@/@toprel@
 toolexecdir = @glibcpp_toolexecdir@
 glibcpp_toolexecdir = @glibcpp_toolexecdir@
 glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
--- libobjc/acinclude.m4	2002-12-26 13:16:12.000000000 -0500
+++ libobjc/acinclude.m4	2003-01-04 00:26:18.000000000 -0500
@@ -41,8 +41,8 @@
   toprel=".."
 fi
 AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
-toplevel_srcdir=\${top_srcdir}/$toprel
-AC_SUBST(toplevel_srcdir)
+toplevel_srcdir=\${srcdir}/$toprel
+AC_SUBST(toprel)
 ])
 
 dnl
@@ -80,9 +80,7 @@
   # Never versions of autoconf add an underscore to these functions.
   # Prevent future problems ...
   ifdef([AC_PROG_CC_G],[],[define([AC_PROG_CC_G],defn([_AC_PROG_CC_G]))])
-  ifdef([AC_PROG_CC_GNU],[],[define([AC_PROG_CC_GNU],defn([_AC_PROG_CC_GNU]))])
   ifdef([AC_PROG_CXX_G],[],[define([AC_PROG_CXX_G],defn([_AC_PROG_CXX_G]))])
-  ifdef([AC_PROG_CXX_GNU],[],[define([AC_PROG_CXX_GNU],defn([_AC_PROG_CXX_GNU]))])
 
 #  AC_PROG_CC
 
@@ -96,15 +94,15 @@
 [AC_BEFORE([$0], [AC_PROG_CPP])dnl
 dnl Fool anybody using AC_PROG_CC.
 AC_PROVIDE([AC_PROG_CC])
+AC_LANG_PUSH(C)
 AC_CHECK_PROG(CC, gcc, gcc)
 if test -z "$CC"; then
   AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
   test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
 fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
+_AC_COMPILER_OBJEXT
+_AC_LANG_COMPILER_GNU
+if test $ac_cv_c_compiler_gnu = yes; then
   GCC=yes
 dnl Check whether -g works, even if CFLAGS is set, in case the package
 dnl plays around with CFLAGS (such as to build both debugging and
@@ -112,7 +110,7 @@
   ac_test_CFLAGS="${CFLAGS+set}"
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
-  AC_PROG_CC_G
+  _AC_PROG_CC_G
   if test "$ac_test_CFLAGS" = set; then
     CFLAGS="$ac_save_CFLAGS"
   elif test $ac_cv_prog_cc_g = yes; then
@@ -124,6 +122,7 @@
   GCC=
   test "${CFLAGS+set}" = set || CFLAGS="-g"
 fi
+AC_LANG_POP(C)
 ])
 
 LIB_AC_PROG_CC
@@ -218,13 +217,3 @@
 AC_SUBST(glibcpp_toolexecdir)
 AC_SUBST(glibcpp_toolexeclibdir)
 ])
-
-sinclude(../libtool.m4)
-dnl The lines below arrange for aclocal not to bring an installed
-dnl libtool.m4 into aclocal.m4, while still arranging for automake to
-dnl add a definition of LIBTOOL to Makefile.in.
-ifelse(,,,[AC_SUBST(LIBTOOL)
-AC_DEFUN([AM_PROG_LIBTOOL])
-AC_DEFUN([AC_LIBTOOL_DLOPEN])
-AC_DEFUN([AC_PROG_LD])
-])
--- boehm-gc/Makefile.am	2002-12-05 10:08:50.000000000 -0500
+++ boehm-gc/Makefile.am	2002-12-28 21:38:52.000000000 -0500
@@ -56,14 +56,12 @@
 AM_CXXFLAGS = @GC_CFLAGS@
 AM_CFLAGS = @GC_CFLAGS@
 
+CCAS=missing
+CCASFLAGS=
+
 check_PROGRAMS = gctest
-# The following hack produces a warning from automake, but we need it in order 
-# to build a file from a subdirectory. FIXME.
-test.o:	tests/test.c
-	$(COMPILE) -c $(srcdir)/tests/test.c
-# 	Using $< in the above seems to fail with the HP/UX on Itanium make.
 
-gctest_OBJECTS = test.o
+gctest_SOURCES = tests/test.c
 gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS)
 gctest_LDFLAGS = -shared-libgcc
 TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc
@@ -87,8 +85,6 @@
 	$(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS) 
 LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LDFLAGS) -o $@
 
-AM_CFLAGS = @GC_CFLAGS@
-
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
 # values defined in terms of make variables, as is the case for CC and
 # friends when we are called from the top level Makefile.
--- boehm-gc/acinclude.m4	16 May 2002 17:41:54 -0000	1.18
+++ boehm-gc/acinclude.m4	4 Jan 2003 05:20:39 -0000
@@ -67,15 +67,15 @@
 [AC_BEFORE([$0], [AC_PROG_CPP])dnl
 dnl Fool anybody using AC_PROG_CC.
 AC_PROVIDE([AC_PROG_CC])
+AC_LANG_PUSH(C)
 AC_CHECK_PROG(CC, gcc, gcc)
 if test -z "$CC"; then
   AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
   test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
 fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
+_AC_COMPILER_OBJEXT
+_AC_LANG_COMPILER_GNU
+if test $ac_cv_c_compiler_gnu = yes; then
   GCC=yes
 dnl Check whether -g works, even if CFLAGS is set, in case the package
 dnl plays around with CFLAGS (such as to build both debugging and
@@ -83,7 +83,7 @@
   ac_test_CFLAGS="${CFLAGS+set}"
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
-  AC_PROG_CC_G
+  _AC_PROG_CC_G
   if test "$ac_test_CFLAGS" = set; then
     CFLAGS="$ac_save_CFLAGS"
   elif test $ac_cv_prog_cc_g = yes; then
@@ -95,6 +95,7 @@
   GCC=
   test "${CFLAGS+set}" = set || CFLAGS="-g"
 fi
+AC_LANG_POP(C)
 ])
 
 LIB_AC_PROG_CC
@@ -104,12 +105,11 @@
 [AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
 dnl Fool anybody using AC_PROG_CXX.
 AC_PROVIDE([AC_PROG_CXX])
+AC_LANG_PUSH(C++)
 AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
 test -z "$CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
-
-AC_PROG_CXX_GNU
-
-if test $ac_cv_prog_gxx = yes; then
+_AC_LANG_COMPILER_GNU
+if test $ac_cv_cxx_compiler_gnu = yes; then
   GXX=yes
 dnl Check whether -g works, even if CXXFLAGS is set, in case the package
 dnl plays around with CXXFLAGS (such as to build both debugging and
@@ -117,7 +117,7 @@
   ac_test_CXXFLAGS="${CXXFLAGS+set}"
   ac_save_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS=
-  AC_PROG_CXX_G
+  _AC_PROG_CXX_G
   if test "$ac_test_CXXFLAGS" = set; then
     CXXFLAGS="$ac_save_CXXFLAGS"
   elif test $ac_cv_prog_cxx_g = yes; then
@@ -129,6 +129,7 @@
   GXX=
   test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
 fi
+AC_LANG_POP(C++)
 ])
 
 LIB_AC_PROG_CXX
@@ -184,8 +185,3 @@
 
 ))))
 
-sinclude(../libtool.m4)
-dnl The line below arranges for aclocal not to bring a definition of
-dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
-dnl to add a definition of LIBTOOL to Makefile.in.
-ifelse(yes,no,[AC_DEFUN([AM_PROG_LIBTOOL],[AC_SUBST(LIBTOOL)])])
--- boehm-gc/configure.in	2002-12-28 19:00:52.000000000 -0500
+++ boehm-gc/configure.in	2002-12-28 21:05:57.000000000 -0500
@@ -26,8 +26,6 @@
 
 GC_CONFIGURE(.)
 
-AM_PROG_LIBTOOL
-
 dnl We use these options to decide which functions to include.
 AC_ARG_WITH(target-subdir,
 [  --with-target-subdir=SUBDIR
@@ -225,6 +223,8 @@
     ;;
 esac
 
+AM_PROG_LIBTOOL
+
 dnl We need to override the top-level CFLAGS.  This is how we do it.
 MY_CFLAGS="$CFLAGS"
 AC_SUBST(MY_CFLAGS)
--- fastjar/Makefile.am	2002-12-05 10:08:52.000000000 -0500
+++ fastjar/Makefile.am	2002-12-28 21:41:55.000000000 -0500
@@ -73,7 +73,7 @@
 ## Makefile.  So, we just duplicate the rules.  FIXME: remove this
 ## when we upgrade automake.  Note that we don't include $(srcdir) in
 ## my_makei_flags; makeinfo is run in srcdir.
-my_makei_flags += -I ../gcc/doc/include
+my_makei_flags = -I ../gcc/doc/include
 fastjar.info: fastjar.texi $(fastjar_TEXINFOS)
 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 	cd $(srcdir) \
--- libf2c/acinclude.m4	2002-12-26 13:16:01.000000000 -0500
+++ libf2c/acinclude.m4	2003-01-04 00:25:36.000000000 -0500
@@ -24,7 +24,7 @@
 
 # When building with srcdir == objdir, links to the source files will
 # be created in directories within the target_subdir.  We have to
-# adjust toplevel_srcdir accordingly, so that configure finds
+# adjust top accordingly, so that configure finds
 # install-sh and other auxiliary files that live in the top-level
 # source directory.
 if test "${srcdir}" = "."; then
@@ -41,8 +41,7 @@
   toprel=".."
 fi
 AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
-toplevel_srcdir=\${top_srcdir}/$toprel
-AC_SUBST(toplevel_srcdir)
+AC_SUBST(toprel)
 ])
 
 dnl
@@ -80,9 +79,7 @@
   # Never versions of autoconf add an underscore to these functions.
   # Prevent future problems ...
   ifdef([AC_PROG_CC_G],[],[define([AC_PROG_CC_G],defn([_AC_PROG_CC_G]))])
-  ifdef([AC_PROG_CC_GNU],[],[define([AC_PROG_CC_GNU],defn([_AC_PROG_CC_GNU]))])
   ifdef([AC_PROG_CXX_G],[],[define([AC_PROG_CXX_G],defn([_AC_PROG_CXX_G]))])
-  ifdef([AC_PROG_CXX_GNU],[],[define([AC_PROG_CXX_GNU],defn([_AC_PROG_CXX_GNU]))])
 
 #  AC_PROG_CC
 
@@ -96,15 +93,15 @@
 [AC_BEFORE([$0], [AC_PROG_CPP])dnl
 dnl Fool anybody using AC_PROG_CC.
 AC_PROVIDE([AC_PROG_CC])
+AC_LANG_PUSH(C)
 AC_CHECK_PROG(CC, gcc, gcc)
 if test -z "$CC"; then
   AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
   test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
 fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
+_AC_COMPILER_OBJEXT
+_AC_LANG_COMPILER_GNU
+if test $ac_cv_c_compiler_gnu = yes; then
   GCC=yes
 dnl Check whether -g works, even if CFLAGS is set, in case the package
 dnl plays around with CFLAGS (such as to build both debugging and
@@ -124,6 +121,7 @@
   GCC=
   test "${CFLAGS+set}" = set || CFLAGS="-g"
 fi
+AC_LANG_POP(C)
 ])
 
 LIB_AC_PROG_CC
@@ -185,12 +183,6 @@
 # Option set, now we can test it.
 AC_MSG_RESULT($version_specific_libs)
 
-gcc_version_trigger=${toplevel_srcdir}/gcc/version.c
-gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([[^ \"]]*\)[[ \"]].*/\1/'`
-gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
-AC_SUBST(gcc_version)
-AC_SUBST(gcc_version_trigger)
-
 if test $version_specific_libs = yes; then
   # Need the gcc compiler version to know where to install libraries
   # and header files if --enable-version-specific-runtime-libs option
@@ -218,13 +210,3 @@
 AC_SUBST(glibcpp_toolexecdir)
 AC_SUBST(glibcpp_toolexeclibdir)
 ])
-
-sinclude(../libtool.m4)
-dnl The lines below arrange for aclocal not to bring an installed
-dnl libtool.m4 into aclocal.m4, while still arranging for automake to
-dnl add a definition of LIBTOOL to Makefile.in.
-ifelse(,,,[AC_SUBST(LIBTOOL)
-AC_DEFUN([AM_PROG_LIBTOOL])
-AC_DEFUN([AC_LIBTOOL_DLOPEN])
-AC_DEFUN([AC_PROG_LD])
-])
--- libf2c/Makefile.in	2002-12-28 19:01:02.000000000 -0500
+++ libf2c/Makefile.in	2002-12-28 21:05:57.000000000 -0500
@@ -34,7 +34,7 @@
 gcc_version = @gcc_version@
 gcc_version_trigger = @gcc_version_trigger@
 top_srcdir = @top_srcdir@
-toplevel_srcdir = @toplevel_srcdir@
+toprel = @toprel@
 toolexecdir = @glibcpp_toolexecdir@
 glibcpp_toolexecdir = @glibcpp_toolexecdir@
 glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
@@ -214,7 +214,7 @@
 	cd libU77; $(MAKE) G77DIR=../../../gcc/ check
 
 install: all
-	$(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(glibcpp_toolexeclibdir)
+	$(SHELL) $(top_srcdir)/$(toprel)/mkinstalldirs $(DESTDIR)$(glibcpp_toolexeclibdir)
 	$(LIBTOOL) --mode=install $(INSTALL) $(LIBG2C) $(DESTDIR)$(glibcpp_toolexeclibdir)
 	$(INSTALL_DATA) libfrtbegin.a $(DESTDIR)$(glibcpp_toolexeclibdir)
 	$(RANLIB) $(DESTDIR)$(glibcpp_toolexeclibdir)/libfrtbegin.a
--- libf2c/libF77/configure.in	1 Jun 2002 01:53:50 -0000	1.7
+++ libf2c/libF77/configure.in	5 Jan 2003 00:45:28 -0000
@@ -21,6 +21,7 @@
 
 AC_PREREQ(2.12.1)
 AC_INIT(getarg_.c)
+AC_NO_EXECUTABLES
 
 dnl Checks for programs.
 
--- libf2c/libI77/configure.in	29 Nov 2002 17:53:44 -0000	1.16
+++ libf2c/libI77/configure.in	5 Jan 2003 00:45:28 -0000
@@ -22,6 +22,7 @@
 AC_PREREQ(2.12.1)
 AC_INIT(ftell_.c)
 AC_CONFIG_HEADER(config.h)
+AC_NO_EXECUTABLES
 
 dnl FIXME AC_PROG_CC wants CC to be able to link things, but it may
 dnl not be able to.
--- libf2c/libU77/configure.in	29 Nov 2002 17:53:45 -0000	1.15
+++ libf2c/libU77/configure.in	5 Jan 2003 00:45:28 -0000
@@ -22,6 +22,7 @@
 AC_PREREQ(2.12.1)
 AC_INIT(access_.c)
 AC_CONFIG_HEADER(config.h:config.hin)
+AC_NO_EXECUTABLES
 
 dnl FIXME AC_PROG_CC wants CC to be able to link things, but it may
 dnl not be able to.
--- libf2c/configure.in	16 Dec 2002 18:22:45 -0000	1.34
+++ libf2c/configure.in	5 Jan 2003 00:45:29 -0000
@@ -21,6 +21,17 @@
 
 AC_PREREQ(2.13)
 AC_INIT(libF77/Version.c)
+AC_NO_EXECUTABLES
+
+# avoid confusion in case the `makefile's from the f2c distribution have
+# got put here
+test -f libF77/makefile && mv libF77/makefile  libF77/makefile.ori
+test -f libI77/makefile && mv libI77/makefile  libI77/makefile.ori
+test -f libU77/makefile && mv libU77/makefile  libU77/makefile.ori
+
+AC_CONFIG_SUBDIRS(libU77 libI77 libF77)
+
+AC_PROG_CC
 
 # This works around the fact that libtool configuration may change LD
 # for this particular configuration, but some shells, instead of
@@ -80,13 +91,12 @@
 accommodate those types.])
 fi
 
-# avoid confusion in case the `makefile's from the f2c distribution have
-# got put here
-test -f libF77/makefile && mv libF77/makefile  libF77/makefile.ori
-test -f libI77/makefile && mv libI77/makefile  libI77/makefile.ori
-test -f libU77/makefile && mv libU77/makefile  libU77/makefile.ori
+gcc_version_trigger=${srcdir}/${toprel}/gcc/version.c
+gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([[^ \"]]*\)[[ \"]].*/\1/'`
+gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
+AC_SUBST(gcc_version)
+AC_SUBST(gcc_version_trigger)
 
-AC_CONFIG_SUBDIRS(libU77 libI77 libF77)
 # Do Makefile first since g2c.h depends on it and shouldn't get an
 # earlier timestamp.  Of course, it does when the multilib gunk below
 # edits Makefile, sigh; see additional touch below.
@@ -97,7 +107,7 @@
   if test -n "${with_target_subdir}"; then
     # FIXME: We shouldn't need to set ac_file
     ac_file=Makefile
-    . ${toplevel_srcdir}/config-ml.in
+    . ${srcdir}/${toprel}/config-ml.in
     touch g2c.h   # to keep it more recent than Makefile
   fi
 fi],
@@ -107,7 +117,8 @@
 with_target_subdir=${with_target_subdir}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="--enable-multilib ${ac_configure_args}"
-toplevel_srcdir=${toplevel_srcdir}
+toprel=${toprel}
+ac_top_srcdir=${ac_top_srcdir}
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 )
 
--- libffi/Makefile.am	1 Oct 2002 17:32:49 -0000	1.22.4.1
+++ libffi/Makefile.am	31 Dec 2002 04:06:22 -0000
@@ -90,95 +90,54 @@
 
 noinst_PROGRAMS = ffitest
 
-ffitest_OBJECTS = ffitest.lo
+ffitest_SOURCES = src/ffitest.c
 ffitest_LDADD = libffi.la
 ffitest_LDFLAGS = -shared-libgcc
 
+CCAS = missing
+CCASFLAGS =
+
 TARGET_SRC_MIPS_GCC = src/mips/ffi.c src/mips/o32.S src/mips/n32.S
+TARGET_OBJ_MIPS_GCC = ffi.lo o32.lo n32.lo
 TARGET_SRC_MIPS_LINUX = src/mips/ffi.c src/mips/o32.S
+TARGET_OBJ_MIPS_LINUX = ffi.lo o32.lo
 TARGET_SRC_MIPS_SGI = src/mips/ffi.c src/mips/o32.s src/mips/n32.s
+TARGET_OBJ_MIPS_SGI = ffi.lo o32.lo n32.lo
 TARGET_SRC_X86 = src/x86/ffi.c src/x86/sysv.S
+TARGET_OBJ_X86 = ffi.lo sysv.lo
 TARGET_SRC_X86_WIN32 = src/x86/ffi.c src/x86/win32.S
+TARGET_OBJ_X86_WIN32 = ffi.lo win32.lo
 TARGET_SRC_SPARC = src/sparc/ffi.c src/sparc/v8.S src/sparc/v9.S
+TARGET_OBJ_SPARC = ffi.lo v8.lo v9.lo
 TARGET_SRC_ALPHA = src/alpha/ffi.c src/alpha/osf.S
+TARGET_OBJ_ALPHA = ffi.lo osf.lo
 TARGET_SRC_IA64 = src/ia64/ffi.c src/ia64/unix.S
+TARGET_OBJ_IA64 = ffi.lo unix.lo
 TARGET_SRC_M68K = src/m68k/ffi.c src/m68k/sysv.S
+TARGET_OBJ_M68K = ffi.lo sysv.lo
 TARGET_SRC_POWERPC = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S
+TARGET_OBJ_POWERPC = ffi.lo sysv.lo ppc_closure.lo
 TARGET_SRC_POWERPC_AIX = src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closures.S
+TARGET_OBJ_POWERPC_AIX = ffi_darwin.lo aix.lo aix_closures.lo
 TARGET_SRC_POWERPC_DARWIN = src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S
+TARGET_OBJ_POWERPC_DARWIN = ffi_darwin.lo darwin.lo darwin_closure.lo
 TARGET_SRC_ARM =  src/arm/sysv.S src/arm/ffi.c
+TARGET_OBJ_ARM =  sysv.lo ffi.lo
 TARGET_SRC_S390 =  src/s390/sysv.S src/s390/ffi.c
+TARGET_OBJ_S390 =  sysv.lo ffi.lo
 TARGET_SRC_X86_64 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S
+TARGET_OBJ_X86_64 = ffi64.lo unix64.lo ffi.lo sysv.lo
 TARGET_SRC_SH =  src/sh/sysv.S src/sh/ffi.c
+TARGET_OBJ_SH =  sysv.lo ffi.lo
+
+libffi_la_common_SOURCES = src/debug.c src/prep_cif.c src/types.c src/raw_api.c src/java_raw_api.c
+libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_@TARGET@)
+libffi_la_LIBADD = $(TARGET_OBJ_@TARGET@)
+libffi_la_DEPENDENCIES = $(TARGET_OBJ_@TARGET@)
 
-##libffi_la_SOURCES = src/debug.c src/prep_cif.c src/types.c $(TARGET_SRC_@TARGET@)
-## Work around automake deficiency
-libffi_la_common_SOURCES = src/debug.c src/prep_cif.c src/types.c \
-		src/raw_api.c src/java_raw_api.c
-if MIPS_GCC
-libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_GCC)
-libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_GCC)
-endif
-if MIPS_LINUX
-libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_LINUX)
-libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_LINUX)
-endif
-if MIPS_SGI
-libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_SGI)
-libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_SGI)
-endif
-if X86
-libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_X86)
-libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_X86)
-endif
-if X86_WIN32
-libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_X86_WIN32)
-libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_X86_WIN32)
-endif
-if SPARC
-libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_SPARC)
-libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_SPARC)
-endif
-if ALPHA
-libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_ALPHA)
-libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_ALPHA)
-endif
-if IA64
-libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_IA64)
-libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_IA64)
-endif
-if M68K
-libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_M68K)
-libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_M68K)
-endif
-if POWERPC
-libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC)
-libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC)
-endif
-if POWERPC_AIX
-libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_AIX)
-libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_AIX)
-endif
-if POWERPC_DARWIN
-libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_DARWIN)
-libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_DARWIN)
-endif
-if ARM
-libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_ARM)
-libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_ARM)
-endif
-if S390
-libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_S390)
-libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_S390)
-endif
-if X86_64
-libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_X86_64)
-libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_X86_64)
-endif
-if SH
-libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_SH)
-libfficonvenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_SH)
-endif
+libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_@TARGET@)
+libffi_convenience_la_LIBADD = $(TARGET_OBJ_@TARGET@)
+libffi_convenience_la_DEPENDENCIES = $(TARGET_OBJ_@TARGET@)
 
 AM_CFLAGS = -fexceptions
 
 libffi_la_LDFLAGS = -release $(VERSION) 
 
-INCLUDES = -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
+INCLUDES = -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src -I.
 
 # Override these rules so that object files get put in the correct 
 # subdirectories. 
--- libffi/configure.in	12 Nov 2002 04:45:57 -0000	1.33
+++ libffi/configure.in	2 Jan 2003 07:22:04 -0000
@@ -1,6 +1,6 @@
 dnl Process this with autoconf to create configure
 AC_INIT(fficonfig.h.in)
-AM_CONFIG_HEADER(fficonfig.h)
+AC_CONFIG_HEADER(fficonfig.h)
 
 # This works around the fact that libtool configuration may change LD
 # for this particular configuration, but some shells, instead of
@@ -30,7 +30,8 @@
   libffi_basedir="${srcdir}"
 fi
 AC_SUBST(libffi_basedir)
-AC_CONFIG_AUX_DIR(${libffi_basedir}/..)
+AC_CONFIG_AUX_DIR(..)
+ac_aux_dir="$libffi_basedir/.."
 
 AC_CANONICAL_HOST
 
@@ -172,7 +173,19 @@
   multilib_arg=
 fi
 
-AC_OUTPUT(include/Makefile include/ffi.h Makefile,
+AC_CONFIG_FILES(Makefile include/Makefile include/ffi.h)
+
+AC_CONFIG_COMMANDS([include/fficonfig.h],
+test ! -d include && mkdir include
+if test -f include/fficonfig.h && cmp -s fficonfig.h include/fficonfig.h 2>/dev/null; then 
+	echo config.status: include/fficonfig.h unchanged
+else
+	echo config.status copying fficonfig.h to include/fficonfig.h
+	cp fficonfig.h include/fficonfig.h
+fi
+)
+
+AC_CONFIG_COMMANDS([default],
 [
 if test -n "$CONFIG_FILES"; then
    LD="${ORIGINAL_LD_FOR_MULTILIBS}"
@@ -188,15 +201,8 @@
 libffi_basedir=${libffi_basedir}
 CC="${CC}"
 DEFS="$DEFS"
-test ! -d include && mkdir include
-test ! -f include/fficonfig.h && cp fficonfig.h include/fficonfig.h
-if cmp -s fficonfig.h include/fficonfig.h 2>/dev/null; then 
-	echo fficonfig.h unchanged
-else
-	echo Moving fficonfig.h to include/fficonfig.h
-	cp fficonfig.h include/fficonfig.h
-fi
 )
+AC_OUTPUT
 
 # Make target subdirectories if required.
 test -d src || mkdir src
--- libffi/acinclude.m4	23 Nov 2002 08:11:38 -0000	1.1.36.1
+++ libffi/acinclude.m4	30 Dec 2002 06:23:55 -0000
@@ -1,11 +1 @@
-sinclude(../libtool.m4)
-dnl The lines below arrange for aclocal not to bring libtool.m4
-dnl AC_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
-dnl to add a definition of LIBTOOL to Makefile.in.
-ifelse(yes,no,[
-AC_DEFUN([AC_PROG_LIBTOOL],)
-AC_DEFUN([AM_PROG_LIBTOOL],)
-AC_SUBST(LIBTOOL)
-])
-
 sinclude(../config/accross.m4)
--- libjava/acinclude.m4	16 Dec 2002 18:22:50 -0000	1.22
+++ libjava/acinclude.m4	4 Jan 2003 05:20:40 -0000
@@ -47,7 +47,7 @@
 mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"
 AC_SUBST(mkinstalldirs)
 
-AC_CANONICAL_SYSTEM
+# AC_CANONICAL_SYSTEM
 
 dnl This shouldn't be needed, as long as top-level dependencies are
 dnl defined correctly and shared-library paths are set up so that
@@ -65,6 +65,7 @@
 [AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
 dnl Fool anybody using AC_PROG_CXX.
 AC_PROVIDE([AC_PROG_CXX])
+AC_LANG_PUSH(C++)
 # Use glibjava_CXX so that we do not cause CXX to be cached with the
 # flags that come in CXX while configuring libjava.  They're different
 # from those used for all other target libraries.  If CXX is set in
@@ -74,10 +75,8 @@
 AC_SUBST(CXX)
 CXX=$glibjava_CXX
 test -z "$glibjava_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
-
-AC_PROG_CXX_GNU
-
-if test $ac_cv_prog_gxx = yes; then
+_AC_LANG_COMPILER_GNU
+if test $ac_cv_cxx_compiler_gnu = yes; then
   GXX=yes
 dnl Check whether -g works, even if CXXFLAGS is set, in case the package
 dnl plays around with CXXFLAGS (such as to build both debugging and
@@ -85,7 +84,7 @@
   ac_test_CXXFLAGS="${CXXFLAGS+set}"
   ac_save_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS=
-  AC_PROG_CXX_G
+  _AC_PROG_CXX_G
   if test "$ac_test_CXXFLAGS" = set; then
     CXXFLAGS="$ac_save_CXXFLAGS"
   elif test $ac_cv_prog_cxx_g = yes; then
@@ -97,6 +96,7 @@
   GXX=
   test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
 fi
+AC_LANG_POP(C++)
 ])
 
 LIB_AC_PROG_CXX
@@ -140,19 +140,6 @@
 AC_SUBST(LIBGCJ_CXXFLAGS)
 AC_SUBST(LIBGCJ_JAVAFLAGS)
 ])dnl
-
-sinclude(../libtool.m4)
-dnl The lines below arrange for aclocal not to bring libtool.m4
-dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
-dnl to add a definition of LIBTOOL to Makefile.in.
-ifelse(yes,no,[
-AC_DEFUN([AM_PROG_LIBTOOL],)
-AC_DEFUN([AC_LIBTOOL_DLOPEN],)
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],)
-AC_DEFUN([LT_AC_PROG_GCJ],)
-AC_SUBST(GCJ)
-AC_SUBST(LIBTOOL)
-])
 
 #serial AM2
 
--- libjava/configure.in	2 Dec 2002 02:39:42 -0000	1.138.4.5
+++ libjava/configure.in	31 Dec 2002 03:39:40 -0000
@@ -7,6 +7,8 @@
 # exported.
 ORIGINAL_LD_FOR_MULTILIBS=$LD
 
+_AM_DEPENDENCIES(GCJ)
+
 AC_PROG_LN_S
 
 dnl We use these options to decide which functions to include.
@@ -29,6 +31,7 @@
    AC_LIBTOOL_DLOPEN
    DIRLTDL=libltdl
    AC_DEFINE(USE_LTDL)
+   AC_CONFIG_SUBDIRS(libltdl)
    # Sigh.  Libtool's macro doesn't do the right thing.
    INCLTDL="-I\$(top_srcdir)/libltdl $INCLTDL"
    # FIXME: this is a hack.
@@ -39,7 +42,6 @@
 AC_SUBST(LIBLTDL)
 AC_SUBST(DIRLTDL)
 AM_PROG_LIBTOOL
-AC_CONFIG_SUBDIRS($DIRLTDL)
 
 if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then
    COMPPATH=.
@@ -119,8 +121,7 @@
 AC_SUBST(INTERPRETER)
 
 AC_MSG_CHECKING([for exception model to use])
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
+AC_LANG_PUSH(C++)
 AC_ARG_ENABLE(sjlj-exceptions,
 [  --enable-sjlj-exceptions  force use of builtin_setjmp for exceptions],
 [:],
@@ -142,7 +143,9 @@
 }
 EOF
 old_CXXFLAGS="$CXXFLAGS"  
+old_CXX="$CXX"
 CXXFLAGS=-S
+CXX="$glibjava_CXX"
 if AC_TRY_EVAL(ac_compile); then
   if grep _Unwind_SjLj_Resume conftest.s >/dev/null 2>&1 ; then
     enable_sjlj_exceptions=yes
@@ -151,6 +154,7 @@
   fi
 fi
 CXXFLAGS="$old_CXXFLAGS"
+CXX="$old_CXX"
 rm -f conftest*])
 if test x$enable_sjlj_exceptions = xyes; then
   AC_DEFINE(SJLJ_EXCEPTIONS, 1,
@@ -161,7 +165,7 @@
 else
   AC_MSG_ERROR([unable to detect exception model])
 fi
-AC_LANG_RESTORE
+AC_LANG_POP(C++)
 AC_MSG_RESULT($ac_exception_model_name)
 
 # If we are non using SJLJ exceptions, and this host does not have support 
@@ -555,8 +559,7 @@
 	dnl On DU4.0, gethostbyname_r is only declared with -D_REENTRANT
 	AC_CACHE_CHECK([whether gethostbyname_r declaration requires -D_REENTRANT],
 	[libjava_cv_gethostbyname_r_needs_reentrant],
-	[ AC_LANG_SAVE
-	  AC_LANG_CPLUSPLUS
+	[ AC_LANG_PUSH(C++)
 	  AC_TRY_COMPILE([#include <netdb.h>],
 	    [gethostbyname_r("", 0, 0);],
 	    [libjava_cv_gethostbyname_r_needs_reentrant=no], [dnl
@@ -567,7 +570,7 @@
 		    [libjava_cv_gethostbyname_r_needs_reentrant=fail])
 		CPPFLAGS="$CPPFLAGS_SAVE"
 	  ])
-	  AC_LANG_RESTORE
+	  AC_LANG_POP(C++)
 	])
 	if test "x$libjava_cv_gethostbyname_r_needs_reentrant" = xyes; then
 	  AC_DEFINE(_REENTRANT, 1, [Required define if using POSIX threads])
@@ -761,6 +764,7 @@
   fi
 fi
 
+AM_PROG_GCJ
 LT_AC_PROG_GCJ
 
 CPPFLAGS=$GCJ_SAVE_CPPFLAGS
@@ -987,9 +991,6 @@
 
 here=`${PWDCMD-pwd}`
 AC_SUBST(here)
-
-# We get this from the environment.
-AC_SUBST(GCJFLAGS)
 
 AC_OUTPUT(Makefile libgcj.spec libgcj-test.spec gnu/classpath/Configuration.java gcj/Makefile include/Makefile testsuite/Makefile,
 [# Only add multilib support code if we just rebuilt top-level Makefile.
--- libjava/Makefile.am	14 Dec 2002 18:31:27 -0000	1.238.2.9
+++ libjava/Makefile.am	31 Dec 2002 03:39:46 -0000
@@ -88,10 +88,10 @@
 WARNINGS = -W -Wall
 ## We need _GNU_SOURCE defined for some Linux builds.  It doesn't hurt
 ## to always define it.
-AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions \
 ## Some systems don't allow `$' in identifiers by default, so we force it.
-	-fdollars-in-identifiers \
 ## Detect bugs in the verifier implementation, and maybe other places.
+AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions \
+	-fdollars-in-identifiers \
 	-Wswitch-enum \
 	@LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \
 	-DPREFIX="\"$(prefix)\""
@@ -107,6 +107,7 @@
 LIBFFIINCS = @LIBFFIINCS@
 
 INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
+	-I. \
 	$(GCINCS) $(THREADINCS) $(INCLTDL) \
 	$(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS)
 
@@ -141,9 +142,9 @@
 	$(THREADOBJS) $(PLATFORMOBJS)
 # Include THREADLIBS here to ensure that the correct version of
 # certain linuxthread functions get linked:
+## The mysterious backslash is consumed by make.
 libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \
 	$(LIBLTDL) $(SYS_ZLIBS) \
-## The mysterious backslash is consumed by make.
 	-version-info `grep -v '^\#' $(srcdir)/libtool-version`
 libgcj_la_LINK = $(LIBLINK)
 
@@ -208,9 +209,9 @@
 EXTRA_libgcjx_la_SOURCES = $(x_java_source_files)
 libgcjx_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(x_javao_files)
 libgcjx_la_LIBADD = $(x_javao_files)
+## The mysterious backslash is consumed by make.
 libgcjx_la_LDFLAGS = @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \
         -rpath $(toolexeclibdir) \
-## The mysterious backslash is consumed by make.
         -version-info `grep -v '^\#' $(srcdir)/libtool-version`
 libgcjx_la_LINK = $(LIBLINK)
 
@@ -245,8 +246,8 @@
 MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) $(x_javao_files) $(x_nat_files) $(x_nat_headers)
 CLEANFILES = libgcj-@gcc_version@.jar
 
-clean-local:
 ## We just remove every .class file that was created.
+clean-local:
 	find . -name '*.class' -print | xargs rm -f
 
 # Just remove the objects from C++ sources, for testing the C++ compiler.
@@ -481,7 +482,7 @@
 CONVERT_DIR = gnu/gcj/convert
 
 jv_convert_SOURCES =
-EXTRA_jv_convert_SOURCES = $(convert_source_files)
+# EXTRA_jv_convert_SOURCES = $(convert_source_files)
 ## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'.  We
 ## need this because we are explicitly using libtool to link using the
 ## `.la' file.
@@ -515,7 +516,7 @@
 
 rmic_SOURCES =
 ## This is a dummy definition.
-EXTRA_rmic_SOURCES = $(rmi_java_source_files)
+# EXTRA_rmic_SOURCES = $(rmi_java_source_files)
 rmic_LDFLAGS = --main=gnu.java.rmi.rmic.RMIC \
 	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
 rmic_LINK = $(GCJLINK)
@@ -527,7 +528,7 @@
 
 rmiregistry_SOURCES =
 ## This is a dummy definition.
-EXTRA_rmiregistry_SOURCES = $(rmi_java_source_files)
+# EXTRA_rmiregistry_SOURCES = $(rmi_java_source_files)
 rmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \
 	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
 rmiregistry_LINK = $(GCJLINK)
@@ -2325,7 +2326,7 @@
 gnu/gcj/runtime/natNameFinder.cc \
 gnu/gcj/runtime/natSharedLibLoader.cc \
 gnu/gcj/runtime/natStackTrace.cc \
-gnu/gcj/runtime/natStringBuffer.cc \
+gnu/gcj/runtime/natStringBufferg.cc \
 gnu/gcj/runtime/natVMClassLoader.cc \
 java/io/natFile.cc \
 java/io/natFileDescriptor.cc \
--- libstdc++-v3/acinclude.m4	30 Dec 2002 14:54:45 -0000	1.225
+++ libstdc++-v3/acinclude.m4	3 Jan 2003 08:10:39 -0000
@@ -31,9 +31,10 @@
   else
     toprel=".."
   fi
-  AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
-  toplevel_srcdir=\${top_srcdir}/$toprel
+  toplevel_srcdir="\${top_srcdir}/$toprel"
   AC_SUBST(toplevel_srcdir)
+  AC_CONFIG_AUX_DIR(..)
+  ac_aux_dir="${srcdir}/$toprel"
 ])
 
 dnl
@@ -53,9 +54,6 @@
   AC_SUBST(glibcpp_builddir)
   AC_SUBST(glibcpp_srcdir)
 
-  dnl This is here just to satisfy automake.
-  ifelse(not,equal,[AC_CONFIG_AUX_DIR(..)])
-
   AC_PROG_AWK
   # Will set LN_S to either 'ln -s' or 'ln'.  With autoconf 2.5x, can also
   # be 'cp -p' if linking isn't available.  Uncomment the next line to
@@ -76,9 +74,7 @@
   # Never versions of autoconf add an underscore to these functions.
   # Prevent future problems ...
   ifdef([AC_PROG_CC_G],[],[define([AC_PROG_CC_G],defn([_AC_PROG_CC_G]))])
-  ifdef([AC_PROG_CC_GNU],[],[define([AC_PROG_CC_GNU],defn([_AC_PROG_CC_GNU]))])
   ifdef([AC_PROG_CXX_G],[],[define([AC_PROG_CXX_G],defn([_AC_PROG_CXX_G]))])
-  ifdef([AC_PROG_CXX_GNU],[],[define([AC_PROG_CXX_GNU],defn([_AC_PROG_CXX_GNU]))])
 
   # AC_PROG_CC
   # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
@@ -90,15 +86,15 @@
   [AC_BEFORE([$0], [AC_PROG_CPP])dnl
   dnl Fool anybody using AC_PROG_CC.
   AC_PROVIDE([AC_PROG_CC])
+  AC_LANG_PUSH(C)
   AC_CHECK_PROG(CC, gcc, gcc)
   if test -z "$CC"; then
     AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
     test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
   fi
-
-  AC_PROG_CC_GNU
-
-  if test $ac_cv_prog_gcc = yes; then
+  _AC_COMPILER_OBJEXT
+  _AC_LANG_COMPILER_GNU
+  if test $ac_cv_c_compiler_gnu = yes; then
     GCC=yes
   dnl Check whether -g works, even if CFLAGS is set, in case the package
   dnl plays around with CFLAGS (such as to build both debugging and
@@ -118,6 +114,7 @@
     GCC=
     test "${CFLAGS+set}" = set || CFLAGS="-g"
   fi
+  AC_LANG_POP(C)
   ])
 
   LIB_AC_PROG_CC
@@ -128,6 +125,7 @@
   [AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
   dnl Fool anybody using AC_PROG_CXX.
   AC_PROVIDE([AC_PROG_CXX])
+  AC_LANG_PUSH(C++)
   # Use glibcpp_CXX so that we do not cause CXX to be cached with the
   # flags that come in CXX while configuring libstdc++.  They're different
   # from those used for all other target libraries.  If CXX is set in
@@ -137,10 +135,9 @@
   AC_SUBST(glibcpp_CXX)
   CXX=$glibcpp_CXX
   test -z "$glibcpp_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
-
-  AC_PROG_CXX_GNU
-
-  if test $ac_cv_prog_gxx = yes; then
+  _AC_COMPILER_OBJEXT
+  _AC_LANG_COMPILER_GNU
+  if test $ac_cv_cxx_compiler_gnu = yes; then
     GXX=yes
     dnl Check whether -g works, even if CXXFLAGS is set, in case the package
     dnl plays around with CXXFLAGS (such as to build both debugging and
@@ -160,6 +157,7 @@
     GXX=
     test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
   fi
+  AC_LANG_POP(C++)
   ])
 
   LIB_AC_PROG_CXX
@@ -914,7 +912,6 @@
     need_libmath=yes
   fi
   AC_SUBST(LIBMATHOBJS)
-  AM_CONDITIONAL(GLIBCPP_BUILD_LIBMATH,  test "$need_libmath" = yes)
 ])
 
 
@@ -1077,7 +1074,6 @@
 enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl
 AC_MSG_CHECKING([for additional debug build])
 AC_MSG_RESULT($enable_debug)
-AM_CONDITIONAL(GLIBCPP_BUILD_DEBUG, test "$enable_debug" = yes)
 ])
 
 
@@ -1456,10 +1452,6 @@
   AC_SUBST(CCODECVT_C)
   # 2000-08-04 bkoz hack
 
-  AM_CONDITIONAL(GLIBCPP_BUILD_LIBIO,
-                 test "$need_libio" = yes || test "$need_wlibio" = yes)
-  AM_CONDITIONAL(GLIBCPP_NEED_LIBIO, test "$need_libio" = yes)
-  AM_CONDITIONAL(GLIBCPP_NEED_WLIBIO, test "$need_wlibio" = yes)
   if test "$need_libio" = yes || test "$need_wlibio" = yes; then
     libio_la=../libio/libio.la
   else
@@ -1807,9 +1799,6 @@
   esac
 
   AC_SUBST(C_INCLUDE_DIR)
-  AM_CONDITIONAL(GLIBCPP_C_HEADERS_C, test "$enable_cheaders" = c)
-  AM_CONDITIONAL(GLIBCPP_C_HEADERS_C_STD, test "$enable_cheaders" = c_std)
-  AM_CONDITIONAL(GLIBCPP_C_HEADERS_COMPATIBILITY, test "$c_compatibility" = yes)
 ])
 
 
@@ -2125,19 +2114,6 @@
   AC_SUBST(baseline_file)
 
   # Don't do ABI checking unless native.
-  AM_CONDITIONAL(GLIBCPP_BUILD_ABI_CHECK,
-                 test x"$build" = x"$host" && test -z "$with_cross_host")
-])
-
-
-sinclude(../libtool.m4)
-dnl The lines below arrange for aclocal not to bring an installed
-dnl libtool.m4 into aclocal.m4, while still arranging for automake to
-dnl add a definition of LIBTOOL to Makefile.in.
-ifelse(,,,[AC_SUBST(LIBTOOL)
-AC_DEFUN([AM_PROG_LIBTOOL])
-AC_DEFUN([AC_LIBTOOL_DLOPEN])
-AC_DEFUN([AC_PROG_LD])
 ])
 
 
@@ -2285,8 +2261,6 @@
 esac
 
 AC_SUBST(SYMVER_MAP)
-AM_CONDITIONAL(GLIBCPP_BUILD_VERSIONED_SHLIB, test $enable_symvers != no)
 AC_MSG_CHECKING([versioning on shared library symbols])
 AC_MSG_RESULT($enable_symvers)
 ])
-
--- libstdc++-v3/configure.in	30 Dec 2002 15:50:52 -0000	1.113
+++ libstdc++-v3/configure.in	3 Jan 2003 08:10:40 -0000
@@ -464,6 +464,19 @@
 fi
 AC_SUBST(LIBSUPCXX_PICFLAGS)
 
+AM_CONDITIONAL(GLIBCPP_BUILD_LIBMATH,  test "$need_libmath" = yes)
+AM_CONDITIONAL(GLIBCPP_BUILD_DEBUG, test "$enable_debug" = yes)
+AM_CONDITIONAL(GLIBCPP_BUILD_LIBIO,
+               test "$need_libio" = yes || test "$need_wlibio" = yes)
+AM_CONDITIONAL(GLIBCPP_NEED_LIBIO, test "$need_libio" = yes)
+AM_CONDITIONAL(GLIBCPP_NEED_WLIBIO, test "$need_wlibio" = yes)
+AM_CONDITIONAL(GLIBCPP_C_HEADERS_C, test "$enable_cheaders" = c)
+AM_CONDITIONAL(GLIBCPP_C_HEADERS_C_STD, test "$enable_cheaders" = c_std)
+AM_CONDITIONAL(GLIBCPP_C_HEADERS_COMPATIBILITY, test "$c_compatibility" = yes)
+AM_CONDITIONAL(GLIBCPP_BUILD_ABI_CHECK,
+               test x"$build" = x"$host" && test -z "$with_cross_host")
+AM_CONDITIONAL(GLIBCPP_BUILD_VERSIONED_SHLIB, test $enable_symvers != no)
+
 # Generate the various Makefiles, include files, and scripts.
 # NB: Multilibs need MULTISUBDIR defined correctly in src/Makefile.am
 # and libsupc++/Makefile.am so that multilib installs will end up
--- libstdc++-v3/libsupc++/Makefile.am 26 Dec 2002 06:10:35 -0000      1.38
+++ libstdc++-v3/libsupc++/Makefile.am 2 Jan 2003 05:31:13 -0000
@@ -58,7 +58,7 @@
 # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
 GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@
 LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
-GCC_INCLUDES = -I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include
+GCC_INCLUDES = -I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include -I..
 
 INCLUDES = \
	$(GCC_INCLUDES) $(GLIBCPP_INCLUDES) $(LIBSUPCXX_INCLUDES)
--- zlib/Makefile.am	1 Oct 2002 17:33:18 -0000	1.9.8.1
+++ zlib/Makefile.am	29 Dec 2002 04:46:49 -0000
@@ -28,8 +28,8 @@
 noinst_LTLIBRARIES = libzgcj_convenience.la
 libzgcj_convenience_la_SOURCES = $(ZLIB_SOURCES)
 else
-toolexeclib_LIBRARIES = libz.a
-libz_a_SOURCES = $(ZLIB_SOURCES)
+toolexeclib_LTLIBRARIES = libz.la
+libz_la_SOURCES = $(ZLIB_SOURCES)
 endif
 
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
--- gcc/aclocal.m4	2002-12-19 00:06:21.000000000 -0500
+++ gcc/aclocal.m4	2002-12-28 21:48:01.000000000 -0500
@@ -1543,6 +1543,8 @@
     AC_SUBST(GENCAT)
   ])
 
+AC_DEFUN([AM_GNU_GETTEXT_VERSION],[])
+
 dnl Usage: Just like AM_WITH_NLS, which see.
 AC_DEFUN([AM_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
--- gcc/configure.in	2002-12-18 21:41:12.000000000 -0500
+++ gcc/configure.in	2002-12-28 21:48:12.000000000 -0500
@@ -1058,6 +1058,7 @@
 fi
 
 AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION
 
 # Windows32 Registry support for specifying GCC installation paths.
 AC_ARG_ENABLE(win32-registry,
--- fastjar/configure.in        23 Nov 2002 08:11:28 -0000      1.8.8.4
+++ fastjar/configure.in        30 Dec 2002 00:07:26 -0000
@@ -58,8 +58,8 @@
 
 if test "$use_zlib" = no; then
    # Brain dead way to find tree's zlib.
-   ZDEPS='$(top_builddir)/../zlib/libz.a'
-   ZLIBS="$ZDEPS -L\$(here)/../zlib/$libsubdir"
+   ZDEPS='$(top_builddir)/../zlib/libz.la'
+   ZLIBS="-L\$(here)/../zlib/$libsubdir -lz"
    ZINCS='-I$(top_srcdir)/../zlib'
 fi
 AC_SUBST(ZLIBS)
--- zlib/acinclude.m4	11 Mar 2002 21:49:12 -0000	1.4
+++ zlib/acinclude.m4	4 Jan 2003 07:57:10 -0000
@@ -8,15 +8,14 @@
 [AC_BEFORE([$0], [AC_PROG_CPP])dnl
 dnl Fool anybody using AC_PROG_CC.
 AC_PROVIDE([AC_PROG_CC])
+AC_LANG_PUSH(C)
 AC_CHECK_PROG(CC, gcc, gcc)
 if test -z "$CC"; then
   AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
   test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
 fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
+_AC_LANG_COMPILER_GNU
+if test $ac_cv_c_compiler_gnu = yes; then
   GCC=yes
 dnl Check whether -g works, even if CFLAGS is set, in case the package
 dnl plays around with CFLAGS (such as to build both debugging and
@@ -24,7 +23,7 @@
   ac_test_CFLAGS="${CFLAGS+set}"
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
-  AC_PROG_CC_G
+  _AC_PROG_CC_G
   if test "$ac_test_CFLAGS" = set; then
     CFLAGS="$ac_save_CFLAGS"
   elif test $ac_cv_prog_cc_g = yes; then
@@ -36,13 +35,5 @@
   GCC=
   test "${CFLAGS+set}" = set || CFLAGS="-g"
 fi
-])
-
-sinclude(../libtool.m4)
-dnl The lines below arrange for aclocal not to bring libtool.m4
-dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
-dnl to add a definition of LIBTOOL to Makefile.in.
-ifelse(yes,no,[
-AC_DEFUN([AM_PROG_LIBTOOL],)
-AC_SUBST(LIBTOOL)
+AC_LANG_POP(C)
 ])
--- zlib/configure.in	16 May 2002 17:43:21 -0000	1.15
+++ zlib/configure.in	5 Jan 2003 00:45:29 -0000
@@ -1,6 +1,7 @@
 dnl Process this with autoconf to create configure
 
 AC_INIT(zlib.h)
+AC_NO_EXECUTABLES
 
 # This works around the fact that libtool configuration may change LD
 # for this particular configuration, but some shells, instead of
