This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[committed] trivial boehm-gc configury cleanups
- From: neroden at fastmail dot fm (Nathanael Nerode)
- To: java-patches at gcc dot gnu dot org
- Date: Mon, 16 Aug 2004 14:57:22 -0400
- Subject: [committed] trivial boehm-gc configury cleanups
Built/checked i686-linux, committed.
2004-08-16 Nathanael Nerode <neroden@gcc.gnu.org>
* aclocal.m4: Remove obsolete construct for old automake.
* acinclude.m4: Regenerate with aclocal 1.9.1.
* configure.ac: Remove duplicate AC_WITH calls. Replace
AC_CANONICAL_SYSTEM with AC_CANONICAL_HOST, AC_CANONICAL_TARGET.
Replace _GCC_TOPLEV_NONCANONICAL calls with ACX_NONCANONICAL_TARGET.
Remove now-redundant subst of target_noncanonical. Remove
now-gratuitous m4 quoting around $. Replace AM_PROG_LIBTOOL with
AC_PROG_LIBTOOL and remove second, redundant AC_PROG_LIBTOOL.
Use slightly more modern form of AC_INIT.
* configure: Rebuild with autoconf 2.59.
* Makefile.in, include/Makefile.in: Rebuild with automake 1.9.1.
Index: configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/configure.ac,v
retrieving revision 1.2
diff -u -r1.2 configure.ac
--- configure.ac 13 Aug 2004 23:05:29 -0000 1.2
+++ configure.ac 16 Aug 2004 18:08:40 -0000
@@ -16,8 +16,8 @@
dnl Process this file with autoconf to produce configure.
AC_PREREQ(2.59)
-AC_INIT(gcj_mlc.c)
-
+AC_INIT
+AC_CONFIG_SRCDIR(gcj_mlc.c)
# This works around the fact that libtool configuration may change LD
# for this particular configuration, but some shells, instead of
# keeping the changes in LD private, export them just because LD is
@@ -26,12 +26,11 @@
AM_ENABLE_MULTILIB(, ..)
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
# Get the 'noncanonical' system names.
-_GCC_TOPLEV_NONCANONICAL_BUILD
-_GCC_TOPLEV_NONCANONICAL_HOST
-_GCC_TOPLEV_NONCANONICAL_TARGET
+ACX_NONCANONICAL_TARGET
# This works around an automake problem.
mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"
@@ -72,26 +71,26 @@
AM_MAINTAINER_MODE
-. [$]{srcdir}/configure.host
+. ${srcdir}/configure.host
-case [$]{gc_basedir} in
-/* | [A-Za-z]:[/\\]*) gc_flagbasedir=[$]{gc_basedir} ;;
-*) gc_flagbasedir='[$](top_builddir)/'[$]{gc_basedir} ;;
+case ${gc_basedir} in
+/* | [A-Za-z]:[/\\]*) gc_flagbasedir=${gc_basedir} ;;
+*) gc_flagbasedir='$(top_builddir)/'${gc_basedir} ;;
esac
-gc_cflags="[$]{gc_cflags} -Iinclude -I"'[$](top_builddir)'"/./targ-include -I[$]{gc_flagbasedir}/libc/include"
+gc_cflags="${gc_cflags} -Iinclude -I"'$(top_builddir)'"/./targ-include -I${gc_flagbasedir}/libc/include"
case "${host}" in
*-*-cygwin32*)
- gc_cflags="[$]{gc_cflags} -I[$]{gc_flagbasedir}/../winsup/include"
+ gc_cflags="${gc_cflags} -I${gc_flagbasedir}/../winsup/include"
;;
esac
-dnl gc_cflags="[$]{gc_cflags} -fno-builtin"
+dnl gc_cflags="${gc_cflags} -fno-builtin"
GC_CFLAGS=${gc_cflags}
AC_SUBST(GC_CFLAGS)
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
dnl We use these options to decide which functions to include.
AC_ARG_WITH(target-subdir,
@@ -242,7 +241,6 @@
target_all=libgcjgc.la
AC_SUBST(target_all)
-AC_SUBST(target_noncanonical)
dnl If the target is an eCos system, use the appropriate eCos
dnl I/O routines.
@@ -357,8 +355,6 @@
AC_SUBST(addlibs)
AC_SUBST(addtests)
-AC_PROG_LIBTOOL
-
#
# Check for AViiON Machines running DGUX
#
@@ -381,13 +377,6 @@
AC_SUBST(CXXFLAGS)
fi
-dnl We use these options to decide which functions to include.
-AC_ARG_WITH(target-subdir,
-[ --with-target-subdir=SUBDIR
- configuring with a cross compiler])
-AC_ARG_WITH(cross-host,
-[ --with-cross-host=HOST configuring with a cross compiler])
-
dnl As of 4.13a2, the collector will not properly work on Solaris when
dnl built with gcc and -O. So we remove -O in the appropriate case.
dnl
Index: acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/acinclude.m4,v
retrieving revision 1.25
diff -u -r1.25 acinclude.m4
--- acinclude.m4 16 Jun 2004 07:34:40 -0000 1.25
+++ acinclude.m4 16 Aug 2004 18:08:40 -0000
@@ -13,7 +13,3 @@
sinclude(../libtool.m4)
sinclude(../config/acx.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)])])
--
This space intentionally left blank.