Serious cleanup to reduce the number of explicitly listed Makefiles,

eliminated autoconf looking for commands which are unused, and reduce the
number of Makefiles generated.

4 files changed, 461 insertions, 1411 deletions

diff --git a/Makefile.in b/Makefile.in
index db4d953507..466a35754e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,8 +35,6 @@ LD_FOR_TARGET = $(program_prefix)ld
 OBJCOPY_FOR_TARGET = $(program_prefix)objcopy
 SIZE_FOR_TARGET = $(program_prefix)size
 
-AWK = @AWK@
-
 RTEMS_ROOT = @RTEMS_ROOT@
 RTEMS_HOST = @RTEMS_HOST@
 PROJECT_ROOT = @PROJECT_ROOT@
@@ -67,12 +65,10 @@ EXIT_CMD = exit 1
 # Don't pass flags from previous make - especially NOT CFLAGS 
 override MAKEFLAGS=
 
-# CVS formerly was xxx -- using CVS covers up a weird feature of the aclocal
-#  file in that it thinks CVS directories need a Makefile generated.
 $(MTARGETS): make_subdir
 	BASEDIR=`pwd`; \
-	for bsp in $(RTEMS_BSP) CVS; \
-	do if [ $$bsp != CVS ] ; then  \
+	for bsp in $(RTEMS_BSP) xxx; \
+	do if [ $$bsp != xxx ] ; then  \
 	    cd $$BASEDIR; \
 	    cmd="cd c; $(MAKE) RTEMS_BSP=$$bsp $(FLAGS_TO_PASS) \
 	    RTEMS_CUSTOM=$(RTEMS_ROOT)/make/custom/$$bsp.cfg \
@@ -97,7 +93,7 @@ $(MTARGETS): make_subdir
             \"RTEMS_USE_MACROS=$(RTEMS_USE_MACROS)\" \
             \"RTEMS_USE_GCC272=$(RTEMS_USE_GCC272)\" \
             \"RTEMS_LIBC_DIR=$(RTEMS_LIBC_DIR)\" \
-            \"AWK=$(AWK)\" $@" ; \
+            $@" ; \
 	    eval $$cmd || $(EXIT_CMD); \
 	fi; done; 
 
@@ -107,7 +103,7 @@ clean_modules:
 
 make_subdir:
 	if [ ! -d make ] ; then \
-	  (cd $(srcdir)/c; tar cf - make/compilers make/custom make/os \
+	  (cd $(srcdir)/c; tar cf - make/compilers make/custom \
 	        make/directory.cfg make/leaf.cfg make/lib.cfg make/main.cfg \
 		make/Templates/Makefile.dir \
 	        make/Templates/Makefile.leaf make/Templates/Makefile.lib) | \
diff --git a/aclocal.m4 b/aclocal.m4
index e8f71d16ad..03c982d629 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
 dnl some macros for rtems host configuration checks
 dnl
-dnl Author: Ralf Corsepius (corsepiu@faw.uni-ulm.de), 97/11/09
+dnl Author: Ralf Corsepius (corsepiu@faw.uni-ulm.de), 97/11/29
 dnl
 
 dnl macro to detect mkdir
@@ -40,62 +40,44 @@ rm -rf conftestdata
 AC_MSG_RESULT($rtems_cv_prog_MKDIR_M)
 ])
 
-dnl RTEMS_CHECK_MAKEFILE_T(path)
-dnl Private macro of RTEMS_CHECK_MAKEFILE
-AC_DEFUN(RTEMS_CHECK_MAKEFILE_T,
-[ test -f $srcdir/$1/Makefile.in && \
-    makefiles="$makefiles $1/Makefile"
-])
-
-dnl RTEMS_CHECK_MAKEFILE_R(path,temp,callback)
-dnl Private macro of RTEMS_CHECK_MAKEFILE
-dnl $1 path prefix
-dnl $2 temporary variable
-dnl $3 callback
-AC_DEFUN(RTEMS_CHECK_MAKEFILE_R,
-[ RTEMS_CHECK_MAKEFILE_T($1)
-  $2list=`ls $srcdir/$1`
-  for $2 in $$2list; do
-    if test -d "$srcdir/$1/$$2"; then
-      $3
-    fi
-  done
+dnl RTEMS_CHECK_FILES_IN(path,file,var)
+dnl path .. path relative to srcdir, where to start searching for files
+dnl file .. name of the files to search for
+dnl var  .. shell variable to append found files
+AC_DEFUN(RTEMS_CHECK_FILES_IN,
+[
+AC_MSG_CHECKING(for $2 in $1)
+if test -d $srcdir/$1; then
+  rtems_av_save_dir=`pwd`;
+  cd $srcdir;
+  rtems_av_tmp=`find $1 -name $2 -follow -print | sed 's%\.in%%' | sort`;
+  $3="$$3 $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  AC_MSG_RESULT(done)
+else
+  AC_MSG_RESULT(no)
+fi
 ])
 
 dnl RTEMS_CHECK_MAKEFILE(path)
-dnl Check for Makefile.in's within the directory starting
+dnl Search for Makefile.in's within the directory starting
 dnl at path and append an entry for Makefile to global variable 
 dnl "makefiles" (from configure.in) for each Makefile.in found
 dnl 
-dnl NOTE: This function should be called recursivly, but m4-macro
-dnl expansion doesn't allow recursive macros. Therefore this
-dnl macro is expanded into a nonrecursive macro, limited to
-dnl a descrete directory depth, that should be sufficent.
-dnl 
 AC_DEFUN(RTEMS_CHECK_MAKEFILE,
-[ AC_MSG_CHECKING(for Makefiles in $1)
-  if test -d $srcdir/$1; then
-    RTEMS_CHECK_MAKEFILE_R($1,item,
-      RTEMS_CHECK_MAKEFILE_R($1/$item,item0,
-        RTEMS_CHECK_MAKEFILE_T($1/$item/$item0)
-      )
-    )
-    AC_MSG_RESULT(done)
-  else
-    AC_MSG_RESULT(no)
-  fi
+[RTEMS_CHECK_FILES_IN($1,Makefile.in,makefiles)
 ])
 
 dnl canonicalize target name
-dnl NOTE: Most rtems targets do not fullfil autoconf 
-dnl targets naming conventions "processor-vendor-os"
+dnl NOTE: Most rtems targets do not fullfil autoconf's
+dnl target naming conventions "processor-vendor-os"
 dnl Therefore autoconf's AC_CANONICAL_TARGET will fail for them
 dnl and we have to fix it for rtems ourselves 
 
 AC_DEFUN(RTEMS_CANONICAL_TARGET_CPU,
 [AC_MSG_CHECKING(rtems target cpu)
 changequote(<<, >>)dnl
-target_cpu=`echo $target | /usr/bin/sed 's%^\([^-]*\)-\(.*\)$%\1%'`
+target_cpu=`echo $target | sed 's%^\([^-]*\)-\(.*\)$%\1%'`
 changequote([, ])dnl
 AC_MSG_RESULT($target_cpu)
 ])
diff --git a/configure b/configure
index 31fe95d7a6..196f6498f3 100644
--- a/configure
+++ b/configure
@@ -27,7 +27,7 @@ ac_help="$ac_help
   --disable-rtems-inlines 	    disable RTEMS inline functions (use macros)"
 ac_help="$ac_help
 \
-  --enable-cpp                           enable C++ support, and build the rtems++ library"
+  --enable-cpp            enable C++ support, and build the rtems++ library"
 ac_help="$ac_help
 \
   --enable-gcc28		    enable use of gcc 2.8.x features"
@@ -39,10 +39,10 @@ ac_help="$ac_help
   --disable-tests 	     	    disable tests"
 ac_help="$ac_help
 \
-  --enable-hwapi		    enable hardware API library"
+    --enable-hwapi		    enable hardware API library"
 ac_help="$ac_help
 \
-  --enable-rtemsbsp=bsp1 bsp2 ..   prefix for cross-tools"
+    --enable-rtemsbsp=bsp1 bsp2 ..   BSPs to include in build"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -551,209 +551,8 @@ fi
 
 
 
-i386_mk="c/src/exec/score/cpu/i386/Makefile \
-c/src/lib/libbsp/i386/Makefile \
-c/src/lib/libbsp/i386/force386/Makefile \
-c/src/lib/libbsp/i386/force386/clock/Makefile \
-c/src/lib/libbsp/i386/force386/console/Makefile \
-c/src/lib/libbsp/i386/force386/include/Makefile \
-c/src/lib/libbsp/i386/force386/shmsupp/Makefile \
-c/src/lib/libbsp/i386/force386/startup/Makefile \
-c/src/lib/libbsp/i386/force386/timer/Makefile \
-c/src/lib/libbsp/i386/force386/wrapup/Makefile \
-c/src/lib/libbsp/i386/i386ex/Makefile \
-c/src/lib/libbsp/i386/i386ex/clock/Makefile \
-c/src/lib/libbsp/i386/i386ex/console/Makefile \
-c/src/lib/libbsp/i386/i386ex/include/Makefile \
-c/src/lib/libbsp/i386/i386ex/startup/Makefile \
-c/src/lib/libbsp/i386/i386ex/timer/Makefile \
-c/src/lib/libbsp/i386/i386ex/wrapup/Makefile \
-c/src/lib/start/i386/Makefile"
-
-i386_go32_mk="c/src/exec/score/cpu/i386/Makefile \
-c/src/lib/libbsp/i386/Makefile \
-c/src/lib/libbsp/i386/go32/Makefile \
-c/src/lib/libbsp/i386/go32/clock/Makefile \
-c/src/lib/libbsp/i386/go32/console/Makefile \
-c/src/lib/libbsp/i386/go32/include/Makefile \
-c/src/lib/libbsp/i386/go32/startup/Makefile \
-c/src/lib/libbsp/i386/go32/timer/Makefile \
-c/src/lib/libbsp/i386/go32/wrapup/Makefile"
-
-ka9q_mk="c/src/lib/libka9q/Makefile"
-
-rtemscpp_mk="c/src/lib/librtems++/Makefile"
-
-hwapi_mk="\
-c/src/lib/libhwapi/Makefile \
-c/src/lib/libhwapi/eeprom/Makefile \
-c/src/lib/libhwapi/eeprom/wrapup/Makefile \
-c/src/lib/libhwapi/eeprom/eeprom/Makefile \
-c/src/lib/libhwapi/drivers/Makefile \
-c/src/lib/libhwapi/drivers/vmebus/Makefile \
-c/src/lib/libhwapi/drivers/vmebus/dmv202/Makefile \
-c/src/lib/libhwapi/drivers/vmebus/dmv536/Makefile \
-c/src/lib/libhwapi/drivers/vmebus/dmv666/Makefile \
-c/src/lib/libhwapi/drivers/vmebus/wrapup/Makefile \
-c/src/lib/libhwapi/serial/Makefile \
-c/src/lib/libhwapi/serial/default/Makefile \
-c/src/lib/libhwapi/serial/stream/Makefile \
-c/src/lib/libhwapi/serial/template/Makefile \
-c/src/lib/libhwapi/serial/wrapup/Makefile \
-c/src/lib/libhwapi/serial/channel/Makefile \
-c/src/lib/libhwapi/discrete/Makefile \
-c/src/lib/libhwapi/discrete/tools/Makefile \
-c/src/lib/libhwapi/discrete/relay/Makefile \
-c/src/lib/libhwapi/discrete/wrapup/Makefile \
-c/src/lib/libhwapi/discrete/greycode/Makefile \
-c/src/lib/libhwapi/discrete/discrete_in/Makefile \
-c/src/lib/libhwapi/discrete/discrete_out/Makefile \
-c/src/lib/libhwapi/discrete/discrete_input/Makefile \
-c/src/lib/libhwapi/discrete/discrete_output/Makefile \
-c/src/lib/libhwapi/discrete/discrete_flag/Makefile \
-c/src/lib/libhwapi/discrete/discrete_bitfield/Makefile \
-c/src/lib/libhwapi/analog/Makefile \
-c/src/lib/libhwapi/analog/dac/Makefile \
-c/src/lib/libhwapi/analog/wrapup/Makefile \
-c/src/lib/libhwapi/analog/linear_dac/Makefile \
-c/src/lib/libhwapi/analog/linear_adc/Makefile \
-c/src/lib/libhwapi/analog/adc/Makefile \
-c/src/lib/libhwapi/wrapup/Makefile \
-c/src/lib/libhwapi/support/Makefile \
-c/src/lib/libhwapi/support/chain/Makefile \
-c/src/lib/libhwapi/support/checksum/Makefile \
-c/src/lib/libhwapi/support/wrapup/Makefile \
-c/src/lib/libhwapi/support/dumpbuf/Makefile"
-
-tests_mk="c/src/tests/libtests/Makefile \
-c/src/tests/libtests/cpuuse/Makefile \
-c/src/tests/libtests/malloctest/Makefile \
-c/src/tests/libtests/monitor/Makefile \
-c/src/tests/libtests/rtmonuse/Makefile \
-c/src/tests/libtests/stackchk/Makefile \
-c/src/tests/libtests/termios/Makefile \
-c/src/tests/libtests/rtems++/Makefile \
-c/src/tests/mptests/Makefile \
-c/src/tests/mptests/mp01/Makefile \
-c/src/tests/mptests/mp01/node1/Makefile \
-c/src/tests/mptests/mp01/node2/Makefile \
-c/src/tests/mptests/mp02/Makefile \
-c/src/tests/mptests/mp02/node1/Makefile \
-c/src/tests/mptests/mp02/node2/Makefile \
-c/src/tests/mptests/mp03/Makefile \
-c/src/tests/mptests/mp03/node1/Makefile \
-c/src/tests/mptests/mp03/node2/Makefile \
-c/src/tests/mptests/mp04/Makefile \
-c/src/tests/mptests/mp04/node1/Makefile \
-c/src/tests/mptests/mp04/node2/Makefile \
-c/src/tests/mptests/mp05/Makefile \
-c/src/tests/mptests/mp05/node1/Makefile \
-c/src/tests/mptests/mp05/node2/Makefile \
-c/src/tests/mptests/mp06/Makefile \
-c/src/tests/mptests/mp06/node1/Makefile \
-c/src/tests/mptests/mp06/node2/Makefile \
-c/src/tests/mptests/mp07/Makefile \
-c/src/tests/mptests/mp07/node1/Makefile \
-c/src/tests/mptests/mp07/node2/Makefile \
-c/src/tests/mptests/mp08/Makefile \
-c/src/tests/mptests/mp08/node1/Makefile \
-c/src/tests/mptests/mp08/node2/Makefile \
-c/src/tests/mptests/mp09/Makefile \
-c/src/tests/mptests/mp09/node1/Makefile \
-c/src/tests/mptests/mp09/node2/Makefile \
-c/src/tests/mptests/mp10/Makefile \
-c/src/tests/mptests/mp10/node1/Makefile \
-c/src/tests/mptests/mp10/node2/Makefile \
-c/src/tests/mptests/mp11/Makefile \
-c/src/tests/mptests/mp11/node1/Makefile \
-c/src/tests/mptests/mp11/node2/Makefile \
-c/src/tests/mptests/mp12/Makefile \
-c/src/tests/mptests/mp12/node1/Makefile \
-c/src/tests/mptests/mp12/node2/Makefile \
-c/src/tests/mptests/mp13/Makefile \
-c/src/tests/mptests/mp13/node1/Makefile \
-c/src/tests/mptests/mp13/node2/Makefile \
-c/src/tests/mptests/mp14/Makefile \
-c/src/tests/mptests/mp14/node1/Makefile \
-c/src/tests/mptests/mp14/node2/Makefile \
-c/src/tests/psxtests/Makefile \
-c/src/tests/psxtests/psx01/Makefile \
-c/src/tests/psxtests/psx02/Makefile \
-c/src/tests/psxtests/psx03/Makefile \
-c/src/tests/psxtests/psx04/Makefile \
-c/src/tests/psxtests/psx05/Makefile \
-c/src/tests/psxtests/psx06/Makefile \
-c/src/tests/psxtests/psx07/Makefile \
-c/src/tests/psxtests/psx08/Makefile \
-c/src/tests/psxtests/psx09/Makefile \
-c/src/tests/psxtests/psx10/Makefile \
-c/src/tests/psxtests/psx11/Makefile \
-c/src/tests/psxtests/psx12/Makefile \
-c/src/tests/psxtests/psxhdrs/Makefile \
-c/src/tests/psxtests/support/Makefile \
-c/src/tests/psxtests/support/include/Makefile \
-c/src/tests/sptests/Makefile \
-c/src/tests/sptests/sp01/Makefile \
-c/src/tests/sptests/sp02/Makefile \
-c/src/tests/sptests/sp03/Makefile \
-c/src/tests/sptests/sp04/Makefile \
-c/src/tests/sptests/sp05/Makefile \
-c/src/tests/sptests/sp06/Makefile \
-c/src/tests/sptests/sp07/Makefile \
-c/src/tests/sptests/sp08/Makefile \
-c/src/tests/sptests/sp09/Makefile \
-c/src/tests/sptests/sp11/Makefile \
-c/src/tests/sptests/sp12/Makefile \
-c/src/tests/sptests/sp13/Makefile \
-c/src/tests/sptests/sp14/Makefile \
-c/src/tests/sptests/sp15/Makefile \
-c/src/tests/sptests/sp16/Makefile \
-c/src/tests/sptests/sp17/Makefile \
-c/src/tests/sptests/sp19/Makefile \
-c/src/tests/sptests/sp20/Makefile \
-c/src/tests/sptests/sp21/Makefile \
-c/src/tests/sptests/sp22/Makefile \
-c/src/tests/sptests/sp23/Makefile \
-c/src/tests/sptests/sp24/Makefile \
-c/src/tests/sptests/sp25/Makefile \
-c/src/tests/sptests/spfatal/Makefile \
-c/src/tests/sptests/spsize/Makefile \
-c/src/tests/tmtests/Makefile \
-c/src/tests/tmtests/include/Makefile \
-c/src/tests/tmtests/tm01/Makefile \
-c/src/tests/tmtests/tm02/Makefile \
-c/src/tests/tmtests/tm03/Makefile \
-c/src/tests/tmtests/tm04/Makefile \
-c/src/tests/tmtests/tm05/Makefile \
-c/src/tests/tmtests/tm06/Makefile \
-c/src/tests/tmtests/tm07/Makefile \
-c/src/tests/tmtests/tm08/Makefile \
-c/src/tests/tmtests/tm09/Makefile \
-c/src/tests/tmtests/tm10/Makefile \
-c/src/tests/tmtests/tm11/Makefile \
-c/src/tests/tmtests/tm12/Makefile \
-c/src/tests/tmtests/tm13/Makefile \
-c/src/tests/tmtests/tm14/Makefile \
-c/src/tests/tmtests/tm15/Makefile \
-c/src/tests/tmtests/tm16/Makefile \
-c/src/tests/tmtests/tm17/Makefile \
-c/src/tests/tmtests/tm18/Makefile \
-c/src/tests/tmtests/tm19/Makefile \
-c/src/tests/tmtests/tm20/Makefile \
-c/src/tests/tmtests/tm21/Makefile \
-c/src/tests/tmtests/tm22/Makefile \
-c/src/tests/tmtests/tm23/Makefile \
-c/src/tests/tmtests/tm24/Makefile \
-c/src/tests/tmtests/tm25/Makefile \
-c/src/tests/tmtests/tm26/Makefile \
-c/src/tests/tmtests/tm27/Makefile \
-c/src/tests/tmtests/tm28/Makefile \
-c/src/tests/tmtests/tm29/Makefile \
-c/src/tests/tmtests/tmck/Makefile \
-c/src/tests/tmtests/tmoverhd/Makefile"
-
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:757: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:556: 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
@@ -826,7 +625,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:830: checking host system type" >&5
+echo "configure:629: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -847,7 +646,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:851: checking target system type" >&5
+echo "configure:650: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -865,7 +664,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:869: checking build system type" >&5
+echo "configure:668: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -957,7 +756,7 @@ if test "${enable_cpp+set}" = set; then
   \
 case "${enableval}" in 
   yes) RTEMS_HAS_CPLUSPLUS=yes ;;
-  no) RTEMS_HAS_CPLUSPLUS=no ;;
+  no) RTEMS_HAS_CPLUSPLUS=no   ;;
   *)  { echo "configure: error: bad value ${enableval} for enable-cpp option" 1>&2; exit 1; } ;;
 esac
 else
@@ -994,7 +793,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:998: checking for $ac_word" >&5
+echo "configure:797: 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
@@ -1025,7 +824,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:1029: checking for $ac_word" >&5
+echo "configure:828: 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
@@ -1056,7 +855,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:1060: checking for $ac_word" >&5
+echo "configure:859: 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
@@ -1087,7 +886,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:1091: checking for $ac_word" >&5
+echo "configure:890: 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
@@ -1118,7 +917,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:1122: checking for $ac_word" >&5
+echo "configure:921: 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
@@ -1146,10 +945,31 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
+echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+echo "configure:950: 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
+  rm -f conftestdata
+if ln -s X conftestdata 2>/dev/null
+then
+  rm -f conftestdata
+  ac_cv_prog_LN_S="ln -s"
+else
+  ac_cv_prog_LN_S=ln
+fi
+fi
+LN_S="$ac_cv_prog_LN_S"
+if test "$ac_cv_prog_LN_S" = "ln -s"; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+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:1153: checking for $ac_word" >&5
+echo "configure:973: 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
@@ -1180,7 +1000,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:1184: checking for $ac_word" >&5
+echo "configure:1004: 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
@@ -1212,7 +1032,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:1216: checking for $ac_word" >&5
+echo "configure:1036: 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
@@ -1244,7 +1064,7 @@ fi
 
 
 echo $ac_n "checking for working $MKDIR -m 0755""... $ac_c" 1>&6
-echo "configure:1248: checking for working $MKDIR -m 0755" >&5
+echo "configure:1068: 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
@@ -1261,7 +1081,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:1265: checking for working $MKDIR -p" >&5
+echo "configure:1085: 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
@@ -1278,156 +1098,10 @@ echo "$ac_t""$rtems_cv_prog_MKDIR_P" 1>&6
 test "$rtems_cv_prog_MKDIR_P" = "yes" && MKDIR="$MKDIR -p"
 test "$rtems_cv_prog_MKDIR_M" = "yes" && MKDIR="$MKDIR -m 0755"
 
-# Extract the first word of "enscript", so it can be a program name with args.
-set dummy enscript; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1285: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_PR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$PR" in
-  /*)
-  ac_cv_path_PR="$PR" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_PR="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-PR="$ac_cv_path_PR"
-if test -n "$PR"; then
-  echo "$ac_t""$PR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$PR" && PR="$PR -G2r"
-
-if test -z "$PR"; then
-# Extract the first word of "mp", so it can be a program name with args.
-set dummy mp; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1319: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_PR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$PR" in
-  /*)
-  ac_cv_path_PR="$PR" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in /usr/openwin$ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_PR="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-PR="$ac_cv_path_PR"
-if test -n "$PR"; then
-  echo "$ac_t""$PR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$PR" && PR="$PR -l"
-fi
-
-if test -z "$PR"; then
-# Extract the first word of "pr", so it can be a program name with args.
-set dummy pr; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1354: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_PR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$PR" in
-  /*)
-  ac_cv_path_PR="$PR" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_PR="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-PR="$ac_cv_path_PR"
-if test -n "$PR"; then
-  echo "$ac_t""$PR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-
-if test -z "$PR"; then
-echo "configure: warning: ***
-    Cannot determine a suitable program for
-    printing asci files on ps-printers
-    Expect errors when printing files " 1>&2
-fi
-
-for ac_prog in lp lpr
-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:1396: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_PRINT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$PRINT" in
-  /*)
-  ac_cv_path_PRINT="$PRINT" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_PRINT="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-PRINT="$ac_cv_path_PRINT"
-if test -n "$PRINT"; then
-  echo "$ac_t""$PRINT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$PRINT" && break
-done
-
-
 # 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:1431: checking for $ac_word" >&5
+echo "configure:1105: 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
@@ -1458,7 +1132,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:1462: checking for $ac_word" >&5
+echo "configure:1136: 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
@@ -1486,135 +1160,11 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-# Extract the first word of "dirname", so it can be a program name with args.
-set dummy dirname; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1493: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_DIRNAME'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$DIRNAME" in
-  /*)
-  ac_cv_path_DIRNAME="$DIRNAME" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_DIRNAME="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-DIRNAME="$ac_cv_path_DIRNAME"
-if test -n "$DIRNAME"; then
-  echo "$ac_t""$DIRNAME" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-# Extract the first word of "basename", so it can be a program name with args.
-set dummy basename; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1524: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_BASENAME'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$BASENAME" in
-  /*)
-  ac_cv_path_BASENAME="$BASENAME" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_BASENAME="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-BASENAME="$ac_cv_path_BASENAME"
-if test -n "$BASENAME"; then
-  echo "$ac_t""$BASENAME" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-# Extract the first word of "unifdef", so it can be a program name with args.
-set dummy unifdef; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1556: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_UNIFDEF'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$UNIFDEF" in
-  /*)
-  ac_cv_path_UNIFDEF="$UNIFDEF" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_UNIFDEF="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-UNIFDEF="$ac_cv_path_UNIFDEF"
-if test -n "$UNIFDEF"; then
-  echo "$ac_t""$UNIFDEF" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-# Extract the first word of "ed", so it can be a program name with args.
-set dummy ed; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1587: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_ED'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$ED" in
-  /*)
-  ac_cv_path_ED="$ED" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_ED="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-ED="$ac_cv_path_ED"
-if test -n "$ED"; then
-  echo "$ac_t""$ED" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-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:1618: checking for $ac_word" >&5
+echo "configure:1168: 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
@@ -1642,48 +1192,12 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-for ac_prog in mawk gawk nawk awk
-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:1651: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_AWK'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$AWK" in
-  /*)
-  ac_cv_path_AWK="$AWK" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_AWK="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-AWK="$ac_cv_path_AWK"
-if test -n "$AWK"; then
-  echo "$ac_t""$AWK" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$AWK" && break
-done
-
 for ac_prog in gm4 m4
 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:1687: checking for $ac_word" >&5
+echo "configure:1201: 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
@@ -1715,138 +1229,12 @@ test -n "$M4" && break
 done
 
 
-# Extract the first word of "fgrep", so it can be a program name with args.
-set dummy fgrep; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1722: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_FGREP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$FGREP" in
-  /*)
-  ac_cv_path_FGREP="$FGREP" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_FGREP="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-FGREP="$ac_cv_path_FGREP"
-if test -n "$FGREP"; then
-  echo "$ac_t""$FGREP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-# Extract the first word of "grep", so it can be a program name with args.
-set dummy grep; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1753: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GREP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$GREP" in
-  /*)
-  ac_cv_path_GREP="$GREP" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GREP="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-GREP="$ac_cv_path_GREP"
-if test -n "$GREP"; then
-  echo "$ac_t""$GREP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-# Extract the first word of "egrep", so it can be a program name with args.
-set dummy egrep; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1784: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_EGREP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$EGREP" in
-  /*)
-  ac_cv_path_EGREP="$EGREP" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_EGREP="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-EGREP="$ac_cv_path_EGREP"
-if test -n "$EGREP"; then
-  echo "$ac_t""$EGREP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-# Extract the first word of "catman", so it can be a program name with args.
-set dummy catman; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1816: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_CATMAN'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$CATMAN" in
-  /*)
-  ac_cv_path_CATMAN="$CATMAN" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH:/usr/etc:/etc$ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_CATMAN="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-CATMAN="$ac_cv_path_CATMAN"
-if test -n "$CATMAN"; then
-  echo "$ac_t""$CATMAN" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
 for ac_prog in bash ksh sh
 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:1850: checking for $ac_word" >&5
+echo "configure:1238: 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
@@ -1884,77 +1272,9 @@ if test -z "$KSH"; then
     Please contact your system administrator " 1>&2; exit 1; };
 fi
 
-# Extract the first word of "ident", so it can be a program name with args.
-set dummy ident; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1891: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_RCS_IDENT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$RCS_IDENT" in
-  /*)
-  ac_cv_path_RCS_IDENT="$RCS_IDENT" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_RCS_IDENT="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-RCS_IDENT="$ac_cv_path_RCS_IDENT"
-if test -n "$RCS_IDENT"; then
-  echo "$ac_t""$RCS_IDENT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-# Extract the first word of "co", so it can be a program name with args.
-set dummy co; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1922: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_RCS_CO'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$RCS_CO" in
-  /*)
-  ac_cv_path_RCS_CO="$RCS_CO" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_RCS_CO="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-RCS_CO="$ac_cv_path_RCS_CO"
-if test -n "$RCS_CO"; then
-  echo "$ac_t""$RCS_CO" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
 
 
 
-echo "TARGET"
-echo "cpu    $target_cpu"
-echo "os     $target_os"
-echo "vendor $target_vendor"
-
 
 case "${target}" in
   # hpux unix port should go here
@@ -1964,13 +1284,11 @@ case "${target}" in
   i[3456]86-go32-rtems*)
 	target_cpu=i386
 	rtems_bsp="go32 go32_p5"
-       	aux_makefiles=$i386_go32_mk
+       	skip_startfiles="yes"
 	RTEMS_HAS_POSIX_API=no
 	;;
   i[3456]86-rtems*)
 	target_cpu=i386
-	rtems_bsp="force386 i386ex"
-       	aux_makefiles=$i386_mk
 	;;
   i[3456]86-pc-linux*)         # unix "simulator" port
 	target_cpu=unix
@@ -1989,172 +1307,160 @@ case "${target}" in
 	;;
   *) 
 	echo $ac_n "checking rtems target cpu""... $ac_c" 1>&6
-echo "configure:1993: checking rtems target cpu" >&5
-target_cpu=`echo $target | /usr/bin/sed 's%^\([^-]*\)-\(.*\)$%\1%'`
+echo "configure:1311: checking rtems target cpu" >&5
+target_cpu=`echo $target | sed 's%^\([^-]*\)-\(.*\)$%\1%'`
 echo "$ac_t""$target_cpu" 1>&6
 
 	;;
 esac
 
+# Is this a supported CPU?
 echo $ac_n "checking if cpu $target_cpu is supported""... $ac_c" 1>&6
-echo "configure:2001: checking if cpu $target_cpu is supported" >&5
+echo "configure:1320: checking if cpu $target_cpu is supported" >&5
 if test -d "$srcdir/c/src/exec/score/cpu/$target_cpu"; then
   echo "$ac_t""yes" 1>&6
-  makefiles="c/src/exec/score/cpu/$target_cpu/Makefile"
+  makefiles="$makefiles c/src/exec/score/cpu/$target_cpu/Makefile"
 else
   { echo "configure: error: no" 1>&2; exit 1; }
 fi
 
- echo $ac_n "checking for Makefiles in c/src/exec/score/tools/$target_cpu""... $ac_c" 1>&6
-echo "configure:2010: checking for Makefiles in c/src/exec/score/tools/$target_cpu" >&5
-  if test -d $srcdir/c/src/exec/score/tools/$target_cpu; then
-      test -f $srcdir/c/src/exec/score/tools/$target_cpu/Makefile.in && \
-    makefiles="$makefiles c/src/exec/score/tools/$target_cpu/Makefile"
+# find all the Executive Makefiles
 
-  itemlist=`ls $srcdir/c/src/exec/score/tools/$target_cpu`
-  for item in $itemlist; do
-    if test -d "$srcdir/c/src/exec/score/tools/$target_cpu/$item"; then
-        test -f $srcdir/c/src/exec/score/tools/$target_cpu/$item/Makefile.in && \
-    makefiles="$makefiles c/src/exec/score/tools/$target_cpu/$item/Makefile"
+echo $ac_n "checking for Makefile.in in c/src/exec/rtems""... $ac_c" 1>&6
+echo "configure:1331: 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;
+  rtems_av_tmp=`find c/src/exec/rtems -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
+  makefiles="$makefiles $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  echo "$ac_t""done" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-  item0list=`ls $srcdir/c/src/exec/score/tools/$target_cpu/$item`
-  for item0 in $item0list; do
-    if test -d "$srcdir/c/src/exec/score/tools/$target_cpu/$item/$item0"; then
-       test -f $srcdir/c/src/exec/score/tools/$target_cpu/$item/$item0/Makefile.in && \
-    makefiles="$makefiles c/src/exec/score/tools/$target_cpu/$item/$item0/Makefile"
 
-      
-    fi
-  done
 
-    
-    fi
-  done
+echo $ac_n "checking for Makefile.in in c/src/exec/posix""... $ac_c" 1>&6
+echo "configure:1346: 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;
+  rtems_av_tmp=`find c/src/exec/posix -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
+  makefiles="$makefiles $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  echo "$ac_t""done" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-    echo "$ac_t""done" 1>&6
-  else
-    echo "$ac_t""no" 1>&6
-  fi
 
 
-if test -n "$aux_makefiles";then
-  makefiles="$makefiles $aux_makefiles"
-  echo "MAKEFILES PRESET TO $makefiles"
+echo $ac_n "checking for Makefile.in in c/src/exec/sapi""... $ac_c" 1>&6
+echo "configure:1361: 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;
+  rtems_av_tmp=`find c/src/exec/sapi -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
+  makefiles="$makefiles $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  echo "$ac_t""done" 1>&6
 else
-echo $ac_n "checking for c/src/lib/libbsp/$target_cpu""... $ac_c" 1>&6
-echo "configure:2046: checking for c/src/lib/libbsp/$target_cpu" >&5
-if test -d "$srcdir/c/src/lib/libbsp/$target_cpu"; then
-  echo "$ac_t""yes" 1>&6
-  files=`ls $srcdir/c/src/lib/libbsp/$target_cpu`
-  for file in $files; do
-    case $file in
-      shared*);;
-      Makefile*);;
-      READ*);;
-      *) rtems_bsp="$rtems_bsp $file";;
-    esac;
-  done
-   echo $ac_n "checking for Makefiles in c/src/lib/libbsp/$target_cpu""... $ac_c" 1>&6
-echo "configure:2059: checking for Makefiles in c/src/lib/libbsp/$target_cpu" >&5
-  if test -d $srcdir/c/src/lib/libbsp/$target_cpu; then
-      test -f $srcdir/c/src/lib/libbsp/$target_cpu/Makefile.in && \
-    makefiles="$makefiles c/src/lib/libbsp/$target_cpu/Makefile"
-
-  itemlist=`ls $srcdir/c/src/lib/libbsp/$target_cpu`
-  for item in $itemlist; do
-    if test -d "$srcdir/c/src/lib/libbsp/$target_cpu/$item"; then
-        test -f $srcdir/c/src/lib/libbsp/$target_cpu/$item/Makefile.in && \
-    makefiles="$makefiles c/src/lib/libbsp/$target_cpu/$item/Makefile"
-
-  item0list=`ls $srcdir/c/src/lib/libbsp/$target_cpu/$item`
-  for item0 in $item0list; do
-    if test -d "$srcdir/c/src/lib/libbsp/$target_cpu/$item/$item0"; then
-       test -f $srcdir/c/src/lib/libbsp/$target_cpu/$item/$item0/Makefile.in && \
-    makefiles="$makefiles c/src/lib/libbsp/$target_cpu/$item/$item0/Makefile"
-
-      
-    fi
-  done
+  echo "$ac_t""no" 1>&6
+fi
 
-    
-    fi
-  done
 
-    echo "$ac_t""done" 1>&6
-  else
-    echo "$ac_t""no" 1>&6
-  fi
 
+echo $ac_n "checking for Makefile.in in c/src/exec/wrapup""... $ac_c" 1>&6
+echo "configure:1376: checking for Makefile.in in c/src/exec/wrapup" >&5
+if test -d $srcdir/c/src/exec/wrapup; then
+  rtems_av_save_dir=`pwd`;
+  cd $srcdir;
+  rtems_av_tmp=`find c/src/exec/wrapup -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
+  makefiles="$makefiles $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  echo "$ac_t""done" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
- echo $ac_n "checking for Makefiles in c/src/lib/libcpu/$target_cpu""... $ac_c" 1>&6
-echo "configure:2094: checking for Makefiles in c/src/lib/libcpu/$target_cpu" >&5
-  if test -d $srcdir/c/src/lib/libcpu/$target_cpu; then
-      test -f $srcdir/c/src/lib/libcpu/$target_cpu/Makefile.in && \
-    makefiles="$makefiles c/src/lib/libcpu/$target_cpu/Makefile"
-
-  itemlist=`ls $srcdir/c/src/lib/libcpu/$target_cpu`
-  for item in $itemlist; do
-    if test -d "$srcdir/c/src/lib/libcpu/$target_cpu/$item"; then
-        test -f $srcdir/c/src/lib/libcpu/$target_cpu/$item/Makefile.in && \
-    makefiles="$makefiles c/src/lib/libcpu/$target_cpu/$item/Makefile"
 
-  item0list=`ls $srcdir/c/src/lib/libcpu/$target_cpu/$item`
-  for item0 in $item0list; do
-    if test -d "$srcdir/c/src/lib/libcpu/$target_cpu/$item/$item0"; then
-       test -f $srcdir/c/src/lib/libcpu/$target_cpu/$item/$item0/Makefile.in && \
-    makefiles="$makefiles c/src/lib/libcpu/$target_cpu/$item/$item0/Makefile"
 
-      
-    fi
-  done
+# find all the Makefiles for the BSPs
+if test -d "$srcdir/c/src/lib/libbsp/$target_cpu"; then
+  makefiles="$makefiles c/src/lib/libbsp/$target_cpu/Makefile"
+
+  if test -z "$rtems_bsp"; then
+    echo $ac_n "checking for bsps""... $ac_c" 1>&6
+echo "configure:1396: checking for bsps" >&5
+    files=`ls $srcdir/c/src/lib/libbsp/$target_cpu`
+    for file in $files; do
+      case $file in
+        shared*);;
+        Makefile*);;
+        READ*);;
+        CVS*);;
+        go32*);;   # so the i386 port can pick up the other Makefiles
+        *) rtems_bsp="$rtems_bsp $file";;
+      esac;
+    done
+    echo "$ac_t""$rtems_bsp" 1>&6
+  fi
 
+  # collect makefiles for each bsp
+  for i in $rtems_bsp; do
     
-    fi
-  done
+echo $ac_n "checking for Makefile.in in c/src/lib/libbsp/$target_cpu/$i""... $ac_c" 1>&6
+echo "configure:1415: checking for Makefile.in in c/src/lib/libbsp/$target_cpu/$i" >&5
+if test -d $srcdir/c/src/lib/libbsp/$target_cpu/$i; then
+  rtems_av_save_dir=`pwd`;
+  cd $srcdir;
+  rtems_av_tmp=`find c/src/lib/libbsp/$target_cpu/$i -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
+  makefiles="$makefiles $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  echo "$ac_t""done" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-    echo "$ac_t""done" 1>&6
-  else
-    echo "$ac_t""no" 1>&6
-  fi
 
- echo $ac_n "checking for Makefiles in c/src/lib/start/$target_cpu""... $ac_c" 1>&6
-echo "configure:2125: checking for Makefiles in c/src/lib/start/$target_cpu" >&5
-  if test -d $srcdir/c/src/lib/start/$target_cpu; then
-      test -f $srcdir/c/src/lib/start/$target_cpu/Makefile.in && \
-    makefiles="$makefiles c/src/lib/start/$target_cpu/Makefile"
-
-  itemlist=`ls $srcdir/c/src/lib/start/$target_cpu`
-  for item in $itemlist; do
-    if test -d "$srcdir/c/src/lib/start/$target_cpu/$item"; then
-        test -f $srcdir/c/src/lib/start/$target_cpu/$item/Makefile.in && \
-    makefiles="$makefiles c/src/lib/start/$target_cpu/$item/Makefile"
-
-  item0list=`ls $srcdir/c/src/lib/start/$target_cpu/$item`
-  for item0 in $item0list; do
-    if test -d "$srcdir/c/src/lib/start/$target_cpu/$item/$item0"; then
-       test -f $srcdir/c/src/lib/start/$target_cpu/$item/$item0/Makefile.in && \
-    makefiles="$makefiles c/src/lib/start/$target_cpu/$item/$item0/Makefile"
-
-      
-    fi
   done
+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:1434: 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;
+  rtems_av_tmp=`find c/src/lib/libcpu/$target_cpu -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
+  makefiles="$makefiles $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  echo "$ac_t""done" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-    
-    fi
-  done
 
-    echo "$ac_t""done" 1>&6
-  else
-    echo "$ac_t""no" 1>&6
-  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:1451: 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;
+  rtems_av_tmp=`find c/src/lib/start/$target_cpu -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
+  makefiles="$makefiles $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  echo "$ac_t""done" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-fi	# aux_makefiles
 
-echo "MAKEFILES $makefiles"
+fi
 
 
 
@@ -2172,27 +1478,6 @@ if [ "${program_prefix}" = "NONE" ] ; then
   fi
 fi
 
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2177: 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
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
 
 RTEMS_BSP=$rtems_bsp
 RTEMS_HOST=$host_os
@@ -2200,25 +1485,143 @@ RTEMS_ROOT=`cd $srcdir/c; pwd`
 PROJECT_ROOT=`pwd;`
 
 # For now always generate the KA9Q TCP/IP Makefiles
-makefiles="$makefiles $ka9q_mk $rtemscpp_mk"
+makefiles="$makefiles c/src/lib/libka9q/Makefile"
 
+# For now always generate the C++ Makefiles
+makefiles="$makefiles c/src/lib/librtems++/Makefile"
+
+# If the tests are enabled, then find all the test suite Makefiles
+echo $ac_n "checking Are the test suites enabled? ""... $ac_c" 1>&6
+echo "configure:1496: checking Are the test suites enabled? " >&5
 # Check whether --enable-tests or --disable-tests was given.
 if test "${enable_tests+set}" = set; then
   enableval="$enable_tests"
   \
-tests_mk=
+   { echo "configure: error: no" 1>&2; exit 1; }
+else
+  \
+   echo "$ac_t""yes" 1>&6 \
+     
+echo $ac_n "checking for Makefile.in in c/src/tests/tools/$target_cpu""... $ac_c" 1>&6
+echo "configure:1507: 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;
+  rtems_av_tmp=`find c/src/tests/tools/$target_cpu -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
+  makefiles="$makefiles $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  echo "$ac_t""done" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+ \
+     
+echo $ac_n "checking for Makefile.in in c/src/tests/libtests""... $ac_c" 1>&6
+echo "configure:1522: 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;
+  rtems_av_tmp=`find c/src/tests/libtests -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
+  makefiles="$makefiles $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  echo "$ac_t""done" 1>&6
 else
-  makefiles="${makefiles} ${tests_mk}"
+  echo "$ac_t""no" 1>&6
+fi
+
+ \
+     
+echo $ac_n "checking for Makefile.in in c/src/tests/sptests""... $ac_c" 1>&6
+echo "configure:1537: 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;
+  rtems_av_tmp=`find c/src/tests/sptests -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
+  makefiles="$makefiles $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  echo "$ac_t""done" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+ \
+     
+echo $ac_n "checking for Makefile.in in c/src/tests/tmtests""... $ac_c" 1>&6
+echo "configure:1552: 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;
+  rtems_av_tmp=`find c/src/tests/tmtests -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
+  makefiles="$makefiles $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  echo "$ac_t""done" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+ \
+     
+echo $ac_n "checking for Makefile.in in c/src/tests/mptests""... $ac_c" 1>&6
+echo "configure:1567: 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;
+  rtems_av_tmp=`find c/src/tests/mptests -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
+  makefiles="$makefiles $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  echo "$ac_t""done" 1>&6
+else
+  echo "$ac_t""no" 1>&6
 fi
 
+ \
+     
+echo $ac_n "checking for Makefile.in in c/src/tests/psxtests""... $ac_c" 1>&6
+echo "configure:1582: 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;
+  rtems_av_tmp=`find c/src/tests/psxtests -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
+  makefiles="$makefiles $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  echo "$ac_t""done" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
 
+ \
+
+fi
+
+
+# If the HWAPI is enabled, the find the HWAPI Makefiles
+echo $ac_n "checking Is the HWAPI enabled? ""... $ac_c" 1>&6
+echo "configure:1601: checking Is the HWAPI enabled? " >&5
 # Check whether --enable-hwapi or --disable-hwapi was given.
 if test "${enable_hwapi+set}" = set; then
   enableval="$enable_hwapi"
   \
-makefiles="${makefiles} ${hwapi_mk}"
+      echo "$ac_t""yes" 1>&6 \
+        
+echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi""... $ac_c" 1>&6
+echo "configure:1609: checking for Makefile.in in c/src/lib/libhwapi" >&5
+if test -d $srcdir/c/src/lib/libhwapi; then
+  rtems_av_save_dir=`pwd`;
+  cd $srcdir;
+  rtems_av_tmp=`find c/src/lib/libhwapi -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
+  makefiles="$makefiles $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  echo "$ac_t""done" 1>&6
 else
-  hwapi_mk=
+  echo "$ac_t""no" 1>&6
+fi
+
+
+else
+  \
+      { echo "configure: error: no" 1>&2; exit 1; } \
+
 fi
 
 
@@ -2226,7 +1629,8 @@ fi
 if test "${enable_rtemsbsp+set}" = set; then
   enableval="$enable_rtemsbsp"
   \
-RTEMS_BSP=$enableval
+      RTEMS_BSP=$enableval \
+
 fi
 
 
@@ -2244,7 +1648,69 @@ fi
 
 
 
+# pick up all the Makefiles in required parts of the tree
+
+echo $ac_n "checking for Makefile.in in c/build-tools""... $ac_c" 1>&6
+echo "configure:1655: checking for Makefile.in in c/build-tools" >&5
+if test -d $srcdir/c/build-tools; then
+  rtems_av_save_dir=`pwd`;
+  cd $srcdir;
+  rtems_av_tmp=`find c/build-tools -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
+  makefiles="$makefiles $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  echo "$ac_t""done" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+echo $ac_n "checking for Makefile.in in c/make""... $ac_c" 1>&6
+echo "configure:1670: checking for Makefile.in in c/make" >&5
+if test -d $srcdir/c/make; then
+  rtems_av_save_dir=`pwd`;
+  cd $srcdir;
+  rtems_av_tmp=`find c/make -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
+  makefiles="$makefiles $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  echo "$ac_t""done" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+echo $ac_n "checking for Makefile.in in c/src/lib/libmisc""... $ac_c" 1>&6
+echo "configure:1685: 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;
+  rtems_av_tmp=`find c/src/lib/libmisc -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
+  makefiles="$makefiles $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  echo "$ac_t""done" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
 
+echo $ac_n "checking for Makefile.in in c/src/tests/samples""... $ac_c" 1>&6
+echo "configure:1700: 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;
+  rtems_av_tmp=`find c/src/tests/samples -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
+  makefiles="$makefiles $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  echo "$ac_t""done" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+# try not to explicitly list a Makefile here 
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -2359,86 +1825,33 @@ ac_given_srcdir=$srcdir
 
 trap 'rm -fr `echo "Makefile
 c/Makefile
-c/build-tools/Makefile
-c/build-tools/os/Makefile
-c/build-tools/os/msdos/Makefile
-c/build-tools/scripts/Makefile
-c/build-tools/src/Makefile
-c/make/Makefile
-c/make/host.cfg
-c/make/Templates/Makefile.inc
 c/src/Makefile
 c/src/exec/Makefile
-c/src/exec/posix/Makefile
-c/src/exec/posix/base/Makefile
-c/src/exec/posix/headers/Makefile
-c/src/exec/posix/inline/Makefile
-c/src/exec/posix/macros/Makefile
-c/src/exec/posix/optman/Makefile
-c/src/exec/posix/src/Makefile
-c/src/exec/posix/sys/Makefile
-c/src/exec/rtems/Makefile
-c/src/exec/rtems/headers/Makefile
-c/src/exec/rtems/inline/Makefile
-c/src/exec/rtems/macros/Makefile
-c/src/exec/rtems/optman/Makefile
-c/src/exec/rtems/src/Makefile
-c/src/exec/sapi/Makefile
-c/src/exec/sapi/headers/Makefile
-c/src/exec/sapi/inline/Makefile
-c/src/exec/sapi/macros/Makefile
-c/src/exec/sapi/optman/Makefile
-c/src/exec/sapi/src/Makefile
 c/src/exec/score/Makefile
 c/src/exec/score/cpu/Makefile
 c/src/exec/score/headers/Makefile
 c/src/exec/score/inline/Makefile
-c/src/exec/score/macros/Makefile
 c/src/exec/score/src/Makefile
 c/src/exec/score/tools/Makefile
 c/src/exec/score/tools/generic/Makefile
-c/src/exec/wrapup/Makefile
-c/src/exec/wrapup/posix/Makefile
-c/src/exec/wrapup/rtems/Makefile
 c/src/lib/Makefile
 c/src/lib/include/Makefile
 c/src/lib/libbsp/Makefile
 c/src/lib/libbsp/shmdr/Makefile
 c/src/lib/libc/Makefile
 c/src/lib/libcpu/Makefile
-c/src/lib/libmisc/Makefile
-c/src/lib/libmisc/assoc/Makefile
-c/src/lib/libmisc/cpuuse/Makefile
-c/src/lib/libmisc/error/Makefile
-c/src/lib/libmisc/monitor/Makefile
-c/src/lib/libmisc/rtmonuse/Makefile
-c/src/lib/libmisc/stackchk/Makefile
-c/src/lib/libmisc/wrapup/Makefile
 c/src/lib/start/Makefile
 c/src/lib/wrapup/Makefile
 c/src/tests/Makefile
-c/src/tests/samples/Makefile
-c/src/tests/samples/base_mp/Makefile
-c/src/tests/samples/base_mp/node1/Makefile
-c/src/tests/samples/base_mp/node2/Makefile
-c/src/tests/samples/base_sp/Makefile
-c/src/tests/samples/cdtest/Makefile
-c/src/tests/samples/hello/Makefile
-c/src/tests/samples/paranoia/Makefile
-c/src/tests/samples/ticker/Makefile
 c/src/tests/support/Makefile
 c/src/tests/support/include/Makefile
 c/src/tests/support/stubdr/Makefile
 c/src/tests/support/wrapup/Makefile
 c/src/tests/tools/Makefile
 c/src/tests/tools/generic/Makefile
-c/src/tests/tools/hppa1_1/Makefile
-c/src/tests/tools/hppa1_1/simhppa/Makefile
-c/src/tests/tools/sparc/Makefile
-c/src/tests/tools/sparc/erc32/Makefile
-c/src/tests/tools/unix/Makefile
-c/src/tests/tools/unix/posix/Makefile
 $makefiles
+c/make/host.cfg
+c/make/Templates/Makefile.inc
 c/update-tools/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -2490,28 +1903,15 @@ s%@RM@%$RM%g
 s%@CP@%$CP%g
 s%@MV@%$MV%g
 s%@LN@%$LN%g
+s%@LN_S@%$LN_S%g
 s%@CHMOD@%$CHMOD%g
 s%@SORT@%$SORT%g
 s%@MKDIR@%$MKDIR%g
-s%@PR@%$PR%g
-s%@PRINT@%$PRINT%g
 s%@TOUCH@%$TOUCH%g
 s%@CMP@%$CMP%g
-s%@DIRNAME@%$DIRNAME%g
-s%@BASENAME@%$BASENAME%g
-s%@UNIFDEF@%$UNIFDEF%g
-s%@ED@%$ED%g
 s%@SED@%$SED%g
-s%@AWK@%$AWK%g
 s%@M4@%$M4%g
-s%@FGREP@%$FGREP%g
-s%@GREP@%$GREP%g
-s%@EGREP@%$EGREP%g
-s%@CATMAN@%$CATMAN%g
 s%@KSH@%$KSH%g
-s%@RCS_IDENT@%$RCS_IDENT%g
-s%@RCS_CO@%$RCS_CO%g
-s%@LN_S@%$LN_S%g
 s%@RTEMS_BSP@%$RTEMS_BSP%g
 s%@RTEMS_HOST@%$RTEMS_HOST%g
 s%@RTEMS_LIBC_DIR@%$RTEMS_LIBC_DIR%g
@@ -2567,86 +1967,33 @@ cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile
 c/Makefile
-c/build-tools/Makefile
-c/build-tools/os/Makefile
-c/build-tools/os/msdos/Makefile
-c/build-tools/scripts/Makefile
-c/build-tools/src/Makefile
-c/make/Makefile
-c/make/host.cfg
-c/make/Templates/Makefile.inc
 c/src/Makefile
 c/src/exec/Makefile
-c/src/exec/posix/Makefile
-c/src/exec/posix/base/Makefile
-c/src/exec/posix/headers/Makefile
-c/src/exec/posix/inline/Makefile
-c/src/exec/posix/macros/Makefile
-c/src/exec/posix/optman/Makefile
-c/src/exec/posix/src/Makefile
-c/src/exec/posix/sys/Makefile
-c/src/exec/rtems/Makefile
-c/src/exec/rtems/headers/Makefile
-c/src/exec/rtems/inline/Makefile
-c/src/exec/rtems/macros/Makefile
-c/src/exec/rtems/optman/Makefile
-c/src/exec/rtems/src/Makefile
-c/src/exec/sapi/Makefile
-c/src/exec/sapi/headers/Makefile
-c/src/exec/sapi/inline/Makefile
-c/src/exec/sapi/macros/Makefile
-c/src/exec/sapi/optman/Makefile
-c/src/exec/sapi/src/Makefile
 c/src/exec/score/Makefile
 c/src/exec/score/cpu/Makefile
 c/src/exec/score/headers/Makefile
 c/src/exec/score/inline/Makefile
-c/src/exec/score/macros/Makefile
 c/src/exec/score/src/Makefile
 c/src/exec/score/tools/Makefile
 c/src/exec/score/tools/generic/Makefile
-c/src/exec/wrapup/Makefile
-c/src/exec/wrapup/posix/Makefile
-c/src/exec/wrapup/rtems/Makefile
 c/src/lib/Makefile
 c/src/lib/include/Makefile
 c/src/lib/libbsp/Makefile
 c/src/lib/libbsp/shmdr/Makefile
 c/src/lib/libc/Makefile
 c/src/lib/libcpu/Makefile
-c/src/lib/libmisc/Makefile
-c/src/lib/libmisc/assoc/Makefile
-c/src/lib/libmisc/cpuuse/Makefile
-c/src/lib/libmisc/error/Makefile
-c/src/lib/libmisc/monitor/Makefile
-c/src/lib/libmisc/rtmonuse/Makefile
-c/src/lib/libmisc/stackchk/Makefile
-c/src/lib/libmisc/wrapup/Makefile
 c/src/lib/start/Makefile
 c/src/lib/wrapup/Makefile
 c/src/tests/Makefile
-c/src/tests/samples/Makefile
-c/src/tests/samples/base_mp/Makefile
-c/src/tests/samples/base_mp/node1/Makefile
-c/src/tests/samples/base_mp/node2/Makefile
-c/src/tests/samples/base_sp/Makefile
-c/src/tests/samples/cdtest/Makefile
-c/src/tests/samples/hello/Makefile
-c/src/tests/samples/paranoia/Makefile
-c/src/tests/samples/ticker/Makefile
 c/src/tests/support/Makefile
 c/src/tests/support/include/Makefile
 c/src/tests/support/stubdr/Makefile
 c/src/tests/support/wrapup/Makefile
 c/src/tests/tools/Makefile
 c/src/tests/tools/generic/Makefile
-c/src/tests/tools/hppa1_1/Makefile
-c/src/tests/tools/hppa1_1/simhppa/Makefile
-c/src/tests/tools/sparc/Makefile
-c/src/tests/tools/sparc/erc32/Makefile
-c/src/tests/tools/unix/Makefile
-c/src/tests/tools/unix/posix/Makefile
 $makefiles
+c/make/host.cfg
+c/make/Templates/Makefile.inc
 c/update-tools/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
diff --git a/configure.in b/configure.in
index b8963d7f68..095ffa790c 100644
--- a/configure.in
+++ b/configure.in
@@ -2,207 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.12)
 AC_INIT(README)
 
-i386_mk="c/src/exec/score/cpu/i386/Makefile \
-c/src/lib/libbsp/i386/Makefile \
-c/src/lib/libbsp/i386/force386/Makefile \
-c/src/lib/libbsp/i386/force386/clock/Makefile \
-c/src/lib/libbsp/i386/force386/console/Makefile \
-c/src/lib/libbsp/i386/force386/include/Makefile \
-c/src/lib/libbsp/i386/force386/shmsupp/Makefile \
-c/src/lib/libbsp/i386/force386/startup/Makefile \
-c/src/lib/libbsp/i386/force386/timer/Makefile \
-c/src/lib/libbsp/i386/force386/wrapup/Makefile \
-c/src/lib/libbsp/i386/i386ex/Makefile \
-c/src/lib/libbsp/i386/i386ex/clock/Makefile \
-c/src/lib/libbsp/i386/i386ex/console/Makefile \
-c/src/lib/libbsp/i386/i386ex/include/Makefile \
-c/src/lib/libbsp/i386/i386ex/startup/Makefile \
-c/src/lib/libbsp/i386/i386ex/timer/Makefile \
-c/src/lib/libbsp/i386/i386ex/wrapup/Makefile \
-c/src/lib/start/i386/Makefile"
-
-i386_go32_mk="c/src/exec/score/cpu/i386/Makefile \
-c/src/lib/libbsp/i386/Makefile \
-c/src/lib/libbsp/i386/go32/Makefile \
-c/src/lib/libbsp/i386/go32/clock/Makefile \
-c/src/lib/libbsp/i386/go32/console/Makefile \
-c/src/lib/libbsp/i386/go32/include/Makefile \
-c/src/lib/libbsp/i386/go32/startup/Makefile \
-c/src/lib/libbsp/i386/go32/timer/Makefile \
-c/src/lib/libbsp/i386/go32/wrapup/Makefile"
-
-ka9q_mk="c/src/lib/libka9q/Makefile"
-
-rtemscpp_mk="c/src/lib/librtems++/Makefile"
-
-hwapi_mk="\
-c/src/lib/libhwapi/Makefile \
-c/src/lib/libhwapi/eeprom/Makefile \
-c/src/lib/libhwapi/eeprom/wrapup/Makefile \
-c/src/lib/libhwapi/eeprom/eeprom/Makefile \
-c/src/lib/libhwapi/drivers/Makefile \
-c/src/lib/libhwapi/drivers/vmebus/Makefile \
-c/src/lib/libhwapi/drivers/vmebus/dmv202/Makefile \
-c/src/lib/libhwapi/drivers/vmebus/dmv536/Makefile \
-c/src/lib/libhwapi/drivers/vmebus/dmv666/Makefile \
-c/src/lib/libhwapi/drivers/vmebus/wrapup/Makefile \
-c/src/lib/libhwapi/serial/Makefile \
-c/src/lib/libhwapi/serial/default/Makefile \
-c/src/lib/libhwapi/serial/stream/Makefile \
-c/src/lib/libhwapi/serial/template/Makefile \
-c/src/lib/libhwapi/serial/wrapup/Makefile \
-c/src/lib/libhwapi/serial/channel/Makefile \
-c/src/lib/libhwapi/discrete/Makefile \
-c/src/lib/libhwapi/discrete/tools/Makefile \
-c/src/lib/libhwapi/discrete/relay/Makefile \
-c/src/lib/libhwapi/discrete/wrapup/Makefile \
-c/src/lib/libhwapi/discrete/greycode/Makefile \
-c/src/lib/libhwapi/discrete/discrete_in/Makefile \
-c/src/lib/libhwapi/discrete/discrete_out/Makefile \
-c/src/lib/libhwapi/discrete/discrete_input/Makefile \
-c/src/lib/libhwapi/discrete/discrete_output/Makefile \
-c/src/lib/libhwapi/discrete/discrete_flag/Makefile \
-c/src/lib/libhwapi/discrete/discrete_bitfield/Makefile \
-c/src/lib/libhwapi/analog/Makefile \
-c/src/lib/libhwapi/analog/dac/Makefile \
-c/src/lib/libhwapi/analog/wrapup/Makefile \
-c/src/lib/libhwapi/analog/linear_dac/Makefile \
-c/src/lib/libhwapi/analog/linear_adc/Makefile \
-c/src/lib/libhwapi/analog/adc/Makefile \
-c/src/lib/libhwapi/wrapup/Makefile \
-c/src/lib/libhwapi/support/Makefile \
-c/src/lib/libhwapi/support/chain/Makefile \
-c/src/lib/libhwapi/support/checksum/Makefile \
-c/src/lib/libhwapi/support/wrapup/Makefile \
-c/src/lib/libhwapi/support/dumpbuf/Makefile"
-
-tests_mk="c/src/tests/libtests/Makefile \
-c/src/tests/libtests/cpuuse/Makefile \
-c/src/tests/libtests/malloctest/Makefile \
-c/src/tests/libtests/monitor/Makefile \
-c/src/tests/libtests/rtmonuse/Makefile \
-c/src/tests/libtests/stackchk/Makefile \
-c/src/tests/libtests/termios/Makefile \
-c/src/tests/libtests/rtems++/Makefile \
-c/src/tests/mptests/Makefile \
-c/src/tests/mptests/mp01/Makefile \
-c/src/tests/mptests/mp01/node1/Makefile \
-c/src/tests/mptests/mp01/node2/Makefile \
-c/src/tests/mptests/mp02/Makefile \
-c/src/tests/mptests/mp02/node1/Makefile \
-c/src/tests/mptests/mp02/node2/Makefile \
-c/src/tests/mptests/mp03/Makefile \
-c/src/tests/mptests/mp03/node1/Makefile \
-c/src/tests/mptests/mp03/node2/Makefile \
-c/src/tests/mptests/mp04/Makefile \
-c/src/tests/mptests/mp04/node1/Makefile \
-c/src/tests/mptests/mp04/node2/Makefile \
-c/src/tests/mptests/mp05/Makefile \
-c/src/tests/mptests/mp05/node1/Makefile \
-c/src/tests/mptests/mp05/node2/Makefile \
-c/src/tests/mptests/mp06/Makefile \
-c/src/tests/mptests/mp06/node1/Makefile \
-c/src/tests/mptests/mp06/node2/Makefile \
-c/src/tests/mptests/mp07/Makefile \
-c/src/tests/mptests/mp07/node1/Makefile \
-c/src/tests/mptests/mp07/node2/Makefile \
-c/src/tests/mptests/mp08/Makefile \
-c/src/tests/mptests/mp08/node1/Makefile \
-c/src/tests/mptests/mp08/node2/Makefile \
-c/src/tests/mptests/mp09/Makefile \
-c/src/tests/mptests/mp09/node1/Makefile \
-c/src/tests/mptests/mp09/node2/Makefile \
-c/src/tests/mptests/mp10/Makefile \
-c/src/tests/mptests/mp10/node1/Makefile \
-c/src/tests/mptests/mp10/node2/Makefile \
-c/src/tests/mptests/mp11/Makefile \
-c/src/tests/mptests/mp11/node1/Makefile \
-c/src/tests/mptests/mp11/node2/Makefile \
-c/src/tests/mptests/mp12/Makefile \
-c/src/tests/mptests/mp12/node1/Makefile \
-c/src/tests/mptests/mp12/node2/Makefile \
-c/src/tests/mptests/mp13/Makefile \
-c/src/tests/mptests/mp13/node1/Makefile \
-c/src/tests/mptests/mp13/node2/Makefile \
-c/src/tests/mptests/mp14/Makefile \
-c/src/tests/mptests/mp14/node1/Makefile \
-c/src/tests/mptests/mp14/node2/Makefile \
-c/src/tests/psxtests/Makefile \
-c/src/tests/psxtests/psx01/Makefile \
-c/src/tests/psxtests/psx02/Makefile \
-c/src/tests/psxtests/psx03/Makefile \
-c/src/tests/psxtests/psx04/Makefile \
-c/src/tests/psxtests/psx05/Makefile \
-c/src/tests/psxtests/psx06/Makefile \
-c/src/tests/psxtests/psx07/Makefile \
-c/src/tests/psxtests/psx08/Makefile \
-c/src/tests/psxtests/psx09/Makefile \
-c/src/tests/psxtests/psx10/Makefile \
-c/src/tests/psxtests/psx11/Makefile \
-c/src/tests/psxtests/psx12/Makefile \
-c/src/tests/psxtests/psxhdrs/Makefile \
-c/src/tests/psxtests/support/Makefile \
-c/src/tests/psxtests/support/include/Makefile \
-c/src/tests/sptests/Makefile \
-c/src/tests/sptests/sp01/Makefile \
-c/src/tests/sptests/sp02/Makefile \
-c/src/tests/sptests/sp03/Makefile \
-c/src/tests/sptests/sp04/Makefile \
-c/src/tests/sptests/sp05/Makefile \
-c/src/tests/sptests/sp06/Makefile \
-c/src/tests/sptests/sp07/Makefile \
-c/src/tests/sptests/sp08/Makefile \
-c/src/tests/sptests/sp09/Makefile \
-c/src/tests/sptests/sp11/Makefile \
-c/src/tests/sptests/sp12/Makefile \
-c/src/tests/sptests/sp13/Makefile \
-c/src/tests/sptests/sp14/Makefile \
-c/src/tests/sptests/sp15/Makefile \
-c/src/tests/sptests/sp16/Makefile \
-c/src/tests/sptests/sp17/Makefile \
-c/src/tests/sptests/sp19/Makefile \
-c/src/tests/sptests/sp20/Makefile \
-c/src/tests/sptests/sp21/Makefile \
-c/src/tests/sptests/sp22/Makefile \
-c/src/tests/sptests/sp23/Makefile \
-c/src/tests/sptests/sp24/Makefile \
-c/src/tests/sptests/sp25/Makefile \
-c/src/tests/sptests/spfatal/Makefile \
-c/src/tests/sptests/spsize/Makefile \
-c/src/tests/tmtests/Makefile \
-c/src/tests/tmtests/include/Makefile \
-c/src/tests/tmtests/tm01/Makefile \
-c/src/tests/tmtests/tm02/Makefile \
-c/src/tests/tmtests/tm03/Makefile \
-c/src/tests/tmtests/tm04/Makefile \
-c/src/tests/tmtests/tm05/Makefile \
-c/src/tests/tmtests/tm06/Makefile \
-c/src/tests/tmtests/tm07/Makefile \
-c/src/tests/tmtests/tm08/Makefile \
-c/src/tests/tmtests/tm09/Makefile \
-c/src/tests/tmtests/tm10/Makefile \
-c/src/tests/tmtests/tm11/Makefile \
-c/src/tests/tmtests/tm12/Makefile \
-c/src/tests/tmtests/tm13/Makefile \
-c/src/tests/tmtests/tm14/Makefile \
-c/src/tests/tmtests/tm15/Makefile \
-c/src/tests/tmtests/tm16/Makefile \
-c/src/tests/tmtests/tm17/Makefile \
-c/src/tests/tmtests/tm18/Makefile \
-c/src/tests/tmtests/tm19/Makefile \
-c/src/tests/tmtests/tm20/Makefile \
-c/src/tests/tmtests/tm21/Makefile \
-c/src/tests/tmtests/tm22/Makefile \
-c/src/tests/tmtests/tm23/Makefile \
-c/src/tests/tmtests/tm24/Makefile \
-c/src/tests/tmtests/tm25/Makefile \
-c/src/tests/tmtests/tm26/Makefile \
-c/src/tests/tmtests/tm27/Makefile \
-c/src/tests/tmtests/tm28/Makefile \
-c/src/tests/tmtests/tm29/Makefile \
-c/src/tests/tmtests/tmck/Makefile \
-c/src/tests/tmtests/tmoverhd/Makefile"
-
 dnl Checks for programs.
 AC_PROG_MAKE_SET
 AC_CANONICAL_SYSTEM
@@ -242,12 +41,12 @@ AC_ARG_ENABLE(rtems-inlines, \
 esac],[RTEMS_USE_MACROS=no])
 
 AC_ARG_ENABLE(cpp, \
-[  --enable-cpp                           enable C++ support, and build the rtems++ library], \
+[  --enable-cpp            enable C++ support, and build the rtems++ library], \
 [case "${enableval}" in 
   yes) RTEMS_HAS_CPLUSPLUS=yes ;;
-  no) RTEMS_HAS_CPLUSPLUS=no ;;
+  no) RTEMS_HAS_CPLUSPLUS=no   ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-cpp option) ;;
-esac],[RTEMS_HAS_CPLUSPLUS=no])
+esac], [RTEMS_HAS_CPLUSPLUS=no])
 
 AC_ARG_ENABLE(gcc28, \
 [  --enable-gcc28		    enable use of gcc 2.8.x features], \
@@ -267,13 +66,11 @@ RTEMS_PREFIX=${target_cpu}-${target_vendor}
 dnl BEGIN configure.host.in
 
 AC_PATH_PROG(CAT,cat)
-dnl FIXME: check if rm accepts -f
-dnl NOTE : Check for rm -f seems not to be necessary since autoconf
-dnl        itself depends on it
 AC_PATH_PROG(RM,rm)
 AC_PATH_PROG(CP,cp)
 AC_PATH_PROG(MV,mv)
 AC_PATH_PROG(LN,ln)
+AC_PROG_LN_S
 AC_PATH_PROG(CHMOD,chmod)
 AC_PATH_PROG(SORT,sort)
 
@@ -284,57 +81,12 @@ RTEMS_PROG_MKDIR_P
 test "$rtems_cv_prog_MKDIR_P" = "yes" && MKDIR="$MKDIR -p"
 test "$rtems_cv_prog_MKDIR_M" = "yes" && MKDIR="$MKDIR -m 0755"
 
-dnl determine which program to use to format ps-docs to 2 pages per sheet
-dnl try enscript
-AC_PATH_PROG(PR,enscript)
-test -n "$PR" && PR="$PR -G2r"
-
-if test -z "$PR"; then
-dnl try /usr/openwin/mp
-dnl NOTE: Cannot test for mp in $PATH
-dnl because there exists a program named mp for TeX
-dnl which isn't what we want
-AC_PATH_PROG(PR,mp,,/usr/openwin)
-test -n "$PR" && PR="$PR -l"
-fi
-
-if test -z "$PR"; then
-dnl fallback to pr
-AC_PATH_PROG(PR,pr)
-fi
-
-if test -z "$PR"; then
-AC_MSG_WARN(
-[***]
-[    Cannot determine a suitable program for]
-[    printing asci files on ps-printers]
-[    Expect errors when printing files] )
-fi
-
-dnl Prefer lp over lpr for SYSV systems
-dnl NOTE: Dangerous for SYSV systems using BSD printing
-AC_PATH_PROGS(PRINT,lp lpr)
-
 AC_PATH_PROG(TOUCH,touch)
 AC_PATH_PROG(CMP,cmp)
-AC_PATH_PROG(DIRNAME,dirname)
-AC_PATH_PROG(BASENAME,basename)
 
-dnl NOTE: Does anybody but SUN have unifdef?
-dnl should probably be avoided at all
-AC_PATH_PROG(UNIFDEF,unifdef)
-AC_PATH_PROG(ED,ed)
 AC_PATH_PROG(SED,sed)
-AC_PATH_PROGS(AWK,mawk gawk nawk awk)
 AC_PATH_PROGS(M4,gm4 m4)
 
-AC_PATH_PROG(FGREP,fgrep)
-AC_PATH_PROG(GREP,grep)
-AC_PATH_PROG(EGREP,egrep)
-
-dnl catman might not be in $PATH
-AC_PATH_PROG(CATMAN,catman,,$PATH:/usr/etc:/etc)
-
 dnl NOTE: prefer bash over ksh over sh
 AC_PATH_PROGS(KSH,bash ksh sh)
 
@@ -346,32 +98,25 @@ AC_MSG_ERROR(
 [    Please contact your system administrator] );
 fi
 
-dnl check for RCS
-AC_PATH_PROG(RCS_IDENT,ident)
-AC_PATH_PROG(RCS_CO,co)
-
-dnl check for libraries
-dnl this does't work, uses host-linker instead of target-linker
-dnl Skip for now, since I (RC) don't believe it is used at all
-dnl libm
-dnl AC_CHECK_LIB(m,cos,
-dnl LIB_MATH="-lm")
-dnl AC_SUBST(LIB_MATH)
-
 dnl END configure.host.in
 
 dnl BEGIN configure.target.in
 
-echo "TARGET"
-echo "cpu    $target_cpu"
-echo "os     $target_os"
-echo "vendor $target_vendor"
+dnl echo "TARGET"
+dnl echo "    cpu    --> $target_cpu"
+dnl echo "    os     --> $target_os"
+dnl echo "    vendor --> $target_vendor"
 
 dnl canonicalize target name
 dnl NOTE: Most rtems targets do not fullfil autoconf 
 dnl targets naming conventions "processor-vendor-os"
 dnl Therefore autoconf's AC_CANONICAL_TARGET will fail for them
 dnl and we have to fix it for rtems ourselves 
+dnl 
+dnl The original plan was to do CPU-BSP-rtems or CPU-rtems to
+dnl imply all BSPs.  Eventually we would like to build a collection
+dnl of CPU model specific RTEMS libraries which in conjunction with
+dnl a BSP library would be used to link an application.
 
 case "${target}" in
   # hpux unix port should go here
@@ -381,13 +126,11 @@ case "${target}" in
   i[[3456]]86-go32-rtems*)
 	target_cpu=i386
 	rtems_bsp="go32 go32_p5"
-       	aux_makefiles=$i386_go32_mk
+       	skip_startfiles="yes"
 	RTEMS_HAS_POSIX_API=no
 	;;
   i[[3456]]86-rtems*)
 	target_cpu=i386
-	rtems_bsp="force386 i386ex"
-       	aux_makefiles=$i386_mk
 	;;
   i[[3456]]86-pc-linux*)         # unix "simulator" port
 	target_cpu=unix
@@ -409,43 +152,54 @@ case "${target}" in
 	;;
 esac
 
+# Is this a supported CPU?
 AC_MSG_CHECKING([if cpu $target_cpu is supported])
 if test -d "$srcdir/c/src/exec/score/cpu/$target_cpu"; then
   AC_MSG_RESULT(yes)
-  makefiles="c/src/exec/score/cpu/$target_cpu/Makefile"
+  makefiles="$makefiles c/src/exec/score/cpu/$target_cpu/Makefile"
 else
   AC_MSG_ERROR(no)
 fi
 
-RTEMS_CHECK_MAKEFILE(c/src/exec/score/tools/$target_cpu)
+# find all the Executive Makefiles
+RTEMS_CHECK_MAKEFILE(c/src/exec/rtems)
+RTEMS_CHECK_MAKEFILE(c/src/exec/posix)
+RTEMS_CHECK_MAKEFILE(c/src/exec/sapi)
+RTEMS_CHECK_MAKEFILE(c/src/exec/wrapup)
 
-if test -n "$aux_makefiles";then
-  makefiles="$makefiles $aux_makefiles"
-  echo "MAKEFILES PRESET TO $makefiles"
-else
-AC_MSG_CHECKING([for c/src/lib/libbsp/$target_cpu])
+# find all the Makefiles for the BSPs
 if test -d "$srcdir/c/src/lib/libbsp/$target_cpu"; then
-  AC_MSG_RESULT(yes)
-  files=`ls $srcdir/c/src/lib/libbsp/$target_cpu`
-  for file in $files; do
-    case $file in
-      shared*);;
-      Makefile*);;
-      READ*);;
-      *) rtems_bsp="$rtems_bsp $file";;
-    esac;
+  makefiles="$makefiles c/src/lib/libbsp/$target_cpu/Makefile"
+
+  if test -z "$rtems_bsp"; then
+    AC_MSG_CHECKING([for bsps])
+    files=`ls $srcdir/c/src/lib/libbsp/$target_cpu`
+    for file in $files; do
+      case $file in
+        shared*);;
+        Makefile*);;
+        READ*);;
+        CVS*);;
+        go32*);;   # so the i386 port can pick up the other Makefiles
+        *) rtems_bsp="$rtems_bsp $file";;
+      esac;
+    done
+    AC_MSG_RESULT([$rtems_bsp])
+  fi
+
+  # collect makefiles for each bsp
+  for i in $rtems_bsp; do
+    RTEMS_CHECK_MAKEFILE(c/src/lib/libbsp/$target_cpu/$i)
   done
-  RTEMS_CHECK_MAKEFILE(c/src/lib/libbsp/$target_cpu)
-else
-  AC_MSG_RESULT(no)
 fi
 
+# find all the CPU dependent library Makefiles
 RTEMS_CHECK_MAKEFILE(c/src/lib/libcpu/$target_cpu)
-RTEMS_CHECK_MAKEFILE(c/src/lib/start/$target_cpu)
-
-fi	# aux_makefiles
 
-echo "MAKEFILES $makefiles"
+dnl Workaround for go32
+if test "$skip_startfiles" != "yes"; then
+  RTEMS_CHECK_MAKEFILE(c/src/lib/start/$target_cpu)
+fi
 
 dnl END configure.target.in
 
@@ -465,7 +219,6 @@ if [[ "${program_prefix}" = "NONE" ]] ; then
   fi
 fi
 
-AC_PROG_LN_S
 dnl AC_PROG_CC
 dnl AC_PROG_CXX
 
@@ -475,19 +228,38 @@ RTEMS_ROOT=`cd $srcdir/c; pwd`
 PROJECT_ROOT=`pwd;`
 
 # For now always generate the KA9Q TCP/IP Makefiles
-makefiles="$makefiles $ka9q_mk $rtemscpp_mk"
+makefiles="$makefiles c/src/lib/libka9q/Makefile"
+
+# For now always generate the C++ Makefiles
+makefiles="$makefiles c/src/lib/librtems++/Makefile"
 
+# If the tests are enabled, then find all the test suite Makefiles
+AC_MSG_CHECKING([Are the test suites enabled? ])
 AC_ARG_ENABLE(tests, \
 [  --disable-tests 	     	    disable tests], \
-tests_mk=,makefiles="${makefiles} ${tests_mk}")
-
+   AC_MSG_ERROR(no), \
+   AC_MSG_RESULT(yes) \
+     RTEMS_CHECK_MAKEFILE(c/src/tests/tools/$target_cpu) \
+     RTEMS_CHECK_MAKEFILE(c/src/tests/libtests) \
+     RTEMS_CHECK_MAKEFILE(c/src/tests/sptests) \
+     RTEMS_CHECK_MAKEFILE(c/src/tests/tmtests) \
+     RTEMS_CHECK_MAKEFILE(c/src/tests/mptests) \
+     RTEMS_CHECK_MAKEFILE(c/src/tests/psxtests) \
+)
+
+# If the HWAPI is enabled, the find the HWAPI Makefiles
+AC_MSG_CHECKING([Is the HWAPI enabled? ])
 AC_ARG_ENABLE(hwapi, \
-[  --enable-hwapi		    enable hardware API library], \
-makefiles="${makefiles} ${hwapi_mk}",hwapi_mk=)
+  [  --enable-hwapi		    enable hardware API library], \
+      AC_MSG_RESULT(yes) \
+        RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi), \
+      AC_MSG_ERROR(no) \
+)
 
 AC_ARG_ENABLE(rtemsbsp, \
-[  --enable-rtemsbsp=bsp1 bsp2 ..   prefix for cross-tools], \
-RTEMS_BSP=$enableval)
+  [  --enable-rtemsbsp=bsp1 bsp2 ..   BSPs to include in build], \
+      RTEMS_BSP=$enableval \
+)
 
 AC_SUBST(RTEMS_BSP)
 AC_SUBST(RTEMS_HOST)
@@ -503,90 +275,43 @@ AC_SUBST(RTEMS_LIBC_DIR)
 AC_SUBST(PROJECT_ROOT)
 AC_SUBST(program_prefix)
 
+# pick up all the Makefiles in required parts of the tree
+RTEMS_CHECK_MAKEFILE(c/build-tools)
+RTEMS_CHECK_MAKEFILE(c/make)
+RTEMS_CHECK_MAKEFILE(c/src/lib/libmisc)
+RTEMS_CHECK_MAKEFILE(c/src/tests/samples)
 
+# try not to explicitly list a Makefile here 
 AC_OUTPUT( 
 Makefile
 c/Makefile
-c/build-tools/Makefile
-c/build-tools/os/Makefile
-c/build-tools/os/msdos/Makefile
-c/build-tools/scripts/Makefile
-c/build-tools/src/Makefile
-c/make/Makefile
-c/make/host.cfg
-c/make/Templates/Makefile.inc
 c/src/Makefile
 c/src/exec/Makefile
-c/src/exec/posix/Makefile
-c/src/exec/posix/base/Makefile
-c/src/exec/posix/headers/Makefile
-c/src/exec/posix/inline/Makefile
-c/src/exec/posix/macros/Makefile
-c/src/exec/posix/optman/Makefile
-c/src/exec/posix/src/Makefile
-c/src/exec/posix/sys/Makefile
-c/src/exec/rtems/Makefile
-c/src/exec/rtems/headers/Makefile
-c/src/exec/rtems/inline/Makefile
-c/src/exec/rtems/macros/Makefile
-c/src/exec/rtems/optman/Makefile
-c/src/exec/rtems/src/Makefile
-c/src/exec/sapi/Makefile
-c/src/exec/sapi/headers/Makefile
-c/src/exec/sapi/inline/Makefile
-c/src/exec/sapi/macros/Makefile
-c/src/exec/sapi/optman/Makefile
-c/src/exec/sapi/src/Makefile
 c/src/exec/score/Makefile
 c/src/exec/score/cpu/Makefile
 c/src/exec/score/headers/Makefile
 c/src/exec/score/inline/Makefile
-c/src/exec/score/macros/Makefile
 c/src/exec/score/src/Makefile
 c/src/exec/score/tools/Makefile
 c/src/exec/score/tools/generic/Makefile
-c/src/exec/wrapup/Makefile
-c/src/exec/wrapup/posix/Makefile
-c/src/exec/wrapup/rtems/Makefile
 c/src/lib/Makefile
 c/src/lib/include/Makefile
 c/src/lib/libbsp/Makefile
 c/src/lib/libbsp/shmdr/Makefile
 c/src/lib/libc/Makefile
 c/src/lib/libcpu/Makefile
-c/src/lib/libmisc/Makefile
-c/src/lib/libmisc/assoc/Makefile
-c/src/lib/libmisc/cpuuse/Makefile
-c/src/lib/libmisc/error/Makefile
-c/src/lib/libmisc/monitor/Makefile
-c/src/lib/libmisc/rtmonuse/Makefile
-c/src/lib/libmisc/stackchk/Makefile
-c/src/lib/libmisc/wrapup/Makefile
 c/src/lib/start/Makefile
 c/src/lib/wrapup/Makefile
 c/src/tests/Makefile
-c/src/tests/samples/Makefile
-c/src/tests/samples/base_mp/Makefile
-c/src/tests/samples/base_mp/node1/Makefile
-c/src/tests/samples/base_mp/node2/Makefile
-c/src/tests/samples/base_sp/Makefile
-c/src/tests/samples/cdtest/Makefile
-c/src/tests/samples/hello/Makefile
-c/src/tests/samples/paranoia/Makefile
-c/src/tests/samples/ticker/Makefile
 c/src/tests/support/Makefile
 c/src/tests/support/include/Makefile
 c/src/tests/support/stubdr/Makefile
 c/src/tests/support/wrapup/Makefile
 c/src/tests/tools/Makefile
 c/src/tests/tools/generic/Makefile
-c/src/tests/tools/hppa1_1/Makefile
-c/src/tests/tools/hppa1_1/simhppa/Makefile
-c/src/tests/tools/sparc/Makefile
-c/src/tests/tools/sparc/erc32/Makefile
-c/src/tests/tools/unix/Makefile
-c/src/tests/tools/unix/posix/Makefile
 $makefiles
+c/make/host.cfg
+c/make/Templates/Makefile.inc
 c/update-tools/Makefile)
 
 echo