From e712997cac538997d285affd1d9dc67df88f0582 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 13 Sep 2001 13:14:30 +0000
Subject: 2001-07-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* configure.in: autoupdate to autoconf-2.52.
	* bootstrap: Add handling for configure.ac, make autoheader verbose,
	fix auto*tool invocation order.
	* aclocal/rtems-test-no-pause.m4: Introduce AC_HELP_STRING.
	* aclocal/enable-bare.m4: Introduce AC_HELP_STRING.
	* aclocal/enable-cxx.m4: Introduce AC_HELP_STRING.
	* aclocal/enable-gcc28: Introduce AC_HELP_STRING.
	* aclocal/enable-inlines.m4: Introduce AC_HELP_STRING.
	* aclocal/enable-itron.m4: Introduce AC_HELP_STRING.
	* aclocal/enable-libcdir.m4: Introduce AC_HELP_STRING.
	* aclocal/enable-multiprocessing.m4: Introduce AC_HELP_STRING.
	* aclocal/enable-networking.m4: Introduce AC_HELP_STRING.
	* aclocal/enable-posix.m4: Introduce AC_HELP_STRING.
	* aclocal/enable-rdbg.m4: Introduce AC_HELP_STRING.
	* aclocal/enable-rtemsbsp.m4: Introduce AC_HELP_STRING.
	* aclocal/enable-tests.m4: Introduce AC_HELP_STRING.
	* aclocal/env-rtemsbsp.m4: Add AC_ARC_VAR(RTEMS_BSP), apply true in
	RTEMS_CONFIG_PER_BSP conditional.
	* aclocal/multilib.m4: Introduce AC_HELP_STRING.
	* aclocal/rtems-debug.m4: Introduce AC_HELP_STRING.
	* aclocal/rtems-top.m4: Add AC_PREFIX_DEFAULT(/opt/rtems).
---
 bootstrap | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'bootstrap')

diff --git a/bootstrap b/bootstrap
index 0e02042d24..dd6d707c5e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -69,9 +69,10 @@ generate)
     ;;
   esac
 
-  confs=`find . -name 'configure.in' -print`
+  confs=`find . \( -name 'configure.in' -o -name 'configure.ac' \) -print`
   for i in $confs; do
   dir=`dirname $i`;
+  configure=`basename $i`;
   ( test "$quiet" = "true" || echo "$dir";
     cd $dir;
     pat="s,\$(RTEMS_TOPdir),${aclocal_dir},g"
@@ -79,9 +80,10 @@ generate)
       sed -e 's%.*ACLOCAL_AMFLAGS.*\=[ ]*%%g' -e $pat ` ;
     test "$verbose" = "-v" && echo "aclocal $aclocal_args"
     aclocal $aclocal_args;
-    autoconf;
-    test -n "`grep CONFIG_HEADER configure.in`" && autoheader ;
+    test -n "`grep CONFIG_HEADER ${configure}`" && autoheader \
+      && test "$verbose" = "-v" && echo "autoheader";
     test -f Makefile.am && automake $verbose ;
+    autoconf;
     test -f Makefile.am && test -n "`grep 'stamp-h\.in' Makefile.in`" \
       && echo timestamp > stamp-h.in
   )
-- 
cgit v1.2.3