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).

20 files changed, 61 insertions, 30 deletions

diff --git a/ChangeLog b/ChangeLog
index 89d11c085d..a2bef0aca0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2001-09-13	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).
+
 2001-05-25	Joel Sherrill <joel@OARcorp.com>
 
  	* README.configure: Corrected the name of the MRM332 BSP.
diff --git a/aclocal/enable-bare.m4 b/aclocal/enable-bare.m4
index fbe2e8de6d..9f739ad8c1 100644
--- a/aclocal/enable-bare.m4
+++ b/aclocal/enable-bare.m4
@@ -1,8 +1,7 @@
 AC_DEFUN(RTEMS_ENABLE_BARE,
 [
 AC_ARG_ENABLE(bare-cpu-cflags,
-[  --enable-bare-cpu-cflags             specify a particular cpu cflag]
-[                                       (bare bsp specific)],
+AC_HELP_STRING([--enable-bare-cpu-cflags],[specify a particular cpu cflag (bare bsp specific)]),
 [case "${enableval}" in
   no) BARE_CPU_CFLAGS="" ;;
   *)    BARE_CPU_CFLAGS="${enableval}" ;;
@@ -10,8 +9,7 @@ esac],
 [BARE_CPU_CFLAGS=""])
 
 AC_ARG_ENABLE(bare-cpu-model,
-[  --enable-bare-cpu-model              specify a particular cpu model]
-[                                       (bare bsp specific)],
+AC_HELP_STRING([--enable-bare-cpu-model],[specify a particular cpu model (bare bsp specific)]),
 [case "${enableval}" in
   no)   BARE_CPU_MODEL="" ;;
   *)    BARE_CPU_MODEL="${enableval}" ;;
diff --git a/aclocal/enable-cxx.m4 b/aclocal/enable-cxx.m4
index 68cad702a1..84f5d3f745 100644
--- a/aclocal/enable-cxx.m4
+++ b/aclocal/enable-cxx.m4
@@ -3,8 +3,8 @@ dnl $Id$
 AC_DEFUN(RTEMS_ENABLE_CXX,
 [
 AC_ARG_ENABLE(cxx,
-[  --enable-cxx                         enable C++ support,]
-[                                       and build the rtems++ library],
+AC_HELP_STRING([--enable-cxx],[enable C++ support and build the rtems++
+library]),
 [case "${enableval}" in
   yes) RTEMS_HAS_CPLUSPLUS=yes ;;
   no) RTEMS_HAS_CPLUSPLUS=no   ;;
diff --git a/aclocal/enable-gcc28.m4 b/aclocal/enable-gcc28.m4
index 5f2496f53d..4b44359da5 100644
--- a/aclocal/enable-gcc28.m4
+++ b/aclocal/enable-gcc28.m4
@@ -3,7 +3,7 @@ dnl $Id$
 AC_DEFUN(RTEMS_ENABLE_GCC28,
 [
 AC_ARG_ENABLE(gcc28,
-[  --enable-gcc28                       enable use of gcc 2.8.x features],
+AC_HELP_STRING([--enable-gcc28],[enable use of gcc 2.8.x features]),
 [case "${enableval}" in
   yes) RTEMS_USE_GCC272=no ;;
   no) RTEMS_USE_GCC272=yes ;;
diff --git a/aclocal/enable-inlines.m4 b/aclocal/enable-inlines.m4
index 259697f825..972f78b733 100644
--- a/aclocal/enable-inlines.m4
+++ b/aclocal/enable-inlines.m4
@@ -2,8 +2,7 @@ dnl $Id$
 
 AC_DEFUN(RTEMS_ENABLE_INLINES,
 [AC_ARG_ENABLE(rtems-inlines,
-[  --enable-rtems-inlines               enable RTEMS inline functions]
-[                                       (default:enabled, disable to use macros)],
+AC_HELP_STRING([--enable-rtems-inlines],[enable RTEMS inline functions (default:enabled, disable to use macros)]),
 [case "${enableval}" in
   yes) RTEMS_USE_MACROS=no ;;
   no) RTEMS_USE_MACROS=yes ;;
diff --git a/aclocal/enable-itron.m4 b/aclocal/enable-itron.m4
index efe99115f4..e49fa68c9f 100644
--- a/aclocal/enable-itron.m4
+++ b/aclocal/enable-itron.m4
@@ -5,7 +5,7 @@ AC_DEFUN(RTEMS_ENABLE_ITRON,
 ## AC_BEFORE([$0], [RTEMS_CHECK_ITRON_API])dnl
 
 AC_ARG_ENABLE(itron,
-[  --enable-itron                       enable itron interface],
+AC_HELP_STRING([--enable-itron],[enable itron interface]),
 [case "${enableval}" in 
   yes) RTEMS_HAS_ITRON_API=yes ;;
   no) RTEMS_HAS_ITRON_API=no ;;
diff --git a/aclocal/enable-libcdir.m4 b/aclocal/enable-libcdir.m4
index 892070522b..e9b9e8d55b 100644
--- a/aclocal/enable-libcdir.m4
+++ b/aclocal/enable-libcdir.m4
@@ -3,8 +3,10 @@ dnl $Id$
 AC_DEFUN(RTEMS_ENABLE_LIBCDIR,
 [
 AC_ARG_ENABLE(libcdir,
-[  --enable-libcdir=directory           set the directory for the C library],
+AC_HELP_STRING([--enable-libcdir=directory],
+[set the directory for the C library]),
 [ RTEMS_LIBC_DIR="${enableval}" ; \
 test -d ${enableval} || AC_MSG_ERROR("$enableval is not a directory" ) ] )
 AC_SUBST(RTEMS_LIBC_DIR)dnl
 ])
+
diff --git a/aclocal/enable-multiprocessing.m4 b/aclocal/enable-multiprocessing.m4
index b04b7ee524..6e9a87e04a 100644
--- a/aclocal/enable-multiprocessing.m4
+++ b/aclocal/enable-multiprocessing.m4
@@ -3,7 +3,7 @@ dnl $Id$
 AC_DEFUN(RTEMS_ENABLE_MULTIPROCESSING,
 [
 AC_ARG_ENABLE(multiprocessing,
-[  --enable-multiprocessing             enable multiprocessing interface],
+AC_HELP_STRING([--enable-multiprocessing],[enable multiprocessing interface]),
 [case "${enableval}" in 
   yes) RTEMS_HAS_MULTIPROCESSING=yes ;;
   no) RTEMS_HAS_MULTIPROCESSING=no ;;
diff --git a/aclocal/enable-networking.m4 b/aclocal/enable-networking.m4
index 958f03030d..92ea0e0a7f 100644
--- a/aclocal/enable-networking.m4
+++ b/aclocal/enable-networking.m4
@@ -5,7 +5,7 @@ AC_DEFUN(RTEMS_ENABLE_NETWORKING,
 ## AC_BEFORE([$0], [RTEMS_CHECK_NETWORKING])dnl
 
 AC_ARG_ENABLE(networking,
-[  --enable-networking                  enable TCP/IP stack],
+AC_HELP_STRING([--enable-networking],[enable TCP/IP stack]),
 [case "${enableval}" in
   yes) RTEMS_HAS_NETWORKING=yes ;;
   no) RTEMS_HAS_NETWORKING=no ;;
diff --git a/aclocal/enable-posix.m4 b/aclocal/enable-posix.m4
index 1a8197e1cd..0e0ff92e6e 100644
--- a/aclocal/enable-posix.m4
+++ b/aclocal/enable-posix.m4
@@ -5,7 +5,7 @@ AC_DEFUN(RTEMS_ENABLE_POSIX,
 ## AC_BEFORE([$0], [RTEMS_CHECK_POSIX_API])dnl
 
 AC_ARG_ENABLE(posix,
-[  --enable-posix                       enable posix interface],
+AC_HELP_STRING([--enable-posix],[enable posix interface]),
 [case "${enableval}" in 
   yes) RTEMS_HAS_POSIX_API=yes ;;
   no) RTEMS_HAS_POSIX_API=no ;;
diff --git a/aclocal/enable-rdbg.m4 b/aclocal/enable-rdbg.m4
index a10294a06c..7b8de11b0b 100644
--- a/aclocal/enable-rdbg.m4
+++ b/aclocal/enable-rdbg.m4
@@ -5,7 +5,7 @@ AC_DEFUN(RTEMS_ENABLE_RDBG,
 AC_BEFORE([$0], [RTEMS_CHECK_RDBG])dnl
 
 AC_ARG_ENABLE(rdbg,
-[  --enable-rdbg                        enable remote debugger],
+AC_HELP_STRING([--enable-rdbg],[enable remote debugger]),
 [case "${enableval}" in
   yes) RTEMS_HAS_RDBG=yes ;;
   no) RTEMS_HAS_RDBG=no ;;
diff --git a/aclocal/enable-rtemsbsp.m4 b/aclocal/enable-rtemsbsp.m4
index 173c27cc62..a4c2114e59 100644
--- a/aclocal/enable-rtemsbsp.m4
+++ b/aclocal/enable-rtemsbsp.m4
@@ -7,7 +7,8 @@ AC_DEFUN(RTEMS_ENABLE_RTEMSBSP,
 [
 AC_BEFORE([$0], [RTEMS_ENV_RTEMSBSP])dnl
 AC_ARG_ENABLE(rtemsbsp,
-[  --enable-rtemsbsp=\"bsp1 bsp2 ..\"     BSPs to include in build],
+AC_HELP_STRING([--enable-rtemsbsp="bsp1 bsp2 .."],
+[BSPs to include in build]),
 [case "${enableval}" in
   yes|no) AC_MSG_ERROR([missing argument to --enable-rtemsbsp=\"bsp1 bsp2\"]);;
   *) $1=$enableval;;
diff --git a/aclocal/enable-tests.m4 b/aclocal/enable-tests.m4
index 31419f597a..cfc187424f 100644
--- a/aclocal/enable-tests.m4
+++ b/aclocal/enable-tests.m4
@@ -5,7 +5,7 @@ AC_DEFUN(RTEMS_ENABLE_TESTS,
 # If the tests are enabled, then find all the test suite Makefiles
 AC_MSG_CHECKING([if the test suites are enabled? ])
 AC_ARG_ENABLE(tests,
-[  --enable-tests                       enable tests (default:disabled)],
+AC_HELP_STRING([--enable-tests],[enable tests (default:disabled)]),
   [case "${enableval}" in
     yes) tests_enabled=yes ;;
     no)  tests_enabled=no ;;
diff --git a/aclocal/env-rtemsbsp.m4 b/aclocal/env-rtemsbsp.m4
index 3d8b55bd0c..43fb2a6b43 100644
--- a/aclocal/env-rtemsbsp.m4
+++ b/aclocal/env-rtemsbsp.m4
@@ -8,6 +8,7 @@ AC_BEFORE([$0], [RTEMS_ENABLE_RTEMSBSP])dnl
 AC_BEFORE([$0], [RTEMS_PROJECT_ROOT])dnl
 AC_BEFORE([$0], [RTEMS_CHECK_CUSTOM_BSP])dnl
 
+AC_ARG_VAR([RTEMS_BSP],[RTEMS_BSP to build])
 AC_MSG_CHECKING([for RTEMS_BSP])
 AC_CACHE_VAL(rtems_cv_RTEMS_BSP,
 [dnl
@@ -33,7 +34,7 @@ RTEMS_ENABLE_BARE
 AC_SUBST(BARE_CPU_MODEL)
 AC_SUBST(BARE_CPU_CFLAGS)
 
-AM_CONDITIONAL(RTEMS_CONFIG_PER_BSP, test x = x);
+AM_CONDITIONAL(RTEMS_CONFIG_PER_BSP, true);
 
 includedir="\${exec_prefix}/\$(RTEMS_BSP)/lib/include"
 ])
diff --git a/aclocal/multilib.m4 b/aclocal/multilib.m4
index 78d89650a3..7fc63ea221 100644
--- a/aclocal/multilib.m4
+++ b/aclocal/multilib.m4
@@ -5,7 +5,8 @@ dnl parts of these macros are derived from newlib-1.8.2's multilib support
 AC_DEFUN(RTEMS_ENABLE_MULTILIB,
 [
 AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
+AC_HELP_STRING([--enable-multilib],
+[build many library versions (default=no)]),
 [case "${enableval}" in
   yes) multilib=yes ;;
   no)  multilib=no ;;
diff --git a/aclocal/rtems-debug.m4 b/aclocal/rtems-debug.m4
index f83a039d40..e68e4b707f 100644
--- a/aclocal/rtems-debug.m4
+++ b/aclocal/rtems-debug.m4
@@ -3,7 +3,7 @@
 AC_DEFUN(RTEMS_ENABLE_RTEMS_DEBUG,
 [
 AC_ARG_ENABLE(rtems-debug,
-[  --enable-rtems-debug                 enable RTEMS_DEBUG],
+AC_HELP_STRING([--enable-rtems-debug],[enable RTEMS_DEBUG]),
 [case "${enableval}" in
   yes) RTEMS_DEBUG=yes ;;
   no) RTEMS_DEBUG=no ;;
diff --git a/aclocal/rtems-test-no-pause.m4 b/aclocal/rtems-test-no-pause.m4
index edf9dea25b..17d92e9a12 100644
--- a/aclocal/rtems-test-no-pause.m4
+++ b/aclocal/rtems-test-no-pause.m4
@@ -1,6 +1,6 @@
 AC_DEFUN(RTEMS_ENABLE_RTEMS_TEST_NO_PAUSE,
 [AC_ARG_ENABLE(test-no-pause,
-[  --disable-test-no-pause              disable RTEMS_TEST_NO_PAUSE],
+AC_HELP_STRING([--disable-test-no-pause],[disable RTEMS_TEST_NO_PAUSE]),
 [case "${enableval}" in
   yes) RTEMS_TEST_NO_PAUSE=yes ;;
   no) RTEMS_TEST_NO_PAUSE=no ;;
diff --git a/aclocal/rtems-top.m4 b/aclocal/rtems-top.m4
index b0e246c733..039db16caa 100644
--- a/aclocal/rtems-top.m4
+++ b/aclocal/rtems-top.m4
@@ -11,6 +11,8 @@ AC_CHECK_PROGS(MAKE, gmake make)
 AC_BEFORE([$0], [AC_CONFIG_AUX_DIR])dnl
 AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
 
+AC_PREFIX_DEFAULT([/opt/rtems])
+
 ## HACK to allow gnu-make conditionals in automake-Makefiles.
 ENDIF=endif
 AC_SUBST(ENDIF)
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
   )
diff --git a/configure.in b/configure.in
index 53d6a9709e..4cb8313c68 100644
--- a/configure.in
+++ b/configure.in
@@ -2,8 +2,9 @@ dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl  $Id$
 
-AC_PREREQ(2.13)
-AC_INIT(c)
+AC_PREREQ(2.52)
+AC_INIT
+AC_CONFIG_SRCDIR([c])
 RTEMS_TOP(.)
 
 # Abort if trying to build inside of the source tree.
@@ -14,7 +15,7 @@ if test -f VERSION; then
     [Please use a separate build directory, instead] )
 fi
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET([])
 AM_INIT_AUTOMAKE(rtems,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
@@ -111,14 +112,14 @@ AC_CONFIG_SUBDIRS($BUILD_SUBDIRS)
 AC_SUBST(TARGET_SUBDIRS)
 AC_SUBST(BUILD_SUBDIRS)
 
-AC_OUTPUT(
-Makefile
+AC_CONFIG_FILES([Makefile
 tools/Makefile
 make/Makefile
 make/custom/Makefile
 make/Templates/Makefile
 make/compilers/Makefile 
-doc/Makefile)
+doc/Makefile])
+AC_OUTPUT
 
 RTEMS_TARGET_CONFIG_SUBDIRS
 RTEMS_HOST_CONFIG_SUBDIRS