This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[committed] boehm-gc: more configure cleanup
- From: neroden at twcny dot rr dot com (Nathanael Nerode)
- To: gcc-patches at gcc dot gnu dot org
- Date: Thu, 26 Feb 2004 16:38:45 -0500
- Subject: [committed] boehm-gc: more configure cleanup
Tested on i686-pc-linux-gnu, committed. No behavior change.
* acinclude.m4: Remove GC_CONFIGURE macro; move contents
to configure.in.
* aclocal.m4: Regenerate.
* configure.in: Receive contents of GC_CONFIGURE macro.
* configure: Regenerate.
Index: acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/acinclude.m4,v
retrieving revision 1.23
diff -u -r1.23 acinclude.m4
--- acinclude.m4 26 Feb 2004 18:32:47 -0000 1.23
+++ acinclude.m4 26 Feb 2004 21:35:30 -0000
@@ -11,56 +11,6 @@
#
# Original author: Tom Tromey
-AC_DEFUN(GC_CONFIGURE,
-[
-
-AM_INIT_AUTOMAKE(gc, 6.1a1, 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
-# the wrong, non-multilib-adjusted value will be used in multilibs.
-# As a side effect, we have to subst CFLAGS and CXXFLAGS ourselves.
-
-m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
-m4_define([_AC_ARG_VAR_PRECIOUS],[])
-AC_PROG_CC
-AC_PROG_CXX
-m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
-
-AC_SUBST(CFLAGS)
-AC_SUBST(CXXFLAGS)
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-AM_MAINTAINER_MODE
-
-. [$]{srcdir}/configure.host
-
-case [$]{gc_basedir} in
-/* | [A-Za-z]:[/\\]*) gc_flagbasedir=[$]{gc_basedir} ;;
-*) gc_flagbasedir='[$](top_builddir)/'[$]{gc_basedir} ;;
-esac
-
-gc_cflags="[$]{gc_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{gc_flagbasedir}/libc/include"
-case "${host}" in
- *-*-cygwin32*)
- gc_cflags="[$]{gc_cflags} -I[$]{gc_flagbasedir}/../winsup/include"
- ;;
-esac
-
-dnl gc_cflags="[$]{gc_cflags} -fno-builtin"
-
-GC_CFLAGS=${gc_cflags}
-AC_SUBST(GC_CFLAGS)
-])
-
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
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/configure.in,v
retrieving revision 1.58
diff -u -r1.58 configure.in
--- configure.in 26 Feb 2004 18:43:27 -0000 1.58
+++ configure.in 26 Feb 2004 21:35:35 -0000
@@ -69,7 +69,51 @@
mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"
AC_SUBST(mkinstalldirs)
-GC_CONFIGURE(.)
+AM_INIT_AUTOMAKE(gc, 6.1a1, 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
+# the wrong, non-multilib-adjusted value will be used in multilibs.
+# As a side effect, we have to subst CFLAGS and CXXFLAGS ourselves.
+
+m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
+m4_define([_AC_ARG_VAR_PRECIOUS],[])
+AC_PROG_CC
+AC_PROG_CXX
+m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
+
+AC_SUBST(CFLAGS)
+AC_SUBST(CXXFLAGS)
+
+AC_CHECK_TOOL(AS, as)
+AC_CHECK_TOOL(AR, ar)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+
+AC_PROG_INSTALL
+
+AM_MAINTAINER_MODE
+
+. [$]{srcdir}/configure.host
+
+case [$]{gc_basedir} in
+/* | [A-Za-z]:[/\\]*) gc_flagbasedir=[$]{gc_basedir} ;;
+*) gc_flagbasedir='[$](top_builddir)/'[$]{gc_basedir} ;;
+esac
+
+gc_cflags="[$]{gc_cflags} -I"'[$](top_builddir)'"/./targ-include -I[$]{gc_flagbasedir}/libc/include"
+case "${host}" in
+ *-*-cygwin32*)
+ gc_cflags="[$]{gc_cflags} -I[$]{gc_flagbasedir}/../winsup/include"
+ ;;
+esac
+
+dnl gc_cflags="[$]{gc_cflags} -fno-builtin"
+
+GC_CFLAGS=${gc_cflags}
+AC_SUBST(GC_CFLAGS)
AM_PROG_LIBTOOL
--
Nathanael Nerode <neroden at gcc.gnu.org>
US citizens: if you're considering voting for Bush, look at these first:
http://www.misleader.org/ http://www.cbc.ca/news/background/arar/
http://www.house.gov/reform/min/politicsandscience/