From 7e03d107d780ca0e1690a7cdecfb35834832c3d5 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 29 Mar 1999 21:08:04 +0000
Subject:   Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:

    Yet some more modifications, I would recommend to be considered before
    releasing a snapshot:

    1. Cleanup to aclocal/
    cvs rm -f aclocal/cygwin.m4
    cvs rm -f aclocal/exeext.m4

    They are neither used nor needed anymore, however they also don't
    disturb (we use autoconf-2.13's AC_EXEEXT instead, now)

    ----------

    2. rtems-rc-19990328-0.diff
    Some (minor) bug-fixes:
    * make/Templates/Makefile.inc.in: use the new installation directory
    ($(prefix)/ instead of $(prefix)/rtems/)
    * c/src/exec/score/tools/generic/Makefile.am: added line to include local.am
    * c/src/exec/score/tools/*/configure.in: added CVS Id header

    ----------

    3. rtems-rc-19990328-1.diff
    Enhancements and cleanups to autogen, rtems-polish.sh, configure.in etc.

    * autogen: Use the file "VERSION" to detect RTEMS toplevel directory,
    extended usage-message, use "find -print"
    * c/update-tools/cipolish: New script to beautify configure.in scripts
    * c/update-tools/rtems-polish.sh: Use the file "VERSION" to detect RTEMS
    toplevel directory, extended usage-message, added variable for perl
    scripts' subdirectory, use "find -print", cipolish support, new options
    -ac -am -ci.
    * aclocal/*.m4, configure.in: moved some AC_SUBST lines to aclocal/*.m4
    (reduces size of configure.in
    scripts, eases splitting configure.in scripts).

    ----------
---
 aclocal.m4                                  |  13 +-
 aclocal/cygwin.m4                           |  21 --
 aclocal/enable-gmake-print.m4               |   1 +
 aclocal/enable-hwapi.m4                     |   1 +
 aclocal/enable-inlines.m4                   |   1 +
 aclocal/enable-libcdir.m4                   |   1 +
 aclocal/enable-multiprocessing.m4           |   1 +
 aclocal/enable-networking.m4                |   1 +
 aclocal/enable-posix.m4                     |   1 +
 aclocal/enable-rdbg.m4                      |   1 +
 aclocal/exeext.m4                           |  38 ----
 aclocal/i386-gas-code16.m4                  |   5 +-
 autogen                                     |  26 ++-
 c/src/exec/score/tools/generic/Makefile.am  |   1 +
 c/src/exec/score/tools/generic/Makefile.in  |  28 ++-
 c/src/exec/score/tools/generic/configure.in |   4 +
 c/src/exec/score/tools/hppa1.1/configure.in |   4 +
 c/src/exec/score/tools/sh/configure.in      |   4 +
 c/src/exec/score/tools/unix/configure.in    |   4 +
 c/update-tools/cipolish                     | 119 +++++++++++
 c/update-tools/rtems-polish.sh              |  86 +++++++-
 configure                                   | 304 +++++++++++++---------------
 make/Templates/Makefile.inc.in              |   4 +-
 tools/cpu/generic/Makefile.am               |   1 +
 tools/cpu/generic/Makefile.in               |  28 ++-
 tools/cpu/generic/configure.in              |   4 +
 tools/cpu/hppa1.1/configure.in              |   4 +
 tools/cpu/sh/configure.in                   |   4 +
 tools/cpu/unix/configure.in                 |   4 +
 tools/update/cipolish                       | 119 +++++++++++
 tools/update/rtems-polish.sh                |  86 +++++++-
 31 files changed, 673 insertions(+), 246 deletions(-)
 delete mode 100644 aclocal/cygwin.m4
 delete mode 100644 aclocal/exeext.m4
 create mode 100644 c/update-tools/cipolish
 create mode 100755 tools/update/cipolish

diff --git a/aclocal.m4 b/aclocal.m4
index 619dc3bc0c..5a602f04ca 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -60,6 +60,7 @@ AC_ARG_ENABLE(gmake-print-directory,
   *)  AC_MSG_ERROR(bad value ${enableval} for gmake-print-directory option)
 ;;
 esac],[RTEMS_USE_OWN_PDIR=yes])
+AC_SUBST(RTEMS_USE_OWN_PDIR)dnl
 ])
 
 dnl $Id$
@@ -73,6 +74,7 @@ AC_ARG_ENABLE(multiprocessing,
   no) RTEMS_HAS_MULTIPROCESSING=no ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-multiprocessing option) ;;
 esac],[RTEMS_HAS_MULTIPROCESSING=no])
+AC_SUBST(RTEMS_HAS_MULTIPROCESSING)dnl
 ])
 
 dnl $Id$
@@ -86,6 +88,7 @@ AC_ARG_ENABLE(posix,
   no) RTEMS_HAS_POSIX_API=no ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-posix option) ;;
 esac],[RTEMS_HAS_POSIX_API=yes]) 
+AC_SUBST(RTEMS_HAS_POSIX_API)
 
 changequote(,)dnl
 case "${target}" in
@@ -123,6 +126,7 @@ AC_ARG_ENABLE(networking,
   no) RTEMS_HAS_NETWORKING=no ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-networking option) ;;
 esac],[RTEMS_HAS_NETWORKING=yes])
+AC_SUBST(RTEMS_HAS_NETWORKING)dnl
 ])
 
 dnl $Id$
@@ -136,6 +140,7 @@ AC_ARG_ENABLE(rdbg,
   no) RTEMS_HAS_RDBG=no ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-rdbg option) ;;
 esac],[RTEMS_HAS_RDBG=no])
+AC_SUBST(RTEMS_HAS_RDBG)dnl
 ])
 
 dnl $Id$
@@ -149,6 +154,7 @@ AC_DEFUN(RTEMS_ENABLE_INLINES,
   no) RTEMS_USE_MACROS=yes ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for disable-rtems-inlines option) ;;
 esac],[RTEMS_USE_MACROS=no])
+AC_SUBST(RTEMS_USE_MACROS)dnl
 ])
 
 dnl $Id$
@@ -186,6 +192,7 @@ AC_ARG_ENABLE(libcdir,
 [  --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
 ])
 
 AC_DEFUN(RTEMS_ENABLE_BARE,
@@ -703,7 +710,7 @@ dnl check for i386 gas supporting 16 bit mode
 dnl     - binutils 2.9.1.0.7 and higher
 
 AC_DEFUN(RTEMS_I386_GAS_CODE16,
-  if test "${target_cpu}" = "i386"; then
+[ if test "${target_cpu}" = "i386"; then
     AC_CACHE_CHECK([for 16 bit mode assembler support],
       rtems_cv_prog_gas_code16,
       [cat > conftest.s << EOF
@@ -719,7 +726,8 @@ EOF
       fi])
     RTEMS_GAS_CODE16="$rtems_cv_prog_gas_code16"
   fi
-)
+  AC_SUBST(RTEMS_GAS_CODE16)
+])
 
 
 dnl
@@ -886,5 +894,6 @@ AC_ARG_ENABLE(hwapi, \
     no)  RTEMS_HAS_HWAPI=no ;;
     *)  AC_MSG_ERROR(bad value ${enableval} for hwapi option) ;;
   esac],[RTEMS_HAS_HWAPI=no])
+AC_SUBST(RTEMS_HAS_HWAPI)dnl
 ])dnl
 
diff --git a/aclocal/cygwin.m4 b/aclocal/cygwin.m4
deleted file mode 100644
index 62b07ae4fd..0000000000
--- a/aclocal/cygwin.m4
+++ /dev/null
@@ -1,21 +0,0 @@
-dnl
-dnl  $Id$
-dnl 
-dnl Detect the Cygwin32 environment (unix under Win32)
-dnl
-dnl 98/06/16 David Fiddes   	(D.J.Fiddes@hw.ac.uk)
-dnl				Hacked from automake-1.3
-
-# Check to see if we're running under Cygwin32, without using
-# AC_CANONICAL_*.  If so, set output variable CYGWIN32 to "yes".
-# Otherwise set it to "no".
-
-dnl RTEMS_CYGWIN32()
-AC_DEFUN(RTEMS_CYGWIN32,
-[AC_CACHE_CHECK(for Cygwin32 environment, rtems_cv_cygwin32,
-[AC_TRY_COMPILE(,[return __CYGWIN32__;],
-rtems_cv_cygwin32=yes, rtems_cv_cygwin32=no)
-rm -f conftest*])
-CYGWIN32=
-test "$rtems_cv_cygwin32" = yes && CYGWIN32=yes])
-
diff --git a/aclocal/enable-gmake-print.m4 b/aclocal/enable-gmake-print.m4
index ab3c0b7282..3c2973db29 100644
--- a/aclocal/enable-gmake-print.m4
+++ b/aclocal/enable-gmake-print.m4
@@ -12,4 +12,5 @@ AC_ARG_ENABLE(gmake-print-directory,
   *)  AC_MSG_ERROR(bad value ${enableval} for gmake-print-directory option)
 ;;
 esac],[RTEMS_USE_OWN_PDIR=yes])
+AC_SUBST(RTEMS_USE_OWN_PDIR)dnl
 ])
diff --git a/aclocal/enable-hwapi.m4 b/aclocal/enable-hwapi.m4
index f639f29c5f..ce6ef3f3a1 100644
--- a/aclocal/enable-hwapi.m4
+++ b/aclocal/enable-hwapi.m4
@@ -11,4 +11,5 @@ AC_ARG_ENABLE(hwapi, \
     no)  RTEMS_HAS_HWAPI=no ;;
     *)  AC_MSG_ERROR(bad value ${enableval} for hwapi option) ;;
   esac],[RTEMS_HAS_HWAPI=no])
+AC_SUBST(RTEMS_HAS_HWAPI)dnl
 ])dnl
diff --git a/aclocal/enable-inlines.m4 b/aclocal/enable-inlines.m4
index 4456bb1634..f4d00c39d2 100644
--- a/aclocal/enable-inlines.m4
+++ b/aclocal/enable-inlines.m4
@@ -9,4 +9,5 @@ AC_DEFUN(RTEMS_ENABLE_INLINES,
   no) RTEMS_USE_MACROS=yes ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for disable-rtems-inlines option) ;;
 esac],[RTEMS_USE_MACROS=no])
+AC_SUBST(RTEMS_USE_MACROS)dnl
 ])
diff --git a/aclocal/enable-libcdir.m4 b/aclocal/enable-libcdir.m4
index a3195dfd3a..892070522b 100644
--- a/aclocal/enable-libcdir.m4
+++ b/aclocal/enable-libcdir.m4
@@ -6,4 +6,5 @@ AC_ARG_ENABLE(libcdir,
 [  --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 a53f7e07f7..b04b7ee524 100644
--- a/aclocal/enable-multiprocessing.m4
+++ b/aclocal/enable-multiprocessing.m4
@@ -9,4 +9,5 @@ AC_ARG_ENABLE(multiprocessing,
   no) RTEMS_HAS_MULTIPROCESSING=no ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-multiprocessing option) ;;
 esac],[RTEMS_HAS_MULTIPROCESSING=no])
+AC_SUBST(RTEMS_HAS_MULTIPROCESSING)dnl
 ])
diff --git a/aclocal/enable-networking.m4 b/aclocal/enable-networking.m4
index bb0fd76717..5bc5b55498 100644
--- a/aclocal/enable-networking.m4
+++ b/aclocal/enable-networking.m4
@@ -9,4 +9,5 @@ AC_ARG_ENABLE(networking,
   no) RTEMS_HAS_NETWORKING=no ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-networking option) ;;
 esac],[RTEMS_HAS_NETWORKING=yes])
+AC_SUBST(RTEMS_HAS_NETWORKING)dnl
 ])
diff --git a/aclocal/enable-posix.m4 b/aclocal/enable-posix.m4
index a027f86e43..9384ea3a7d 100644
--- a/aclocal/enable-posix.m4
+++ b/aclocal/enable-posix.m4
@@ -9,6 +9,7 @@ AC_ARG_ENABLE(posix,
   no) RTEMS_HAS_POSIX_API=no ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-posix option) ;;
 esac],[RTEMS_HAS_POSIX_API=yes]) 
+AC_SUBST(RTEMS_HAS_POSIX_API)
 
 changequote(,)dnl
 case "${target}" in
diff --git a/aclocal/enable-rdbg.m4 b/aclocal/enable-rdbg.m4
index b3dc42f471..927a3428bf 100644
--- a/aclocal/enable-rdbg.m4
+++ b/aclocal/enable-rdbg.m4
@@ -9,4 +9,5 @@ AC_ARG_ENABLE(rdbg,
   no) RTEMS_HAS_RDBG=no ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-rdbg option) ;;
 esac],[RTEMS_HAS_RDBG=no])
+AC_SUBST(RTEMS_HAS_RDBG)dnl
 ])
diff --git a/aclocal/exeext.m4 b/aclocal/exeext.m4
deleted file mode 100644
index 546351e66b..0000000000
--- a/aclocal/exeext.m4
+++ /dev/null
@@ -1,38 +0,0 @@
-dnl
-dnl  $Id$
-dnl 
-dnl Set the EXE extension
-dnl
-dnl 98/06/16 David Fiddes   	(D.J.Fiddes@hw.ac.uk)
-dnl				Hacked from automake-1.3
-
-# Check to see if we're running under Win32, without using
-# AC_CANONICAL_*.  If so, set output variable EXEEXT to ".exe".
-# Otherwise set it to "".
-
-dnl RTEMS_EXEEXT()
-dnl This knows we add .exe if we're building in the Cygwin32
-dnl environment. But if we're not, then it compiles a test program
-dnl to see if there is a suffix for executables.
-AC_DEFUN(RTEMS_EXEEXT,
-[AC_REQUIRE([RTEMS_CYGWIN32])
-AC_MSG_CHECKING([for executable suffix])
-AC_CACHE_VAL(rtems_cv_exeext,
-[if test "$CYGWIN32" = yes; then
-rtems_cv_exeext=.exe
-else
-cat > rtems_c_test.c << 'EOF'
-int main() {
-/* Nothing needed here */
-}
-EOF
-${CC-cc} -o rtems_c_test $CFLAGS $CPPFLAGS $LDFLAGS rtems_c_test.c $LIBS 1>&5
-rtems_cv_exeext=`echo rtems_c_test.* | grep -v rtems_c_test.c | sed -e s/rtems_c_test//`
-rm -f rtems_c_test*])
-test x"${rtems_cv_exeext}" = x && rtems_cv_exeext=no
-fi
-EXEEXT=""
-test x"${rtems_cv_exeext}" != xno && EXEEXT=${rtems_cv_exeext}
-AC_MSG_RESULT(${rtems_cv_exeext})
-AC_SUBST(EXEEXT)])
-
diff --git a/aclocal/i386-gas-code16.m4 b/aclocal/i386-gas-code16.m4
index 507d18d80e..ec0314980e 100644
--- a/aclocal/i386-gas-code16.m4
+++ b/aclocal/i386-gas-code16.m4
@@ -6,7 +6,7 @@ dnl check for i386 gas supporting 16 bit mode
 dnl     - binutils 2.9.1.0.7 and higher
 
 AC_DEFUN(RTEMS_I386_GAS_CODE16,
-  if test "${target_cpu}" = "i386"; then
+[ if test "${target_cpu}" = "i386"; then
     AC_CACHE_CHECK([for 16 bit mode assembler support],
       rtems_cv_prog_gas_code16,
       [cat > conftest.s << EOF
@@ -22,5 +22,6 @@ EOF
       fi])
     RTEMS_GAS_CODE16="$rtems_cv_prog_gas_code16"
   fi
-)
+  AC_SUBST(RTEMS_GAS_CODE16)
+])
 
diff --git a/autogen b/autogen
index 68871a0c2c..ad3b67ff8b 100644
--- a/autogen
+++ b/autogen
@@ -18,12 +18,27 @@ quiet="false"
 
 usage()
 {
-  echo "${progname} [-v|-q]"
+  echo
+  echo "usage: ${progname} [-h|-q|-v]"
+  echo
+  echo "options:"
+  echo "	-h .. display this message and exit";
+  echo "	-q .. quiet, don't display directories";
+  echo "	-v .. verbose, pass -v to automake when invoking automake"
+  echo
   exit 1;
 }
 
+if test ! -f VERSION; then
+  echo "${progname}:"
+  echo "	Please change directory to RTEMS's toplevel directory"
+  exit 1;
+fi
+
 while test $# -gt 0; do
 case $1 in
+-h|--he|--hel|--help)
+  usage ;;
 -q|--qu|--qui|--quie|--quiet)
   quiet="true";
   shift;;
@@ -37,14 +52,8 @@ case $1 in
 esac
 done
 
-if test ! -d aclocal; then
-  echo "${progname}"
-  echo "	Please change directory to RTEMS's toplevel directory"
-  exit 1;
-fi
-
 pwd=`pwd`;
-confs=`find $pwd -name configure.in`
+confs=`find $pwd -name 'configure.in' -print`
 
 aclocal_dir=$pwd/aclocal
 for i in $confs; do
@@ -57,4 +66,3 @@ dir=`dirname $i`;
   test -f Makefile.am && automake $verbose ;
 )
 done
-
diff --git a/c/src/exec/score/tools/generic/Makefile.am b/c/src/exec/score/tools/generic/Makefile.am
index 476d6bab83..92f0ea787e 100644
--- a/c/src/exec/score/tools/generic/Makefile.am
+++ b/c/src/exec/score/tools/generic/Makefile.am
@@ -6,3 +6,4 @@ AUTOMAKE_OPTIONS = foreign
 ACLOCAL = @ACLOCAL@ -I $(RTEMS_TOPdir)/aclocal
 
 noinst_SCRIPTS=size_rtems
+include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/exec/score/tools/generic/Makefile.in b/c/src/exec/score/tools/generic/Makefile.in
index 41e91bee93..d7a05c1cf3 100644
--- a/c/src/exec/score/tools/generic/Makefile.in
+++ b/c/src/exec/score/tools/generic/Makefile.in
@@ -15,6 +15,14 @@
 #
 
 
+# $Id$
+
+# NOTE: This is a temporary work-around to keep 
+# "make debug" and "make debug_install" working.
+# Once automake is fully integrated these make targets 
+# and this file will probably be removed
+
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -96,7 +104,7 @@ TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../../../../../automake/local.am
 	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
@@ -232,6 +240,24 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
+debug-am:
+
+debug: debug-am
+
+debug_install-am:
+
+debug_install: debug_install-am
+
+profile-am:
+
+profile: profile-am
+
+profile_install-am:
+
+profile_install: profile_install-am
+
+.PHONY: debug debug_install profile profile_install
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/c/src/exec/score/tools/generic/configure.in b/c/src/exec/score/tools/generic/configure.in
index 9877ceabc3..7e144ad375 100644
--- a/c/src/exec/score/tools/generic/configure.in
+++ b/c/src/exec/score/tools/generic/configure.in
@@ -1,3 +1,7 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl  $Id$
+
 AC_INIT(size_rtems.in)
 AC_CONFIG_AUX_DIR(../../../../../..)
 
diff --git a/c/src/exec/score/tools/hppa1.1/configure.in b/c/src/exec/score/tools/hppa1.1/configure.in
index c846bc5a11..c361bf10bc 100644
--- a/c/src/exec/score/tools/hppa1.1/configure.in
+++ b/c/src/exec/score/tools/hppa1.1/configure.in
@@ -1,3 +1,7 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl  $Id$    
+
 AC_INIT(genoffsets.c)
 AC_CONFIG_AUX_DIR(../../../../../..)
 
diff --git a/c/src/exec/score/tools/sh/configure.in b/c/src/exec/score/tools/sh/configure.in
index 6ff5bb3e22..a93a660603 100644
--- a/c/src/exec/score/tools/sh/configure.in
+++ b/c/src/exec/score/tools/sh/configure.in
@@ -1,3 +1,7 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl  $Id$
+
 AC_INIT(shgen.c)
 AC_CONFIG_AUX_DIR(../../../../../..)
 
diff --git a/c/src/exec/score/tools/unix/configure.in b/c/src/exec/score/tools/unix/configure.in
index 19b8b548f0..302364be14 100644
--- a/c/src/exec/score/tools/unix/configure.in
+++ b/c/src/exec/score/tools/unix/configure.in
@@ -1,3 +1,7 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl  $Id$    
+
 AC_INIT(gensize.c)
 AC_CONFIG_AUX_DIR(../../../../../..)
 
diff --git a/c/update-tools/cipolish b/c/update-tools/cipolish
new file mode 100644
index 0000000000..61af53312c
--- /dev/null
+++ b/c/update-tools/cipolish
@@ -0,0 +1,119 @@
+#!/usr/bin/perl
+
+#
+# Perl script to beautify and enhance RTEMS configure.in
+#
+# Reads from stdin and writes to stdout
+#
+# usage: 
+# acpolish <configure.in >configure.in~
+# mv configure.in~ configure.in
+#
+# ATTENTION: This file contains embedded tabs
+
+my $nl_seen = 0 ;
+
+# find a relative up-path to a file $file, starting at directory $pre
+sub find_file
+{
+  my $pre = $_[0] ;
+  my $file= $_[1] ;
+
+  my $top = "." ;
+  if (not "$pre") { $pre = "." ; }
+
+  for ( $str = "$pre" . "/" . "$top" ;
+    ( -d "$str" ) ;
+    $str = "$pre" . "/" . "$top" )
+  {
+    if ( -f "${str}/${file}" )  
+    {
+      return $top ; 
+    }
+    if ( "$top" eq "." )
+    {
+      $top = ".." ;
+    }
+    else
+    {
+      $top .= "/.." ;
+    }
+  } ;
+  die "Can't find file ${file}\n" ;
+}
+
+# find relative up-path to configure.in
+my $rtems_cfg = find_file(".","VERSION");
+
+
+while( <> )
+{ 
+  if ( /^[ 	]*$/o )
+  {
+    $nl_seen = $nl_seen+1;
+  }
+
+  if ( /^[ 	]*AC_CONFIG_AUX_DIR\(.*\)[ 	]*$/o )
+  {
+    print "AC_CONFIG_AUX_DIR($rtems_cfg)\n" ;
+  }
+  elsif ( /^[ 	]*RTEMS_TOP\(.*\)[ 	]*$/o )
+  {
+    print "RTEMS_TOP($rtems_cfg)\n" ;
+  }
+  elsif ( /^[ 	]*AC_SUBST\(RTEMS_HAS_POSIX_API\)[ 	]*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*AC_SUBST\(RTEMS_HAS_HWAPI\)[ 	]*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*AC_SUBST\(RTEMS_USE_MACROS\)[ 	]*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*AC_SUBST\(RTEMS_HAS_MULTIPROCESSING\)[ 	]*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*AC_SUBST\(RTEMS_HAS_RDBG\)[ 	]*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*AC_SUBST\(RTEMS_USE_OWN_PDIR\)[ 	]*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*AC_SUBST\(RTEMS_HAS_NETWORKING\)[ 	]*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*AC_SUBST\(RTEMS_LIBC_DIR\)[ 	]*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*AC_SUBST\(PROJECT_ROOT\)[ 	]*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*AC_SUBST\(RTEMS_GAS_CODE16\)[ 	]*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*PROJECT_ROOT[ 	]*=.*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*$/o )
+  {
+    print "$_" if $nl_seen < 2 ;
+  }
+  else
+  {
+    print "$_" ;
+    $nl_seen = 0;
+  }
+} # while
+
+;1
diff --git a/c/update-tools/rtems-polish.sh b/c/update-tools/rtems-polish.sh
index fe8604e972..7a693928d9 100644
--- a/c/update-tools/rtems-polish.sh
+++ b/c/update-tools/rtems-polish.sh
@@ -1,8 +1,70 @@
 #!/bin/sh
 
+# $Id$
+
+#
+# Search RTEMS source tree for autoconf Makefile.ins and automake
+# Makefile.ams and run c/update-tools/acpolish rsp. c/update-tool/ampolish
+# on them.
+#
+# To be run from the toplevel directory of the source-tree
+#
+
+progname=`basename $0`
+
+perltools=c/update-tools
+ac_do=""
+am_do=""
+ci_do=""
+
+usage()
+{
+  echo
+  echo "usage: ./${perltools}/${progname} [-h][-ac|-am|-ci]";
+  echo
+  echo "options:"
+  echo "	-h .. display this message and exit";
+  echo "	-ac .. run acpolish on all autoconf Makefile.ins"
+  echo "	-am .. run ampolish on all automake Makefile.ams"
+  echo "	-ci .. run cipolish on all configure.in scripts"
+  echo
+  exit 1;
+}
+
+if test ! -f VERSION; then
+  echo "${progname}:"
+  echo "        Please change directory to RTEMS's toplevel directory"
+  exit 1;
+fi
+
+while test $# -gt 0; do
+case $1 in
+-h|--he|--hel|--help)
+  usage ;;
+-ac)
+  ac_do="yes";
+  shift ;;
+-am)
+  am_do="yes";
+  shift ;;
+-ci)
+  ci_do="yes";
+  shift ;;
+-*) echo "unknown option $1" ;
+  usage ;;
+*) echo "invalid parameter $1" ;
+  usage ;;
+esac
+done
+
+if test -z "$ac_do" && test -z "$am_do" && test -z "$ci_do"; then
+  usage
+fi
+
 pwd=`pwd`;
 
-ac_files=`find . -name Makefile.in`;
+if test -n "$ac_do"; then
+ac_files=`find . -name 'Makefile.in' -print`;
 for f in $ac_files; do
   i=`dirname $f`
   dest="$i"
@@ -10,21 +72,37 @@ for f in $ac_files; do
     echo "polishing : $dest/Makefile.in"
     ( cd $dest; 
       mv Makefile.in Makefile.in~;
-      $pwd/c/update-tools/acpolish <Makefile.in~ >Makefile.in
+      ${pwd}/${perltools}/acpolish <Makefile.in~ >Makefile.in
       rm Makefile.in~
     )
   fi
 done
+fi
 
-am_files=`find . -name Makefile.am`;
+if test -n "$am_do"; then
+am_files=`find . -name 'Makefile.am' -print`;
 for f in $am_files; do
   i=`dirname $f`
   dest="$i"
     echo "polishing : $dest/Makefile.am"
     ( cd $dest; 
       mv Makefile.am Makefile.am~;
-      $pwd/c/update-tools/ampolish <Makefile.am~ >Makefile.am
+      ${pwd}/${perltools}/ampolish <Makefile.am~ >Makefile.am
       rm Makefile.am~
     )
 done
+fi
 
+if test -n "$ci_do"; then
+ci_files=`find . -name 'configure.in' -print`;
+for f in $ci_files; do
+  i=`dirname $f`
+  dest="$i"
+    echo "polishing : $dest/configure.in"
+    ( cd $dest; 
+      mv configure.in configure.in~;
+      ${pwd}/${perltools}/cipolish <configure.in~ >configure.in
+      rm configure.in~
+    )
+done
+fi
diff --git a/configure b/configure
index cac8c9df6a..ebdd1c3c10 100644
--- a/configure
+++ b/configure
@@ -1,28 +1,5 @@
 #! /bin/sh
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
@@ -587,7 +564,7 @@ PROJECT_ROOT=`pwd`/$RTEMS_TOPdir;
 
 
 echo $ac_n "checking for RTEMS Version""... $ac_c" 1>&6
-echo "configure:591: checking for RTEMS Version" >&5
+echo "configure:568: checking for RTEMS Version" >&5
 if test -r "${srcdir}/${RTEMS_TOPdir}/VERSION"; then
 RTEMS_VERSION=`grep Version ${srcdir}/${RTEMS_TOPdir}/VERSION | \
 sed -e 's%RTEMS[ 	]*Version[ 	]*\(.*\)[ 	]*%\1%g'`
@@ -602,7 +579,7 @@ echo "$ac_t""$RTEMS_VERSION" 1>&6
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:606: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:583: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -675,7 +652,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:679: checking host system type" >&5
+echo "configure:656: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -696,7 +673,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:700: checking target system type" >&5
+echo "configure:677: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -714,7 +691,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:718: checking build system type" >&5
+echo "configure:695: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -788,6 +765,7 @@ else
 fi
  
 
+
 case "${target}" in
   # hpux unix port should go here
   i[3456]86-go32-rtems*)
@@ -920,7 +898,7 @@ RTEMS_PREFIX=${target_cpu}-${target_vendor}
 # Extract the first word of "cat", so it can be a program name with args.
 set dummy cat; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:924: checking for $ac_word" >&5
+echo "configure:902: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CAT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -955,7 +933,7 @@ fi
 # Extract the first word of "rm", so it can be a program name with args.
 set dummy rm; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:959: checking for $ac_word" >&5
+echo "configure:937: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -990,7 +968,7 @@ fi
 # Extract the first word of "cp", so it can be a program name with args.
 set dummy cp; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:994: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1025,7 +1003,7 @@ fi
 # Extract the first word of "mv", so it can be a program name with args.
 set dummy mv; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1029: checking for $ac_word" >&5
+echo "configure:1007: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1060,7 +1038,7 @@ fi
 # Extract the first word of "ln", so it can be a program name with args.
 set dummy ln; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1064: checking for $ac_word" >&5
+echo "configure:1042: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_LN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1093,7 +1071,7 @@ else
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1097: checking whether ln -s works" >&5
+echo "configure:1075: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1116,7 +1094,7 @@ fi
 # Extract the first word of "chmod", so it can be a program name with args.
 set dummy chmod; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1120: checking for $ac_word" >&5
+echo "configure:1098: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CHMOD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1151,7 +1129,7 @@ fi
 # Extract the first word of "sort", so it can be a program name with args.
 set dummy sort; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1155: checking for $ac_word" >&5
+echo "configure:1133: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SORT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1195,7 +1173,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1199: checking for a BSD compatible install" >&5
+echo "configure:1177: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1251,7 +1229,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1255: checking for $ac_word" >&5
+echo "configure:1233: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1293,7 +1271,7 @@ fi
 # Extract the first word of "mkdir", so it can be a program name with args.
 set dummy mkdir; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1297: checking for $ac_word" >&5
+echo "configure:1275: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MKDIR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1329,7 +1307,7 @@ fi
 
 
 echo $ac_n "checking for working $MKDIR -m 0755""... $ac_c" 1>&6
-echo "configure:1333: checking for working $MKDIR -m 0755" >&5
+echo "configure:1311: checking for working $MKDIR -m 0755" >&5
 if eval "test \"`echo '$''{'rtems_cv_prog_MKDIR_P'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1346,7 +1324,7 @@ echo "$ac_t""$rtems_cv_prog_MKDIR_M" 1>&6
 
 
 echo $ac_n "checking for working $MKDIR -p""... $ac_c" 1>&6
-echo "configure:1350: checking for working $MKDIR -p" >&5
+echo "configure:1328: checking for working $MKDIR -p" >&5
 if eval "test \"`echo '$''{'rtems_cv_prog_mkdir_p'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1344,7 @@ test "$rtems_cv_prog_MKDIR_P" = "yes" && MKDIR="$MKDIR -p"
 # Extract the first word of "touch", so it can be a program name with args.
 set dummy touch; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1370: checking for $ac_word" >&5
+echo "configure:1348: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TOUCH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1401,7 +1379,7 @@ fi
 # Extract the first word of "cmp", so it can be a program name with args.
 set dummy cmp; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1405: checking for $ac_word" >&5
+echo "configure:1383: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1437,7 +1415,7 @@ fi
 # Extract the first word of "sed", so it can be a program name with args.
 set dummy sed; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1441: checking for $ac_word" >&5
+echo "configure:1419: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1474,7 +1452,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1478: checking for $ac_word" >&5
+echo "configure:1456: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_M4'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1516,7 +1494,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1520: checking for $ac_word" >&5
+echo "configure:1498: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_KSH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1566,7 +1544,7 @@ RTEMS_HOST=$host_os
 
 
 echo $ac_n "checking rtems target cpu""... $ac_c" 1>&6
-echo "configure:1570: checking rtems target cpu" >&5
+echo "configure:1548: checking rtems target cpu" >&5
 case "${target}" in
   # hpux unix port should go here
   i[3456]86-go32-rtems*)
@@ -1597,7 +1575,7 @@ echo "$ac_t""$target_cpu" 1>&6
 
 # Is this a supported CPU?
 echo $ac_n "checking if cpu $target_cpu is supported""... $ac_c" 1>&6
-echo "configure:1601: checking if cpu $target_cpu is supported" >&5
+echo "configure:1579: checking if cpu $target_cpu is supported" >&5
 if test -d "$srcdir/$RTEMS_TOPdir/c/src/exec/score/cpu/$target_cpu"; then
   echo "$ac_t""yes" 1>&6
 else
@@ -1659,7 +1637,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1663: checking for $ac_word" >&5
+echo "configure:1641: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CC_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1703,7 +1681,7 @@ rtems_save_CFLAGS=$CFLAGS
 CC=$CC_FOR_TARGET
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1707: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1685: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1714,12 +1692,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1718 "configure"
+#line 1696 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1745,12 +1723,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1749: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1727: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1754: checking whether we are using GNU C" >&5
+echo "configure:1732: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1759,7 +1737,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1774,7 +1752,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1778: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1756: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1816,7 +1794,7 @@ unset ac_cv_prog_cc_cross
 
 
 echo $ac_n "checking whether $CC_FOR_TARGET accepts -specs""... $ac_c" 1>&6
-echo "configure:1820: checking whether $CC_FOR_TARGET accepts -specs" >&5
+echo "configure:1798: checking whether $CC_FOR_TARGET accepts -specs" >&5
 if eval "test \"`echo '$''{'rtems_cv_gcc_specs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1837,7 +1815,7 @@ echo "$ac_t""$rtems_cv_gcc_specs" 1>&6
  
 
 echo $ac_n "checking whether $CC_FOR_TARGET accepts --pipe""... $ac_c" 1>&6
-echo "configure:1841: checking whether $CC_FOR_TARGET accepts --pipe" >&5
+echo "configure:1819: checking whether $CC_FOR_TARGET accepts --pipe" >&5
 if eval "test \"`echo '$''{'rtems_cv_gcc_pipe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1878,7 +1856,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1882: checking for $ac_word" >&5
+echo "configure:1860: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CXX_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1922,7 +1900,7 @@ rtems_save_CXXFLAGS=$CXXFLAGS
 CXX=$CXX_FOR_TARGET
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1926: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1904: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1933,12 +1911,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1937 "configure"
+#line 1915 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:1942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1964,12 +1942,12 @@ if test $ac_cv_prog_cxx_works = no; then
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1968: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1946: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1973: checking whether we are using GNU C++" >&5
+echo "configure:1951: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1978,7 +1956,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -1993,7 +1971,7 @@ if test $ac_cv_prog_gxx = yes; then
   ac_save_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS=
   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1997: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1975: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2047,7 +2025,7 @@ fi
 
   
 echo $ac_n "checking target's ar""... $ac_c" 1>&6
-echo "configure:2051: checking target's ar" >&5
+echo "configure:2029: checking target's ar" >&5
 if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2080,7 +2058,7 @@ else
     # will override the environment variable, which isn't what the user
     # intends
     echo $ac_n "checking whether environment variable AR_FOR_TARGET is an absolute path""... $ac_c" 1>&6
-echo "configure:2084: checking whether environment variable AR_FOR_TARGET is an absolute path" >&5
+echo "configure:2062: checking whether environment variable AR_FOR_TARGET is an absolute path" >&5
     case "$AR_FOR_TARGET" in
     /*) # valid
       echo "$ac_t"""yes"" 1>&6
@@ -2097,7 +2075,7 @@ echo "configure:2084: checking whether environment variable AR_FOR_TARGET is an
   # Extract the first word of ""$program_prefix"ar", so it can be a program name with args.
 set dummy "$program_prefix"ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2101: checking for $ac_word" >&5
+echo "configure:2079: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2134,7 +2112,7 @@ fi
 
   
 echo $ac_n "checking target's as""... $ac_c" 1>&6
-echo "configure:2138: checking target's as" >&5
+echo "configure:2116: checking target's as" >&5
 if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2167,7 +2145,7 @@ else
     # will override the environment variable, which isn't what the user
     # intends
     echo $ac_n "checking whether environment variable AS_FOR_TARGET is an absolute path""... $ac_c" 1>&6
-echo "configure:2171: checking whether environment variable AS_FOR_TARGET is an absolute path" >&5
+echo "configure:2149: checking whether environment variable AS_FOR_TARGET is an absolute path" >&5
     case "$AS_FOR_TARGET" in
     /*) # valid
       echo "$ac_t"""yes"" 1>&6
@@ -2184,7 +2162,7 @@ echo "configure:2171: checking whether environment variable AS_FOR_TARGET is an
   # Extract the first word of ""$program_prefix"as", so it can be a program name with args.
 set dummy "$program_prefix"as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2188: checking for $ac_word" >&5
+echo "configure:2166: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2221,7 +2199,7 @@ fi
 
   
 echo $ac_n "checking target's ld""... $ac_c" 1>&6
-echo "configure:2225: checking target's ld" >&5
+echo "configure:2203: checking target's ld" >&5
 if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2254,7 +2232,7 @@ else
     # will override the environment variable, which isn't what the user
     # intends
     echo $ac_n "checking whether environment variable LD_FOR_TARGET is an absolute path""... $ac_c" 1>&6
-echo "configure:2258: checking whether environment variable LD_FOR_TARGET is an absolute path" >&5
+echo "configure:2236: checking whether environment variable LD_FOR_TARGET is an absolute path" >&5
     case "$LD_FOR_TARGET" in
     /*) # valid
       echo "$ac_t"""yes"" 1>&6
@@ -2271,7 +2249,7 @@ echo "configure:2258: checking whether environment variable LD_FOR_TARGET is an
   # Extract the first word of ""$program_prefix"ld", so it can be a program name with args.
 set dummy "$program_prefix"ld; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2275: checking for $ac_word" >&5
+echo "configure:2253: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2308,7 +2286,7 @@ fi
 
   
 echo $ac_n "checking target's nm""... $ac_c" 1>&6
-echo "configure:2312: checking target's nm" >&5
+echo "configure:2290: checking target's nm" >&5
 if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2341,7 +2319,7 @@ else
     # will override the environment variable, which isn't what the user
     # intends
     echo $ac_n "checking whether environment variable NM_FOR_TARGET is an absolute path""... $ac_c" 1>&6
-echo "configure:2345: checking whether environment variable NM_FOR_TARGET is an absolute path" >&5
+echo "configure:2323: checking whether environment variable NM_FOR_TARGET is an absolute path" >&5
     case "$NM_FOR_TARGET" in
     /*) # valid
       echo "$ac_t"""yes"" 1>&6
@@ -2358,7 +2336,7 @@ echo "configure:2345: checking whether environment variable NM_FOR_TARGET is an
   # Extract the first word of ""$program_prefix"nm", so it can be a program name with args.
 set dummy "$program_prefix"nm; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2362: checking for $ac_word" >&5
+echo "configure:2340: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2396,7 +2374,7 @@ fi
 
   
 echo $ac_n "checking target's ranlib""... $ac_c" 1>&6
-echo "configure:2400: checking target's ranlib" >&5
+echo "configure:2378: checking target's ranlib" >&5
 if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2429,7 +2407,7 @@ else
     # will override the environment variable, which isn't what the user
     # intends
     echo $ac_n "checking whether environment variable RANLIB_FOR_TARGET is an absolute path""... $ac_c" 1>&6
-echo "configure:2433: checking whether environment variable RANLIB_FOR_TARGET is an absolute path" >&5
+echo "configure:2411: checking whether environment variable RANLIB_FOR_TARGET is an absolute path" >&5
     case "$RANLIB_FOR_TARGET" in
     /*) # valid
       echo "$ac_t"""yes"" 1>&6
@@ -2446,7 +2424,7 @@ echo "configure:2433: checking whether environment variable RANLIB_FOR_TARGET is
   # Extract the first word of ""$program_prefix"ranlib", so it can be a program name with args.
 set dummy "$program_prefix"ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2450: checking for $ac_word" >&5
+echo "configure:2428: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2485,7 +2463,7 @@ fi
     # ranlib wasn't found; check if ar -s is available
     
 echo $ac_n "checking whether $AR_FOR_TARGET -s works""... $ac_c" 1>&6
-echo "configure:2489: checking whether $AR_FOR_TARGET -s works" >&5
+echo "configure:2467: checking whether $AR_FOR_TARGET -s works" >&5
 if eval "test \"`echo '$''{'rtems_cv_AR_FOR_TARGET_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2494,8 +2472,8 @@ cat > conftest.$ac_ext <<EOF
 int foo( int b ) 
 { return b; }
 EOF
-if { ac_try='$CC_FOR_TARGET -o conftest.o -c conftest.$ac_ext'; { (eval echo configure:2498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \
-  && { ac_try='$AR_FOR_TARGET -sr conftest.a conftest.o'; { (eval echo configure:2499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \
+if { ac_try='$CC_FOR_TARGET -o conftest.o -c conftest.$ac_ext'; { (eval echo configure:2476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \
+  && { ac_try='$AR_FOR_TARGET -sr conftest.a conftest.o'; { (eval echo configure:2477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \
   && test -s conftest.a ; \
 then
   rtems_cv_AR_FOR_TARGET_S="yes"
@@ -2520,7 +2498,7 @@ echo "$ac_t""$rtems_cv_AR_FOR_TARGET_S" 1>&6
 
   
 echo $ac_n "checking target's objcopy""... $ac_c" 1>&6
-echo "configure:2524: checking target's objcopy" >&5
+echo "configure:2502: checking target's objcopy" >&5
 if eval "test \"`echo '$''{'ac_cv_path_OBJCOPY_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2553,7 +2531,7 @@ else
     # will override the environment variable, which isn't what the user
     # intends
     echo $ac_n "checking whether environment variable OBJCOPY_FOR_TARGET is an absolute path""... $ac_c" 1>&6
-echo "configure:2557: checking whether environment variable OBJCOPY_FOR_TARGET is an absolute path" >&5
+echo "configure:2535: checking whether environment variable OBJCOPY_FOR_TARGET is an absolute path" >&5
     case "$OBJCOPY_FOR_TARGET" in
     /*) # valid
       echo "$ac_t"""yes"" 1>&6
@@ -2570,7 +2548,7 @@ echo "configure:2557: checking whether environment variable OBJCOPY_FOR_TARGET i
   # Extract the first word of ""$program_prefix"objcopy", so it can be a program name with args.
 set dummy "$program_prefix"objcopy; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2574: checking for $ac_word" >&5
+echo "configure:2552: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_OBJCOPY_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2607,7 +2585,7 @@ fi
 
   
 echo $ac_n "checking target's size""... $ac_c" 1>&6
-echo "configure:2611: checking target's size" >&5
+echo "configure:2589: checking target's size" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SIZE_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2640,7 +2618,7 @@ else
     # will override the environment variable, which isn't what the user
     # intends
     echo $ac_n "checking whether environment variable SIZE_FOR_TARGET is an absolute path""... $ac_c" 1>&6
-echo "configure:2644: checking whether environment variable SIZE_FOR_TARGET is an absolute path" >&5
+echo "configure:2622: checking whether environment variable SIZE_FOR_TARGET is an absolute path" >&5
     case "$SIZE_FOR_TARGET" in
     /*) # valid
       echo "$ac_t"""yes"" 1>&6
@@ -2657,7 +2635,7 @@ echo "configure:2644: checking whether environment variable SIZE_FOR_TARGET is a
   # Extract the first word of ""$program_prefix"size", so it can be a program name with args.
 set dummy "$program_prefix"size; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2661: checking for $ac_word" >&5
+echo "configure:2639: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SIZE_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2694,7 +2672,7 @@ fi
 
   
 echo $ac_n "checking target's strip""... $ac_c" 1>&6
-echo "configure:2698: checking target's strip" >&5
+echo "configure:2676: checking target's strip" >&5
 if eval "test \"`echo '$''{'ac_cv_path_STRIP_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2727,7 +2705,7 @@ else
     # will override the environment variable, which isn't what the user
     # intends
     echo $ac_n "checking whether environment variable STRIP_FOR_TARGET is an absolute path""... $ac_c" 1>&6
-echo "configure:2731: checking whether environment variable STRIP_FOR_TARGET is an absolute path" >&5
+echo "configure:2709: checking whether environment variable STRIP_FOR_TARGET is an absolute path" >&5
     case "$STRIP_FOR_TARGET" in
     /*) # valid
       echo "$ac_t"""yes"" 1>&6
@@ -2744,7 +2722,7 @@ echo "configure:2731: checking whether environment variable STRIP_FOR_TARGET is
   # Extract the first word of ""$program_prefix"strip", so it can be a program name with args.
 set dummy "$program_prefix"strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2748: checking for $ac_word" >&5
+echo "configure:2726: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_STRIP_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2781,9 +2759,9 @@ fi
 
 
 
-if test "${target_cpu}" = "i386"; then
+ if test "${target_cpu}" = "i386"; then
     echo $ac_n "checking for 16 bit mode assembler support""... $ac_c" 1>&6
-echo "configure:2787: checking for 16 bit mode assembler support" >&5
+echo "configure:2765: checking for 16 bit mode assembler support" >&5
 if eval "test \"`echo '$''{'rtems_cv_prog_gas_code16'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2793,7 +2771,7 @@ else
          addr32
          lgdt 0
 EOF
-      if { ac_try='$AS_FOR_TARGET -o conftest.o conftest.s'; { (eval echo configure:2797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+      if { ac_try='$AS_FOR_TARGET -o conftest.o conftest.s'; { (eval echo configure:2775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
         rtems_cv_prog_gas_code16=yes
       else
         rtems_cv_prog_gas_code16=no
@@ -2803,12 +2781,13 @@ fi
 echo "$ac_t""$rtems_cv_prog_gas_code16" 1>&6
     RTEMS_GAS_CODE16="$rtems_cv_prog_gas_code16"
   fi
+  
 
 
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2812: checking for $ac_word" >&5
+echo "configure:2791: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2838,7 +2817,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2842: checking for $ac_word" >&5
+echo "configure:2821: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2889,7 +2868,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2893: checking for $ac_word" >&5
+echo "configure:2872: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2921,7 +2900,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2925: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2904: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -2932,12 +2911,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 2936 "configure"
+#line 2915 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:2941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -2963,12 +2942,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2967: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2946: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2972: checking whether we are using GNU C" >&5
+echo "configure:2951: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2977,7 +2956,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -2996,7 +2975,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:3000: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2979: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3028,12 +3007,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:3032: checking for Cygwin environment" >&5
+echo "configure:3011: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3037 "configure"
+#line 3016 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3044,7 +3023,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:3048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -3061,19 +3040,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:3065: checking for mingw32 environment" >&5
+echo "configure:3044: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3070 "configure"
+#line 3049 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:3077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -3092,7 +3071,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes
 
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:3096: checking for executable suffix" >&5
+echo "configure:3075: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3102,7 +3081,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:3106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:3085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -3141,7 +3120,7 @@ if test "$target_cpu" = "unix" ; then
    
 
 echo $ac_n "checking whether $RTEMS_HOST supports System V semaphores""... $ac_c" 1>&6
-echo "configure:3145: checking whether $RTEMS_HOST supports System V semaphores" >&5
+echo "configure:3124: checking whether $RTEMS_HOST supports System V semaphores" >&5
 if eval "test \"`echo '$''{'rtems_cv_sysv_sem'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3150,7 +3129,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 3154 "configure"
+#line 3133 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3176,7 +3155,7 @@ int main () {
 }
 
 EOF
-if { (eval echo configure:3180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   rtems_cv_sysv_sem="yes"
 else
@@ -3199,7 +3178,7 @@ echo "$ac_t""$rtems_cv_sysv_sem" 1>&6
    
 
 echo $ac_n "checking whether $RTEMS_HOST supports System V shared memory""... $ac_c" 1>&6
-echo "configure:3203: checking whether $RTEMS_HOST supports System V shared memory" >&5
+echo "configure:3182: checking whether $RTEMS_HOST supports System V shared memory" >&5
 if eval "test \"`echo '$''{'rtems_cv_sysv_shm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3208,7 +3187,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 3212 "configure"
+#line 3191 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3224,7 +3203,7 @@ int main () {
 }
 
 EOF
-if { (eval echo configure:3228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   rtems_cv_sysv_shm="yes"
 else
@@ -3247,7 +3226,7 @@ echo "$ac_t""$rtems_cv_sysv_shm" 1>&6
    
 
 echo $ac_n "checking whether $RTEMS_HOST supports System V messages""... $ac_c" 1>&6
-echo "configure:3251: checking whether $RTEMS_HOST supports System V messages" >&5
+echo "configure:3230: checking whether $RTEMS_HOST supports System V messages" >&5
 if eval "test \"`echo '$''{'rtems_cv_sysv_msg'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3256,7 +3235,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 3260 "configure"
+#line 3239 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3272,7 +3251,7 @@ int main () {
 }
 
 EOF
-if { (eval echo configure:3276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   rtems_cv_sysv_msg="yes"
 else
@@ -3304,7 +3283,7 @@ fi
 # find all the Executive Makefiles
 
 echo $ac_n "checking for Makefile.in in c/src/exec/rtems""... $ac_c" 1>&6
-echo "configure:3308: checking for Makefile.in in c/src/exec/rtems" >&5
+echo "configure:3287: checking for Makefile.in in c/src/exec/rtems" >&5
 if test -d $srcdir/c/src/exec/rtems; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3319,7 +3298,7 @@ fi
 
 
 echo $ac_n "checking for Makefile.in in c/src/exec/sapi""... $ac_c" 1>&6
-echo "configure:3323: checking for Makefile.in in c/src/exec/sapi" >&5
+echo "configure:3302: checking for Makefile.in in c/src/exec/sapi" >&5
 if test -d $srcdir/c/src/exec/sapi; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3334,7 +3313,7 @@ fi
 
 
 echo $ac_n "checking for Makefile.in in c/src/exec/score/cpu/$target_cpu""... $ac_c" 1>&6
-echo "configure:3338: checking for Makefile.in in c/src/exec/score/cpu/$target_cpu" >&5
+echo "configure:3317: checking for Makefile.in in c/src/exec/score/cpu/$target_cpu" >&5
 if test -d $srcdir/c/src/exec/score/cpu/$target_cpu; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3351,7 +3330,7 @@ fi
 if test "$RTEMS_HAS_POSIX_API" = "yes"; then
   
 echo $ac_n "checking for Makefile.in in c/src/exec/posix""... $ac_c" 1>&6
-echo "configure:3355: checking for Makefile.in in c/src/exec/posix" >&5
+echo "configure:3334: checking for Makefile.in in c/src/exec/posix" >&5
 if test -d $srcdir/c/src/exec/posix; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3373,7 +3352,7 @@ if test -d "$srcdir/c/src/lib/libbsp/$target_cpu"; then
 
   if test -z "$rtems_bsp"; then
     echo $ac_n "checking for bsps""... $ac_c" 1>&6
-echo "configure:3377: checking for bsps" >&5
+echo "configure:3356: checking for bsps" >&5
     files=`ls $srcdir/c/src/lib/libbsp/$target_cpu`
     for file in $files; do
       case $file in
@@ -3438,7 +3417,7 @@ echo "configure:3377: checking for bsps" >&5
         bspdirs="$bspdirs $bspdir"
         
 echo $ac_n "checking for Makefile.in in c/src/lib/libbsp/$bspcpudir$bspdir""... $ac_c" 1>&6
-echo "configure:3442: checking for Makefile.in in c/src/lib/libbsp/$bspcpudir$bspdir" >&5
+echo "configure:3421: checking for Makefile.in in c/src/lib/libbsp/$bspcpudir$bspdir" >&5
 if test -d $srcdir/c/src/lib/libbsp/$bspcpudir$bspdir; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3453,7 +3432,7 @@ fi
 
         
 echo $ac_n "checking for Makefile.in in c/src/lib/libbsp/${bspcpudir}shared""... $ac_c" 1>&6
-echo "configure:3457: checking for Makefile.in in c/src/lib/libbsp/${bspcpudir}shared" >&5
+echo "configure:3436: checking for Makefile.in in c/src/lib/libbsp/${bspcpudir}shared" >&5
 if test -d $srcdir/c/src/lib/libbsp/${bspcpudir}shared; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3483,7 +3462,7 @@ fi
 # find all the CPU dependent library Makefiles
 
 echo $ac_n "checking for Makefile.in in c/src/lib/libcpu/$target_cpu""... $ac_c" 1>&6
-echo "configure:3487: checking for Makefile.in in c/src/lib/libcpu/$target_cpu" >&5
+echo "configure:3466: checking for Makefile.in in c/src/lib/libcpu/$target_cpu" >&5
 if test -d $srcdir/c/src/lib/libcpu/$target_cpu; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3500,7 +3479,7 @@ fi
 if test "$skip_startfiles" != "yes"; then
   
 echo $ac_n "checking for Makefile.in in c/src/lib/start/$target_cpu""... $ac_c" 1>&6
-echo "configure:3504: checking for Makefile.in in c/src/lib/start/$target_cpu" >&5
+echo "configure:3483: checking for Makefile.in in c/src/lib/start/$target_cpu" >&5
 if test -d $srcdir/c/src/lib/start/$target_cpu; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3531,12 +3510,12 @@ fi
 
 # If the TCP/IP stack is enabled, then find all TCP/IP Makefiles
 echo $ac_n "checking if networking is enabled? ""... $ac_c" 1>&6
-echo "configure:3535: checking if networking is enabled? " >&5
+echo "configure:3514: checking if networking is enabled? " >&5
 echo "$ac_t""$RTEMS_HAS_NETWORKING" 1>&6
 if test "$RTEMS_HAS_NETWORKING" = "yes"; then
   
 echo $ac_n "checking for Makefile.in in c/src/lib/libnetworking""... $ac_c" 1>&6
-echo "configure:3540: checking for Makefile.in in c/src/lib/libnetworking" >&5
+echo "configure:3519: checking for Makefile.in in c/src/lib/libnetworking" >&5
 if test -d $srcdir/c/src/lib/libnetworking; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3551,7 +3530,7 @@ fi
 
   
 echo $ac_n "checking for Makefile.in in c/src/lib/librpc""... $ac_c" 1>&6
-echo "configure:3555: checking for Makefile.in in c/src/lib/librpc" >&5
+echo "configure:3534: checking for Makefile.in in c/src/lib/librpc" >&5
 if test -d $srcdir/c/src/lib/librpc; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3567,7 +3546,7 @@ fi
   if test "$RTEMS_HAS_RDBG" = "yes"; then
     
 echo $ac_n "checking for Makefile.in in c/src/lib/librdbg""... $ac_c" 1>&6
-echo "configure:3571: checking for Makefile.in in c/src/lib/librdbg" >&5
+echo "configure:3550: checking for Makefile.in in c/src/lib/librdbg" >&5
 if test -d $srcdir/c/src/lib/librdbg; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3591,7 +3570,7 @@ fi
 
 # If the tests are enabled, then find all the test suite Makefiles
 echo $ac_n "checking if the test suites are enabled? ""... $ac_c" 1>&6
-echo "configure:3595: checking if the test suites are enabled? " >&5
+echo "configure:3574: checking if the test suites are enabled? " >&5
 tests_enabled=yes
 # Check whether --enable-tests or --disable-tests was given.
 if test "${enable_tests+set}" = set; then
@@ -3609,7 +3588,7 @@ fi
 
 
 echo $ac_n "checking for Makefile.in in c/src/tests/tools/$target_cpu""... $ac_c" 1>&6
-echo "configure:3613: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5
+echo "configure:3592: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5
 if test -d $srcdir/c/src/tests/tools/$target_cpu; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3626,7 +3605,7 @@ fi
 if test "$tests_enabled" = "yes"; then
    
 echo $ac_n "checking for Makefile.in in c/src/tests/libtests""... $ac_c" 1>&6
-echo "configure:3630: checking for Makefile.in in c/src/tests/libtests" >&5
+echo "configure:3609: checking for Makefile.in in c/src/tests/libtests" >&5
 if test -d $srcdir/c/src/tests/libtests; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3641,7 +3620,7 @@ fi
 
    
 echo $ac_n "checking for Makefile.in in c/src/tests/sptests""... $ac_c" 1>&6
-echo "configure:3645: checking for Makefile.in in c/src/tests/sptests" >&5
+echo "configure:3624: checking for Makefile.in in c/src/tests/sptests" >&5
 if test -d $srcdir/c/src/tests/sptests; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3656,7 +3635,7 @@ fi
 
    
 echo $ac_n "checking for Makefile.in in c/src/tests/tmtests""... $ac_c" 1>&6
-echo "configure:3660: checking for Makefile.in in c/src/tests/tmtests" >&5
+echo "configure:3639: checking for Makefile.in in c/src/tests/tmtests" >&5
 if test -d $srcdir/c/src/tests/tmtests; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3672,7 +3651,7 @@ fi
    if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then
        
 echo $ac_n "checking for Makefile.in in c/src/tests/mptests""... $ac_c" 1>&6
-echo "configure:3676: checking for Makefile.in in c/src/tests/mptests" >&5
+echo "configure:3655: checking for Makefile.in in c/src/tests/mptests" >&5
 if test -d $srcdir/c/src/tests/mptests; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3689,7 +3668,7 @@ fi
    if test "$RTEMS_HAS_POSIX_API" = "yes"; then
      
 echo $ac_n "checking for Makefile.in in c/src/tests/psxtests""... $ac_c" 1>&6
-echo "configure:3693: checking for Makefile.in in c/src/tests/psxtests" >&5
+echo "configure:3672: checking for Makefile.in in c/src/tests/psxtests" >&5
 if test -d $srcdir/c/src/tests/psxtests; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3723,13 +3702,13 @@ fi
 
 if test "$RTEMS_HAS_HWAPI" = "yes"; then
   echo $ac_n "checking whether libwapi is present""... $ac_c" 1>&6
-echo "configure:3727: checking whether libwapi is present" >&5
+echo "configure:3706: checking whether libwapi is present" >&5
   if test -f ${srcdir}/c/src/lib/libhwapi/Makefile.in ; then
     echo "$ac_t""yes" 1>&6
     makefiles="$makefiles c/src/lib/libhwapi/Makefile"
     
 echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/analog""... $ac_c" 1>&6
-echo "configure:3733: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5
+echo "configure:3712: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5
 if test -d $srcdir/c/src/lib/libhwapi/analog; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3744,7 +3723,7 @@ fi
 
     
 echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/discrete""... $ac_c" 1>&6
-echo "configure:3748: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5
+echo "configure:3727: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5
 if test -d $srcdir/c/src/lib/libhwapi/discrete; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3759,7 +3738,7 @@ fi
 
     
 echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/drivers""... $ac_c" 1>&6
-echo "configure:3763: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5
+echo "configure:3742: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5
 if test -d $srcdir/c/src/lib/libhwapi/drivers; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3774,7 +3753,7 @@ fi
 
     
 echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory""... $ac_c" 1>&6
-echo "configure:3778: checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory" >&5
+echo "configure:3757: checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory" >&5
 if test -d $srcdir/c/src/lib/libhwapi/non_volatile_memory; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3789,7 +3768,7 @@ fi
 
     
 echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/serial""... $ac_c" 1>&6
-echo "configure:3793: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5
+echo "configure:3772: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5
 if test -d $srcdir/c/src/lib/libhwapi/serial; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3804,7 +3783,7 @@ fi
 
     
 echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/support""... $ac_c" 1>&6
-echo "configure:3808: checking for Makefile.in in c/src/lib/libhwapi/support" >&5
+echo "configure:3787: checking for Makefile.in in c/src/lib/libhwapi/support" >&5
 if test -d $srcdir/c/src/lib/libhwapi/support; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3819,7 +3798,7 @@ fi
 
     
 echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/wrapup""... $ac_c" 1>&6
-echo "configure:3823: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5
+echo "configure:3802: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5
 if test -d $srcdir/c/src/lib/libhwapi/wrapup; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3863,7 +3842,7 @@ fi
 # pick up all the Makefiles in required parts of the tree
 
 echo $ac_n "checking for Makefile.in in make""... $ac_c" 1>&6
-echo "configure:3867: checking for Makefile.in in make" >&5
+echo "configure:3846: checking for Makefile.in in make" >&5
 if test -d $srcdir/make; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3878,7 +3857,7 @@ fi
 
 
 echo $ac_n "checking for Makefile.in in c/src/lib/libchip""... $ac_c" 1>&6
-echo "configure:3882: checking for Makefile.in in c/src/lib/libchip" >&5
+echo "configure:3861: checking for Makefile.in in c/src/lib/libchip" >&5
 if test -d $srcdir/c/src/lib/libchip; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3893,7 +3872,7 @@ fi
 
 
 echo $ac_n "checking for Makefile.in in c/src/lib/libmisc""... $ac_c" 1>&6
-echo "configure:3897: checking for Makefile.in in c/src/lib/libmisc" >&5
+echo "configure:3876: checking for Makefile.in in c/src/lib/libmisc" >&5
 if test -d $srcdir/c/src/lib/libmisc; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3908,7 +3887,7 @@ fi
 
 
 echo $ac_n "checking for Makefile.in in c/src/tests/samples""... $ac_c" 1>&6
-echo "configure:3912: checking for Makefile.in in c/src/tests/samples" >&5
+echo "configure:3891: checking for Makefile.in in c/src/tests/samples" >&5
 if test -d $srcdir/c/src/tests/samples; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -4132,7 +4111,13 @@ s%@build_alias@%$build_alias%g
 s%@build_cpu@%$build_cpu%g
 s%@build_vendor@%$build_vendor%g
 s%@build_os@%$build_os%g
+s%@RTEMS_USE_OWN_PDIR@%$RTEMS_USE_OWN_PDIR%g
+s%@RTEMS_HAS_MULTIPROCESSING@%$RTEMS_HAS_MULTIPROCESSING%g
 s%@RTEMS_HAS_POSIX_API@%$RTEMS_HAS_POSIX_API%g
+s%@RTEMS_HAS_NETWORKING@%$RTEMS_HAS_NETWORKING%g
+s%@RTEMS_HAS_RDBG@%$RTEMS_HAS_RDBG%g
+s%@RTEMS_USE_MACROS@%$RTEMS_USE_MACROS%g
+s%@RTEMS_LIBC_DIR@%$RTEMS_LIBC_DIR%g
 s%@CAT@%$CAT%g
 s%@RM@%$RM%g
 s%@CP@%$CP%g
@@ -4162,19 +4147,14 @@ s%@RANLIB_FOR_TARGET@%$RANLIB_FOR_TARGET%g
 s%@OBJCOPY_FOR_TARGET@%$OBJCOPY_FOR_TARGET%g
 s%@SIZE_FOR_TARGET@%$SIZE_FOR_TARGET%g
 s%@STRIP_FOR_TARGET@%$STRIP_FOR_TARGET%g
+s%@RTEMS_GAS_CODE16@%$RTEMS_GAS_CODE16%g
 s%@CC@%$CC%g
 s%@EXEEXT@%$EXEEXT%g
 s%@GCCSED@%$GCCSED%g
 s%@subdirs@%$subdirs%g
-s%@RTEMS_GAS_CODE16@%$RTEMS_GAS_CODE16%g
+s%@RTEMS_HAS_HWAPI@%$RTEMS_HAS_HWAPI%g
 s%@rtems_cv_prog_cc_cross@%$rtems_cv_prog_cc_cross%g
 s%@RTEMS_BSP_LIST@%$RTEMS_BSP_LIST%g
-s%@RTEMS_LIBC_DIR@%$RTEMS_LIBC_DIR%g
-s%@RTEMS_USE_OWN_PDIR@%$RTEMS_USE_OWN_PDIR%g
-s%@RTEMS_HAS_MULTIPROCESSING@%$RTEMS_HAS_MULTIPROCESSING%g
-s%@RTEMS_HAS_NETWORKING@%$RTEMS_HAS_NETWORKING%g
-s%@RTEMS_HAS_RDBG@%$RTEMS_HAS_RDBG%g
-s%@RTEMS_USE_MACROS@%$RTEMS_USE_MACROS%g
 s%@RTEMS_HAS_CPLUSPLUS@%$RTEMS_HAS_CPLUSPLUS%g
 s%@RTEMS_USE_GCC272@%$RTEMS_USE_GCC272%g
 s%@BARE_CPU_CFLAGS@%$BARE_CPU_CFLAGS%g
diff --git a/make/Templates/Makefile.inc.in b/make/Templates/Makefile.inc.in
index c64b785dd5..1c01539aad 100644
--- a/make/Templates/Makefile.inc.in
+++ b/make/Templates/Makefile.inc.in
@@ -30,8 +30,8 @@ export SIZE
 export OBJCOPY
 
 RTEMS_HOST = @RTEMS_HOST@
-RTEMS_CUSTOM = $(prefix)/rtems/make/custom/$(RTEMS_BSP).cfg
-PROJECT_ROOT = $(prefix)/rtems/
+RTEMS_CUSTOM = $(prefix)/make/custom/$(RTEMS_BSP).cfg
+PROJECT_ROOT = $(prefix)/
 RTEMS_USE_OWN_PDIR = @RTEMS_USE_OWN_PDIR@
 RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@
 RTEMS_USE_MACROS = @RTEMS_USE_MACROS@
diff --git a/tools/cpu/generic/Makefile.am b/tools/cpu/generic/Makefile.am
index 476d6bab83..92f0ea787e 100644
--- a/tools/cpu/generic/Makefile.am
+++ b/tools/cpu/generic/Makefile.am
@@ -6,3 +6,4 @@ AUTOMAKE_OPTIONS = foreign
 ACLOCAL = @ACLOCAL@ -I $(RTEMS_TOPdir)/aclocal
 
 noinst_SCRIPTS=size_rtems
+include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/tools/cpu/generic/Makefile.in b/tools/cpu/generic/Makefile.in
index 41e91bee93..d7a05c1cf3 100644
--- a/tools/cpu/generic/Makefile.in
+++ b/tools/cpu/generic/Makefile.in
@@ -15,6 +15,14 @@
 #
 
 
+# $Id$
+
+# NOTE: This is a temporary work-around to keep 
+# "make debug" and "make debug_install" working.
+# Once automake is fully integrated these make targets 
+# and this file will probably be removed
+
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -96,7 +104,7 @@ TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../../../../../automake/local.am
 	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
@@ -232,6 +240,24 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
+debug-am:
+
+debug: debug-am
+
+debug_install-am:
+
+debug_install: debug_install-am
+
+profile-am:
+
+profile: profile-am
+
+profile_install-am:
+
+profile_install: profile_install-am
+
+.PHONY: debug debug_install profile profile_install
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/tools/cpu/generic/configure.in b/tools/cpu/generic/configure.in
index 9877ceabc3..7e144ad375 100644
--- a/tools/cpu/generic/configure.in
+++ b/tools/cpu/generic/configure.in
@@ -1,3 +1,7 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl  $Id$
+
 AC_INIT(size_rtems.in)
 AC_CONFIG_AUX_DIR(../../../../../..)
 
diff --git a/tools/cpu/hppa1.1/configure.in b/tools/cpu/hppa1.1/configure.in
index c846bc5a11..c361bf10bc 100644
--- a/tools/cpu/hppa1.1/configure.in
+++ b/tools/cpu/hppa1.1/configure.in
@@ -1,3 +1,7 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl  $Id$    
+
 AC_INIT(genoffsets.c)
 AC_CONFIG_AUX_DIR(../../../../../..)
 
diff --git a/tools/cpu/sh/configure.in b/tools/cpu/sh/configure.in
index 6ff5bb3e22..a93a660603 100644
--- a/tools/cpu/sh/configure.in
+++ b/tools/cpu/sh/configure.in
@@ -1,3 +1,7 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl  $Id$
+
 AC_INIT(shgen.c)
 AC_CONFIG_AUX_DIR(../../../../../..)
 
diff --git a/tools/cpu/unix/configure.in b/tools/cpu/unix/configure.in
index 19b8b548f0..302364be14 100644
--- a/tools/cpu/unix/configure.in
+++ b/tools/cpu/unix/configure.in
@@ -1,3 +1,7 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl  $Id$    
+
 AC_INIT(gensize.c)
 AC_CONFIG_AUX_DIR(../../../../../..)
 
diff --git a/tools/update/cipolish b/tools/update/cipolish
new file mode 100755
index 0000000000..61af53312c
--- /dev/null
+++ b/tools/update/cipolish
@@ -0,0 +1,119 @@
+#!/usr/bin/perl
+
+#
+# Perl script to beautify and enhance RTEMS configure.in
+#
+# Reads from stdin and writes to stdout
+#
+# usage: 
+# acpolish <configure.in >configure.in~
+# mv configure.in~ configure.in
+#
+# ATTENTION: This file contains embedded tabs
+
+my $nl_seen = 0 ;
+
+# find a relative up-path to a file $file, starting at directory $pre
+sub find_file
+{
+  my $pre = $_[0] ;
+  my $file= $_[1] ;
+
+  my $top = "." ;
+  if (not "$pre") { $pre = "." ; }
+
+  for ( $str = "$pre" . "/" . "$top" ;
+    ( -d "$str" ) ;
+    $str = "$pre" . "/" . "$top" )
+  {
+    if ( -f "${str}/${file}" )  
+    {
+      return $top ; 
+    }
+    if ( "$top" eq "." )
+    {
+      $top = ".." ;
+    }
+    else
+    {
+      $top .= "/.." ;
+    }
+  } ;
+  die "Can't find file ${file}\n" ;
+}
+
+# find relative up-path to configure.in
+my $rtems_cfg = find_file(".","VERSION");
+
+
+while( <> )
+{ 
+  if ( /^[ 	]*$/o )
+  {
+    $nl_seen = $nl_seen+1;
+  }
+
+  if ( /^[ 	]*AC_CONFIG_AUX_DIR\(.*\)[ 	]*$/o )
+  {
+    print "AC_CONFIG_AUX_DIR($rtems_cfg)\n" ;
+  }
+  elsif ( /^[ 	]*RTEMS_TOP\(.*\)[ 	]*$/o )
+  {
+    print "RTEMS_TOP($rtems_cfg)\n" ;
+  }
+  elsif ( /^[ 	]*AC_SUBST\(RTEMS_HAS_POSIX_API\)[ 	]*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*AC_SUBST\(RTEMS_HAS_HWAPI\)[ 	]*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*AC_SUBST\(RTEMS_USE_MACROS\)[ 	]*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*AC_SUBST\(RTEMS_HAS_MULTIPROCESSING\)[ 	]*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*AC_SUBST\(RTEMS_HAS_RDBG\)[ 	]*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*AC_SUBST\(RTEMS_USE_OWN_PDIR\)[ 	]*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*AC_SUBST\(RTEMS_HAS_NETWORKING\)[ 	]*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*AC_SUBST\(RTEMS_LIBC_DIR\)[ 	]*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*AC_SUBST\(PROJECT_ROOT\)[ 	]*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*AC_SUBST\(RTEMS_GAS_CODE16\)[ 	]*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*PROJECT_ROOT[ 	]*=.*$/o ) 
+  {
+    #remove the line
+  }
+  elsif ( /^[ 	]*$/o )
+  {
+    print "$_" if $nl_seen < 2 ;
+  }
+  else
+  {
+    print "$_" ;
+    $nl_seen = 0;
+  }
+} # while
+
+;1
diff --git a/tools/update/rtems-polish.sh b/tools/update/rtems-polish.sh
index fe8604e972..7a693928d9 100755
--- a/tools/update/rtems-polish.sh
+++ b/tools/update/rtems-polish.sh
@@ -1,8 +1,70 @@
 #!/bin/sh
 
+# $Id$
+
+#
+# Search RTEMS source tree for autoconf Makefile.ins and automake
+# Makefile.ams and run c/update-tools/acpolish rsp. c/update-tool/ampolish
+# on them.
+#
+# To be run from the toplevel directory of the source-tree
+#
+
+progname=`basename $0`
+
+perltools=c/update-tools
+ac_do=""
+am_do=""
+ci_do=""
+
+usage()
+{
+  echo
+  echo "usage: ./${perltools}/${progname} [-h][-ac|-am|-ci]";
+  echo
+  echo "options:"
+  echo "	-h .. display this message and exit";
+  echo "	-ac .. run acpolish on all autoconf Makefile.ins"
+  echo "	-am .. run ampolish on all automake Makefile.ams"
+  echo "	-ci .. run cipolish on all configure.in scripts"
+  echo
+  exit 1;
+}
+
+if test ! -f VERSION; then
+  echo "${progname}:"
+  echo "        Please change directory to RTEMS's toplevel directory"
+  exit 1;
+fi
+
+while test $# -gt 0; do
+case $1 in
+-h|--he|--hel|--help)
+  usage ;;
+-ac)
+  ac_do="yes";
+  shift ;;
+-am)
+  am_do="yes";
+  shift ;;
+-ci)
+  ci_do="yes";
+  shift ;;
+-*) echo "unknown option $1" ;
+  usage ;;
+*) echo "invalid parameter $1" ;
+  usage ;;
+esac
+done
+
+if test -z "$ac_do" && test -z "$am_do" && test -z "$ci_do"; then
+  usage
+fi
+
 pwd=`pwd`;
 
-ac_files=`find . -name Makefile.in`;
+if test -n "$ac_do"; then
+ac_files=`find . -name 'Makefile.in' -print`;
 for f in $ac_files; do
   i=`dirname $f`
   dest="$i"
@@ -10,21 +72,37 @@ for f in $ac_files; do
     echo "polishing : $dest/Makefile.in"
     ( cd $dest; 
       mv Makefile.in Makefile.in~;
-      $pwd/c/update-tools/acpolish <Makefile.in~ >Makefile.in
+      ${pwd}/${perltools}/acpolish <Makefile.in~ >Makefile.in
       rm Makefile.in~
     )
   fi
 done
+fi
 
-am_files=`find . -name Makefile.am`;
+if test -n "$am_do"; then
+am_files=`find . -name 'Makefile.am' -print`;
 for f in $am_files; do
   i=`dirname $f`
   dest="$i"
     echo "polishing : $dest/Makefile.am"
     ( cd $dest; 
       mv Makefile.am Makefile.am~;
-      $pwd/c/update-tools/ampolish <Makefile.am~ >Makefile.am
+      ${pwd}/${perltools}/ampolish <Makefile.am~ >Makefile.am
       rm Makefile.am~
     )
 done
+fi
 
+if test -n "$ci_do"; then
+ci_files=`find . -name 'configure.in' -print`;
+for f in $ci_files; do
+  i=`dirname $f`
+  dest="$i"
+    echo "polishing : $dest/configure.in"
+    ( cd $dest; 
+      mv configure.in configure.in~;
+      ${pwd}/${perltools}/cipolish <configure.in~ >configure.in
+      rm configure.in~
+    )
+done
+fi
-- 
cgit v1.2.3