diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 484588abaa7..ab77dd46a4c 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,13 @@ +2004-11-04 Kelley Cook + + * Makefile.am: Define ACLOCAL_AMFLAGS. + * configure.ac: Remove redundant sinclude. + * acinclude.m4: Delete file. + * aclocal.m4: Regenerate. + * Makefile.in, include/Makefile.in: Regenerate. + * configure: Regenerate. + + 2004-10-19 Ulrich Weigand * include/private/gc_priv.h (GC_generic_malloc_words_small_inner): diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am index af00bd54ccd..c87d8c52cc0 100644 --- a/boehm-gc/Makefile.am +++ b/boehm-gc/Makefile.am @@ -5,6 +5,7 @@ ## Makefile.am. AUTOMAKE_OPTIONS = cygnus subdir-objects +ACLOCAL_AMFLAGS = -I .. -I ../config SUBDIRS = include diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in index 8db9a1c1f74..a81e3d0b466 100644 --- a/boehm-gc/Makefile.in +++ b/boehm-gc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.1 from Makefile.am. +# Makefile.in generated by automake 1.9.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -70,10 +70,9 @@ DIST_COMMON = $(srcdir)/../config.guess $(srcdir)/../config.sub \ $(srcdir)/../config.sub subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/../config/acx.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/no-executables.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -249,6 +248,7 @@ target_vendor = @target_vendor@ toolexecdir = @toolexecdir@ toolexeclibdir = @toolexeclibdir@ AUTOMAKE_OPTIONS = cygnus subdir-objects +ACLOCAL_AMFLAGS = -I .. -I ../config SUBDIRS = include noinst_LTLIBRARIES = libgcjgc.la libgcjgc_convenience.la @POWERPC_DARWIN_FALSE@asm_libgc_sources = diff --git a/boehm-gc/acinclude.m4 b/boehm-gc/acinclude.m4 deleted file mode 100644 index 216d85c6c71..00000000000 --- a/boehm-gc/acinclude.m4 +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 1999-2001, 2002 by Red Hat, Inc. All rights reserved. -# -# THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED -# OR IMPLIED. ANY USE IS AT YOUR OWN RISK. -# -# Permission is hereby granted to use or copy this program -# for any purpose, provided the above notices are retained on all copies. -# Permission to modify the code and to distribute modified code is granted, -# provided the above notices are retained, and a notice that the code was -# modified is included with the above copyright notice. -# -# Original author: Tom Tromey - -sinclude(../libtool.m4) -sinclude(../config/acx.m4) diff --git a/boehm-gc/aclocal.m4 b/boehm-gc/aclocal.m4 index f9e12c9f45f..e9363a3576f 100644 --- a/boehm-gc/aclocal.m4 +++ b/boehm-gc/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.9.1 -*- Autoconf -*- +# generated automatically by aclocal 1.9.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. @@ -40,7 +40,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.1])]) + [AM_AUTOMAKE_VERSION([1.9.3])]) # AM_AUX_DIR_EXPAND @@ -1167,4 +1167,6 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([acinclude.m4]) +m4_include([../config/acx.m4]) +m4_include([../config/no-executables.m4]) +m4_include([../libtool.m4]) diff --git a/boehm-gc/configure b/boehm-gc/configure index 68e7411250f..b3ef2e7ea6a 100755 --- a/boehm-gc/configure +++ b/boehm-gc/configure @@ -1890,28 +1890,6 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' # The autoconf 2.5x version of the no-executables hack. -# GCC_NO_EXECUTABLES -# ----------------- -# FIXME: The GCC team has specific needs which the current Autoconf -# framework cannot solve elegantly. This macro implements a dirty -# hack until Autoconf is able to provide the services its users -# need. -# -# Several of the support libraries that are often built with GCC can't -# assume the tool-chain is already capable of linking a program: the -# compiler often expects to be able to link with some of such -# libraries. -# -# In several of these libraries, workarounds have been introduced to -# avoid the AC_PROG_CC_WORKS test, that would just abort their -# configuration. The introduction of AC_EXEEXT, enabled either by -# libtool or by CVS autoconf, have just made matters worse. -# -# Unlike the previous AC_NO_EXECUTABLES, this test does not -# disable link tests at autoconf time, but at configure time. -# This allows AC_NO_EXECUTABLES to be invoked conditionally. -# GCC_NO_EXECUTABLES - # Yak. We must force CC and CXX to /not/ be precious variables; otherwise @@ -4741,7 +4719,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4744 "configure"' > conftest.$ac_ext + echo '#line 4722 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? diff --git a/boehm-gc/configure.ac b/boehm-gc/configure.ac index 69ee3d8d5a8..59a36122202 100644 --- a/boehm-gc/configure.ac +++ b/boehm-gc/configure.ac @@ -39,7 +39,6 @@ AC_SUBST(mkinstalldirs) AM_INIT_AUTOMAKE(gc, 6.3, no-define) # The autoconf 2.5x version of the no-executables hack. -sinclude(../config/no-executables.m4) GCC_NO_EXECUTABLES # Yak. We must force CC and CXX to /not/ be precious variables; otherwise diff --git a/boehm-gc/include/Makefile.in b/boehm-gc/include/Makefile.in index 719aee119fb..66aacac205a 100644 --- a/boehm-gc/include/Makefile.in +++ b/boehm-gc/include/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.1 from Makefile.am. +# Makefile.in generated by automake 1.9.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -41,10 +41,9 @@ subdir = include DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/gc_config.h.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/../config/acx.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/no-executables.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) CONFIG_HEADER = gc_config.h