Index: aclocal.m4
===================================================================
--- aclocal.m4	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ aclocal.m4	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -61,4 +61,5 @@
 ;;
 esac],[RTEMS_USE_OWN_PDIR=yes])
+AC_SUBST(RTEMS_USE_OWN_PDIR)dnl
 ])
 
@@ -74,4 +75,5 @@
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-multiprocessing option) ;;
 esac],[RTEMS_HAS_MULTIPROCESSING=no])
+AC_SUBST(RTEMS_HAS_MULTIPROCESSING)dnl
 ])
 
@@ -87,4 +89,5 @@
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-posix option) ;;
 esac],[RTEMS_HAS_POSIX_API=yes]) 
+AC_SUBST(RTEMS_HAS_POSIX_API)
 
 changequote(,)dnl
@@ -124,4 +127,5 @@
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-networking option) ;;
 esac],[RTEMS_HAS_NETWORKING=yes])
+AC_SUBST(RTEMS_HAS_NETWORKING)dnl
 ])
 
@@ -137,4 +141,5 @@
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-rdbg option) ;;
 esac],[RTEMS_HAS_RDBG=no])
+AC_SUBST(RTEMS_HAS_RDBG)dnl
 ])
 
@@ -150,4 +155,5 @@
   *)  AC_MSG_ERROR(bad value ${enableval} for disable-rtems-inlines option) ;;
 esac],[RTEMS_USE_MACROS=no])
+AC_SUBST(RTEMS_USE_MACROS)dnl
 ])
 
@@ -187,4 +193,5 @@
 [ RTEMS_LIBC_DIR="${enableval}" ; \
 test -d ${enableval} || AC_MSG_ERROR("$enableval is not a directory" ) ] )
+AC_SUBST(RTEMS_LIBC_DIR)dnl
 ])
 
@@ -704,5 +711,5 @@
 
 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,
@@ -720,5 +727,6 @@
     RTEMS_GAS_CODE16="$rtems_cv_prog_gas_code16"
   fi
-)
+  AC_SUBST(RTEMS_GAS_CODE16)
+])
 
 
@@ -887,4 +895,5 @@
     *)  AC_MSG_ERROR(bad value ${enableval} for hwapi option) ;;
   esac],[RTEMS_HAS_HWAPI=no])
+AC_SUBST(RTEMS_HAS_HWAPI)dnl
 ])dnl
 
Index: local/cygwin.m4
===================================================================
--- aclocal/cygwin.m4	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ 	(revision )
@@ -1,21 +1,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])
-
Index: aclocal/enable-gmake-print.m4
===================================================================
--- aclocal/enable-gmake-print.m4	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ aclocal/enable-gmake-print.m4	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -13,3 +13,4 @@
 ;;
 esac],[RTEMS_USE_OWN_PDIR=yes])
+AC_SUBST(RTEMS_USE_OWN_PDIR)dnl
 ])
Index: aclocal/enable-hwapi.m4
===================================================================
--- aclocal/enable-hwapi.m4	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ aclocal/enable-hwapi.m4	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -12,3 +12,4 @@
     *)  AC_MSG_ERROR(bad value ${enableval} for hwapi option) ;;
   esac],[RTEMS_HAS_HWAPI=no])
+AC_SUBST(RTEMS_HAS_HWAPI)dnl
 ])dnl
Index: aclocal/enable-inlines.m4
===================================================================
--- aclocal/enable-inlines.m4	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ aclocal/enable-inlines.m4	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -10,3 +10,4 @@
   *)  AC_MSG_ERROR(bad value ${enableval} for disable-rtems-inlines option) ;;
 esac],[RTEMS_USE_MACROS=no])
+AC_SUBST(RTEMS_USE_MACROS)dnl
 ])
Index: aclocal/enable-libcdir.m4
===================================================================
--- aclocal/enable-libcdir.m4	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ aclocal/enable-libcdir.m4	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -7,3 +7,4 @@
 [ RTEMS_LIBC_DIR="${enableval}" ; \
 test -d ${enableval} || AC_MSG_ERROR("$enableval is not a directory" ) ] )
+AC_SUBST(RTEMS_LIBC_DIR)dnl
 ])
Index: aclocal/enable-multiprocessing.m4
===================================================================
--- aclocal/enable-multiprocessing.m4	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ aclocal/enable-multiprocessing.m4	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -10,3 +10,4 @@
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-multiprocessing option) ;;
 esac],[RTEMS_HAS_MULTIPROCESSING=no])
+AC_SUBST(RTEMS_HAS_MULTIPROCESSING)dnl
 ])
Index: aclocal/enable-networking.m4
===================================================================
--- aclocal/enable-networking.m4	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ aclocal/enable-networking.m4	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -10,3 +10,4 @@
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-networking option) ;;
 esac],[RTEMS_HAS_NETWORKING=yes])
+AC_SUBST(RTEMS_HAS_NETWORKING)dnl
 ])
Index: aclocal/enable-posix.m4
===================================================================
--- aclocal/enable-posix.m4	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ aclocal/enable-posix.m4	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -10,4 +10,5 @@
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-posix option) ;;
 esac],[RTEMS_HAS_POSIX_API=yes]) 
+AC_SUBST(RTEMS_HAS_POSIX_API)
 
 changequote(,)dnl
Index: aclocal/enable-rdbg.m4
===================================================================
--- aclocal/enable-rdbg.m4	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ aclocal/enable-rdbg.m4	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -10,3 +10,4 @@
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-rdbg option) ;;
 esac],[RTEMS_HAS_RDBG=no])
+AC_SUBST(RTEMS_HAS_RDBG)dnl
 ])
Index: local/exeext.m4
===================================================================
--- aclocal/exeext.m4	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ 	(revision )
@@ -1,38 +1,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)])
-
Index: aclocal/i386-gas-code16.m4
===================================================================
--- aclocal/i386-gas-code16.m4	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ aclocal/i386-gas-code16.m4	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -7,5 +7,5 @@
 
 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,
@@ -23,4 +23,5 @@
     RTEMS_GAS_CODE16="$rtems_cv_prog_gas_code16"
   fi
-)
+  AC_SUBST(RTEMS_GAS_CODE16)
+])
 
Index: autogen
===================================================================
--- autogen	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ autogen	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -19,10 +19,25 @@
 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";
@@ -38,12 +53,6 @@
 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
@@ -58,3 +67,2 @@
 )
 done
-
Index: c/src/exec/score/tools/generic/Makefile.am
===================================================================
--- c/src/exec/score/tools/generic/Makefile.am	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ c/src/exec/score/tools/generic/Makefile.am	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -7,2 +7,3 @@
 
 noinst_SCRIPTS=size_rtems
+include $(top_srcdir)/../../../../../../automake/local.am
Index: c/src/exec/score/tools/generic/Makefile.in
===================================================================
--- c/src/exec/score/tools/generic/Makefile.in	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ c/src/exec/score/tools/generic/Makefile.in	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -14,4 +14,12 @@
 # $Id$
 #
+
+
+# $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
 
 
@@ -97,5 +105,5 @@
 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
 
@@ -233,4 +241,22 @@
 
 
+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.
Index: c/src/exec/score/tools/generic/configure.in
===================================================================
--- c/src/exec/score/tools/generic/configure.in	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ c/src/exec/score/tools/generic/configure.in	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -1,2 +1,6 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl  $Id$
+
 AC_INIT(size_rtems.in)
 AC_CONFIG_AUX_DIR(../../../../../..)
Index: c/src/exec/score/tools/hppa1.1/configure.in
===================================================================
--- c/src/exec/score/tools/hppa1.1/configure.in	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ c/src/exec/score/tools/hppa1.1/configure.in	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -1,2 +1,6 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl  $Id$    
+
 AC_INIT(genoffsets.c)
 AC_CONFIG_AUX_DIR(../../../../../..)
Index: c/src/exec/score/tools/sh/configure.in
===================================================================
--- c/src/exec/score/tools/sh/configure.in	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ c/src/exec/score/tools/sh/configure.in	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -1,2 +1,6 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl  $Id$
+
 AC_INIT(shgen.c)
 AC_CONFIG_AUX_DIR(../../../../../..)
Index: c/src/exec/score/tools/unix/configure.in
===================================================================
--- c/src/exec/score/tools/unix/configure.in	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ c/src/exec/score/tools/unix/configure.in	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -1,2 +1,6 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl  $Id$    
+
 AC_INIT(gensize.c)
 AC_CONFIG_AUX_DIR(../../../../../..)
Index: c/update-tools/cipolish
===================================================================
--- c/update-tools/cipolish	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
+++ c/update-tools/cipolish	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -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
Index: c/update-tools/rtems-polish.sh
===================================================================
--- c/update-tools/rtems-polish.sh	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ c/update-tools/rtems-polish.sh	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -1,7 +1,69 @@
 #!/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`
@@ -11,11 +73,13 @@
     ( 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`
@@ -24,7 +88,21 @@
     ( 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
Index: configure
===================================================================
--- configure	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ configure	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -1,26 +1,3 @@
 #! /bin/sh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 # Guess values for system-dependent variables and create Makefiles.
@@ -588,5 +565,5 @@
 
 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 | \
@@ -603,5 +580,5 @@
 
 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
@@ -676,5 +653,5 @@
 
 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
@@ -697,5 +674,5 @@
 
 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
@@ -715,5 +692,5 @@
 
 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
@@ -788,4 +765,5 @@
 fi
  
+
 
 case "${target}" in
@@ -921,5 +899,5 @@
 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
@@ -956,5 +934,5 @@
 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
@@ -991,5 +969,5 @@
 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
@@ -1026,5 +1004,5 @@
 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
@@ -1061,5 +1039,5 @@
 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
@@ -1094,5 +1072,5 @@
 
 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
@@ -1117,5 +1095,5 @@
 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
@@ -1152,5 +1130,5 @@
 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
@@ -1196,5 +1174,5 @@
 # ./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
@@ -1252,5 +1230,5 @@
 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
@@ -1294,5 +1272,5 @@
 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
@@ -1330,5 +1308,5 @@
 
 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
@@ -1347,5 +1325,5 @@
 
 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
@@ -1367,5 +1345,5 @@
 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
@@ -1402,5 +1380,5 @@
 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
@@ -1438,5 +1416,5 @@
 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
@@ -1475,5 +1453,5 @@
 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
@@ -1517,5 +1495,5 @@
 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
@@ -1567,5 +1545,5 @@
 
 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
@@ -1598,5 +1576,5 @@
 # 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
@@ -1660,5 +1638,5 @@
 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
@@ -1704,5 +1682,5 @@
 
 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
@@ -1715,10 +1693,10 @@
 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.
@@ -1746,10 +1724,10 @@
 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
@@ -1760,5 +1738,5 @@
 #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
@@ -1775,5 +1753,5 @@
   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
@@ -1817,5 +1795,5 @@
 
 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
@@ -1838,5 +1816,5 @@
 
 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
@@ -1879,5 +1857,5 @@
 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
@@ -1923,5 +1901,5 @@
 
 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
@@ -1934,10 +1912,10 @@
 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.
@@ -1965,10 +1943,10 @@
 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
@@ -1979,5 +1957,5 @@
 #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
@@ -1994,5 +1972,5 @@
   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
@@ -2048,5 +2026,5 @@
   
 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
@@ -2081,5 +2059,5 @@
     # 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
@@ -2098,5 +2076,5 @@
 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
@@ -2135,5 +2113,5 @@
   
 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
@@ -2168,5 +2146,5 @@
     # 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
@@ -2185,5 +2163,5 @@
 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
@@ -2222,5 +2200,5 @@
   
 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
@@ -2255,5 +2233,5 @@
     # 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
@@ -2272,5 +2250,5 @@
 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
@@ -2309,5 +2287,5 @@
   
 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
@@ -2342,5 +2320,5 @@
     # 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
@@ -2359,5 +2337,5 @@
 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
@@ -2397,5 +2375,5 @@
   
 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
@@ -2430,5 +2408,5 @@
     # 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
@@ -2447,5 +2425,5 @@
 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
@@ -2486,5 +2464,5 @@
     
 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
@@ -2495,6 +2473,6 @@
 { 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
@@ -2521,5 +2499,5 @@
   
 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
@@ -2554,5 +2532,5 @@
     # 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
@@ -2571,5 +2549,5 @@
 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
@@ -2608,5 +2586,5 @@
   
 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
@@ -2641,5 +2619,5 @@
     # 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
@@ -2658,5 +2636,5 @@
 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
@@ -2695,5 +2673,5 @@
   
 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
@@ -2728,5 +2706,5 @@
     # 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
@@ -2745,5 +2723,5 @@
 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
@@ -2782,7 +2760,7 @@
 
 
-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
@@ -2794,5 +2772,5 @@
          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
@@ -2804,4 +2782,5 @@
     RTEMS_GAS_CODE16="$rtems_cv_prog_gas_code16"
   fi
+  
 
 
@@ -2809,5 +2788,5 @@
 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
@@ -2839,5 +2818,5 @@
 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
@@ -2890,5 +2869,5 @@
 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
@@ -2922,5 +2901,5 @@
 
 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
@@ -2933,10 +2912,10 @@
 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.
@@ -2964,10 +2943,10 @@
 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
@@ -2978,5 +2957,5 @@
 #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
@@ -2997,5 +2976,5 @@
 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
@@ -3029,10 +3008,10 @@
 
 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"
 
@@ -3045,5 +3024,5 @@
 ; 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
@@ -3062,10 +3041,10 @@
 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"
 
@@ -3074,5 +3053,5 @@
 ; 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
@@ -3093,5 +3072,5 @@
 
 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
@@ -3103,5 +3082,5 @@
   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
@@ -3142,5 +3121,5 @@
 
 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
@@ -3151,5 +3130,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3154 "configure"
+#line 3133 "configure"
 #include "confdefs.h"
 
@@ -3177,5 +3156,5 @@
 
 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"
@@ -3200,5 +3179,5 @@
 
 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
@@ -3209,5 +3188,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3212 "configure"
+#line 3191 "configure"
 #include "confdefs.h"
 
@@ -3225,5 +3204,5 @@
 
 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"
@@ -3248,5 +3227,5 @@
 
 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
@@ -3257,5 +3236,5 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3260 "configure"
+#line 3239 "configure"
 #include "confdefs.h"
 
@@ -3273,5 +3252,5 @@
 
 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"
@@ -3305,5 +3284,5 @@
 
 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`;
@@ -3320,5 +3299,5 @@
 
 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`;
@@ -3335,5 +3314,5 @@
 
 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`;
@@ -3352,5 +3331,5 @@
   
 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`;
@@ -3374,5 +3353,5 @@
   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
@@ -3439,5 +3418,5 @@
         
 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`;
@@ -3454,5 +3433,5 @@
         
 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`;
@@ -3484,5 +3463,5 @@
 
 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`;
@@ -3501,5 +3480,5 @@
   
 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`;
@@ -3532,10 +3511,10 @@
 # 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`;
@@ -3552,5 +3531,5 @@
   
 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`;
@@ -3568,5 +3547,5 @@
     
 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`;
@@ -3592,5 +3571,5 @@
 # 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.
@@ -3610,5 +3589,5 @@
 
 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`;
@@ -3627,5 +3606,5 @@
    
 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`;
@@ -3642,5 +3621,5 @@
    
 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`;
@@ -3657,5 +3636,5 @@
    
 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`;
@@ -3673,5 +3652,5 @@
        
 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`;
@@ -3690,5 +3669,5 @@
      
 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`;
@@ -3724,5 +3703,5 @@
 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
@@ -3730,5 +3709,5 @@
     
 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`;
@@ -3745,5 +3724,5 @@
     
 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`;
@@ -3760,5 +3739,5 @@
     
 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`;
@@ -3775,5 +3754,5 @@
     
 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`;
@@ -3790,5 +3769,5 @@
     
 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`;
@@ -3805,5 +3784,5 @@
     
 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`;
@@ -3820,5 +3799,5 @@
     
 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`;
@@ -3864,5 +3843,5 @@
 
 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`;
@@ -3879,5 +3858,5 @@
 
 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`;
@@ -3894,5 +3873,5 @@
 
 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`;
@@ -3909,5 +3888,5 @@
 
 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`;
@@ -4133,5 +4112,11 @@
 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
@@ -4163,17 +4148,12 @@
 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
Index: make/Templates/Makefile.inc.in
===================================================================
--- make/Templates/Makefile.inc.in	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ make/Templates/Makefile.inc.in	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -31,6 +31,6 @@
 
 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@
Index: tools/cpu/generic/Makefile.am
===================================================================
--- tools/cpu/generic/Makefile.am	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ tools/cpu/generic/Makefile.am	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -7,2 +7,3 @@
 
 noinst_SCRIPTS=size_rtems
+include $(top_srcdir)/../../../../../../automake/local.am
Index: tools/cpu/generic/Makefile.in
===================================================================
--- tools/cpu/generic/Makefile.in	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ tools/cpu/generic/Makefile.in	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -14,4 +14,12 @@
 # $Id$
 #
+
+
+# $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
 
 
@@ -97,5 +105,5 @@
 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
 
@@ -233,4 +241,22 @@
 
 
+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.
Index: tools/cpu/generic/configure.in
===================================================================
--- tools/cpu/generic/configure.in	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ tools/cpu/generic/configure.in	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -1,2 +1,6 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl  $Id$
+
 AC_INIT(size_rtems.in)
 AC_CONFIG_AUX_DIR(../../../../../..)
Index: tools/cpu/hppa1.1/configure.in
===================================================================
--- tools/cpu/hppa1.1/configure.in	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ tools/cpu/hppa1.1/configure.in	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -1,2 +1,6 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl  $Id$    
+
 AC_INIT(genoffsets.c)
 AC_CONFIG_AUX_DIR(../../../../../..)
Index: tools/cpu/sh/configure.in
===================================================================
--- tools/cpu/sh/configure.in	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ tools/cpu/sh/configure.in	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -1,2 +1,6 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl  $Id$
+
 AC_INIT(shgen.c)
 AC_CONFIG_AUX_DIR(../../../../../..)
Index: tools/cpu/unix/configure.in
===================================================================
--- tools/cpu/unix/configure.in	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ tools/cpu/unix/configure.in	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -1,2 +1,6 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl  $Id$    
+
 AC_INIT(gensize.c)
 AC_CONFIG_AUX_DIR(../../../../../..)
Index: tools/update/cipolish
===================================================================
--- tools/update/cipolish	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
+++ tools/update/cipolish	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -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
Index: tools/update/rtems-polish.sh
===================================================================
--- tools/update/rtems-polish.sh	(revision 77c81fd2a1dedce6aad36204cf9ddbaf794c4f2f)
+++ tools/update/rtems-polish.sh	(revision 7e03d107d780ca0e1690a7cdecfb35834832c3d5)
@@ -1,7 +1,69 @@
 #!/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`
@@ -11,11 +73,13 @@
     ( 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`
@@ -24,7 +88,21 @@
     ( 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
