For PR bootstrap/3075:

	* configure, aclocal.m4, Makefile.in: Rebuilt.
	* configure.in: Don't call AC_CONFIG_AUX_DIR or
	AC_CANONICAL_SYSTEM.
	* acinclude.m4 (BOEHM_CONFIGURE): Call AC_CONFIG_AUX_DIR and
	AC_CANONICAL_SYSTEM here.
	* Makefile.am (CONFIG_STATUS_DEPENDENCIES): Use srcdir, not
	boehm_gc_basedir.

From-SVN: r43033

boehm-gc/ChangeLog

+2001-06-07  Tom Tromey  <tromey@redhat.com>
+
+	For PR bootstrap/3075:
+	* configure, aclocal.m4, Makefile.in: Rebuilt.
+	* configure.in: Don't call AC_CONFIG_AUX_DIR or
+	AC_CANONICAL_SYSTEM.
+	* acinclude.m4 (BOEHM_CONFIGURE): Call AC_CONFIG_AUX_DIR and
+	AC_CANONICAL_SYSTEM here.
+	* Makefile.am (CONFIG_STATUS_DEPENDENCIES): Use srcdir, not
+	boehm_gc_basedir.
+
 2001-05-24  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
 
 	* Makefile.am: Override gctest_OBJECTS so tests/test.c can be built.

boehm-gc/Makefile.am

@@ -117,7 +117,7 @@ AM_MAKEFLAGS = \
 	"RANLIB=$(RANLIB)" \
 	"DESTDIR=$(DESTDIR)"
 
-CONFIG_STATUS_DEPENDENCIES = $(boehm_gc_basedir)/configure.host
+CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
 
 # Multilib support.
 .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \

boehm-gc/Makefile.in

@@ -102,9 +102,12 @@ MULTIDIRS =
 MULTISUBDIR = 
 MULTIDO = true
 MULTICLEAN = true
-@USE_LIBDIR_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
-@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
-@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
+@USE_LIBDIR_TRUE@toolexeclibdir = \
+@USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
+@USE_LIBDIR_FALSE@toolexeclibdir = \
+@USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
+@USE_LIBDIR_FALSE@toolexecdir = \
+@USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
 
 toolexeclib_LTLIBRARIES = $(target_all)
 EXTRA_LTLIBRARIES = libgcjgc.la
@@ -132,7 +135,6 @@ AM_CXXFLAGS = @BOEHM_GC_CFLAGS@
 AM_CFLAGS = @BOEHM_GC_CFLAGS@
 
 check_PROGRAMS = gctest
-
 gctest_OBJECTS = test.o
 gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS)
 gctest_LDFLAGS = -shared-libgcc
@@ -189,7 +191,7 @@ AM_MAKEFLAGS = \
 	"DESTDIR=$(DESTDIR)"
 
 
-CONFIG_STATUS_DEPENDENCIES = $(boehm_gc_basedir)/configure.host
+CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
 
 MAKEOVERRIDES = 
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -219,7 +221,7 @@ configure configure.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 SOURCES = $(libgcjgc_la_SOURCES) $(EXTRA_libgcjgc_la_SOURCES)
 OBJECTS = $(libgcjgc_la_OBJECTS)
@@ -394,7 +396,7 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pr $$/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -511,7 +513,8 @@ install-am install uninstall-am uninstall all-redirect all-am all \
 installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
-
+# 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 $<
 $(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \

boehm-gc/acinclude.m4

@@ -28,8 +28,14 @@ else
   boehm_gc_basedir="[$]{srcdir}/$1"
 fi
 AC_SUBST(boehm_gc_basedir)
+AC_CONFIG_AUX_DIR($boehm_gc_basedir/..)
+if :; then :; else
+  # This overrides the previous occurrence for automake, but not for
+  # autoconf, which is exactly what we want.
+  AC_CONFIG_AUX_DIR(..)
+fi
 
-AC_CANONICAL_HOST
+AC_CANONICAL_SYSTEM
 
 AM_INIT_AUTOMAKE(boehm-gc, 5.1, no-define)
 

boehm-gc/aclocal.m4

@@ -40,10 +40,16 @@ else
   boehm_gc_basedir="[$]{srcdir}/$1"
 fi
 AC_SUBST(boehm_gc_basedir)
+AC_CONFIG_AUX_DIR($boehm_gc_basedir/..)
+if :; then :; else
+  # This overrides the previous occurrence for automake, but not for
+  # autoconf, which is exactly what we want.
+  AC_CONFIG_AUX_DIR(..)
+fi
 
-AC_CANONICAL_HOST
+AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(boehm-gc, 6.0a7, no-define)
+AM_INIT_AUTOMAKE(boehm-gc, 5.1, no-define)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We

boehm-gc/configure.in

@@ -2,11 +2,6 @@ dnl Process this file with autoconf to produce configure.
 
 AC_INIT(gcj_mlc.c)
 
-dnl Can't be done in BOEHM_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(..)
-
-AC_CANONICAL_SYSTEM
-
 BOEHM_CONFIGURE(.)
 
 AM_PROG_LIBTOOL