* acinclude.m4: Remove GC_CONFIGURE macro; move contents

	to configure.in.
	* aclocal.m4: Regenerate.
	* configure.in: Receive contents of GC_CONFIGURE macro.
	* configure: Regenerate.

(Makefile.in and include/Makefile.in just got timestamp updates)


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@78523 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 52 insertions, 105 deletions

diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 1f239d92b25..6324b0a29c5 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,5 +1,11 @@
 2004-02-26  Nathanael Nerode  <neroden@gcc.gnu.org>
 
+	* acinclude.m4: Remove GC_CONFIGURE macro; move contents
+	to configure.in.
+	* aclocal.m4: Regenerate.
+	* configure.in: Receive contents of GC_CONFIGURE macro.
+	* configure: Regenerate.
+
 	* configure.in: Remove more obsolete, bogus code.
 	* configure: Regenerate.
 
diff --git a/boehm-gc/acinclude.m4 b/boehm-gc/acinclude.m4
index 7ac39d2b292..9f3be46a1b3 100644
--- a/boehm-gc/acinclude.m4
+++ b/boehm-gc/acinclude.m4
@@ -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
diff --git a/boehm-gc/aclocal.m4 b/boehm-gc/aclocal.m4
index 98e62cd04a4..b3c3582e777 100644
--- a/boehm-gc/aclocal.m4
+++ b/boehm-gc/aclocal.m4
@@ -23,56 +23,6 @@ dnl PARTICULAR PURPOSE.
 #
 # 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
diff --git a/boehm-gc/configure b/boehm-gc/configure
index 928944aacc4..8033dd55f1f 100755
--- a/boehm-gc/configure
+++ b/boehm-gc/configure
@@ -1703,8 +1703,6 @@ echo "${ECHO_T}no" >&6
 fi
 
 
-
-
 PACKAGE=gc
 
 VERSION=6.1a1
@@ -3411,7 +3409,6 @@ esac
 GC_CFLAGS=${gc_cflags}
 
 
-
 # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
@@ -4154,7 +4151,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 4157 "configure"' > conftest.$ac_ext
+  echo '#line 4154 "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.in b/boehm-gc/configure.in
index e58ca15424c..0ab5a84a379 100644
--- a/boehm-gc/configure.in
+++ b/boehm-gc/configure.in
@@ -69,7 +69,51 @@ _GCC_TOPLEV_NONCANONICAL_TARGET
 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