Mercurial > ecos

diff host/libcdl/configure @ 283:f58bc1b2c2bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reorganization of the host-side autoconfiscation support, and a couple of minor bug fixes. The main goal is to support per-package host-side software in addition to the generic host-side tools. For example, the synthetic target HAL and device driver packages can now have host subdirectories with support code.
author bartv
date Sun, 11 Aug 2002 21:40:50 +0000
parents 511f4dc167f6
children c0ffaecb376e
line wrap: on
line diff
--- a/host/libcdl/configure
+++ b/host/libcdl/configure
@@ -15,9 +15,9 @@ ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
 ac_help="$ac_help
- --enable-debug do a debug rather than a release build"
+ --enable-debug           do a debug rather than a release build"
 ac_help="$ac_help
- --enable-ansi Do an ANSI rather than a unicode build"
+ --enable-ansi            do an ANSI rather than a unicode build"
 ac_help="$ac_help
  --disable-asserts        disable all assertions"
 ac_help="$ac_help
@@ -33,6 +33,12 @@ ac_help="$ac_help
 ac_help="$ac_help
  --disable-fntracing      disable function entry/exit tracing"
 ac_help="$ac_help
+ --with-infra-header=<path> location of eCos infrastructure headers"
+ac_help="$ac_help
+ --with-infra-lib=<path>    location of eCos infrastructure library"
+ac_help="$ac_help
+ --with-infra=<path>        location of eCos infrastructure installation"
+ac_help="$ac_help
  --with-tcl-version=<vsn> version of Tcl to be used"
 ac_help="$ac_help
  --with-tcl-header=<path> location of Tcl header"
@@ -40,8 +46,6 @@ ac_help="$ac_help
  --with-tcl-lib=<path>    location of Tcl libraries"
 ac_help="$ac_help
  --with-tcl=<path>        location of Tcl header and libraries"
-ac_help="$ac_help
- --with-infra=dir         location of the infrastructure build tree"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -554,7 +558,7 @@ fi
 
 
 ac_aux_dir=
-for ac_dir in .. $srcdir/..; do
+for ac_dir in ../../acsupport $srcdir/../../acsupport; do
   if test -f $ac_dir/install-sh; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -566,7 +570,7 @@ for ac_dir in .. $srcdir/..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in .. $srcdir/.." 1>&2; exit 1; }
+  { echo "configure: error: can not find install-sh or install.sh in ../../acsupport $srcdir/../../acsupport" 1>&2; exit 1; }
 fi
 ac_config_guess=$ac_aux_dir/config.guess
 ac_config_sub=$ac_aux_dir/config.sub
@@ -574,13 +578,27 @@ ac_configure=$ac_aux_dir/configure # Thi
 
 
 
+    echo $ac_n "checking that a separate build tree is being used""... $ac_c" 1>&6
+echo "configure:583: checking that a separate build tree is being used" >&5
+    ecos_cwd=`/bin/pwd`
+    if test "${srcdir}" = "." ; then
+        srcdir=${ecos_cwd}
+    fi
+    if test "${ecos_cwd}" = "${srcdir}" ; then
+        echo "$ac_t""no" 1>&6
+        { echo "configure: error: This configure script should not be run inside the source tree. Instead please use a separate build tree" 1>&2; exit 1; }
+    else
+        echo "$ac_t""yes" 1>&6
+    fi
+
+
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 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:584: checking host system type" >&5
+echo "configure:602: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -600,7 +618,6 @@ host_vendor=`echo $host | sed 's/^\([^-]
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -613,7 +630,7 @@ echo "$ac_t""$host" 1>&6
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:617: checking for a BSD compatible install" >&5
+echo "configure:634: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -666,7 +683,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:670: checking whether build environment is sane" >&5
+echo "configure:687: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -723,7 +740,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:727: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:744: 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
@@ -769,7 +786,7 @@ EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:773: checking for working aclocal" >&5
+echo "configure:790: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -782,7 +799,7 @@ else
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:786: checking for working autoconf" >&5
+echo "configure:803: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -795,7 +812,7 @@ else
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:799: checking for working automake" >&5
+echo "configure:816: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -808,7 +825,7 @@ else
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:812: checking for working autoheader" >&5
+echo "configure:829: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -821,7 +838,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:825: checking for working makeinfo" >&5
+echo "configure:842: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -843,7 +860,7 @@ EOF
 
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:847: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:864: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -866,37 +883,10 @@ fi
   
 
 
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:871: 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
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:900: checking for $ac_word" >&5
+echo "configure:890: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -926,7 +916,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:930: checking for $ac_word" >&5
+echo "configure:920: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -977,7 +967,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:981: checking for $ac_word" >&5
+echo "configure:971: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1009,7 +999,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1013: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1003: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1020,12 +1010,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1024 "configure"
+#line 1014 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1051,12 +1041,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1055: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1045: 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:1060: checking whether we are using GNU C" >&5
+echo "configure:1050: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1065,7 +1055,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1069: \"$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:1059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1084,7 +1074,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1088: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1078: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1120,7 +1110,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1124: checking for $ac_word" >&5
+echo "configure:1114: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1152,7 +1142,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1156: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1146: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1163,12 +1153,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1167 "configure"
+#line 1157 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:1172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1194,12 +1184,12 @@ if test $ac_cv_prog_cxx_works = no; then
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1198: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1188: 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:1203: checking whether we are using GNU C++" >&5
+echo "configure:1193: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1208,7 +1198,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1212: \"$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:1202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -1227,7 +1217,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1231: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1221: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1258,10 +1248,61 @@ else
   fi
 fi
 
+for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat > conftest.$ac_ext <<EOF
+#line 1262 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+$ac_declaration
+int main() {
+exit (42);
+; return 0; }
+EOF
+if { (eval echo configure:1270: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  continue
+fi
+rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 1280 "configure"
+#include "confdefs.h"
+$ac_declaration
+int main() {
+exit (42);
+; return 0; }
+EOF
+if { (eval echo configure:1287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+done
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
+fi
+
+
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1265: checking for $ac_word" >&5
+echo "configure:1306: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,13 +1330,13 @@ else
 fi
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:1293: checking for object suffix" >&5
+echo "configure:1334: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:1299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -1313,12 +1354,12 @@ OBJEXT=$ac_cv_objext
 ac_objext=$ac_cv_objext
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:1317: checking for Cygwin environment" >&5
+echo "configure:1358: 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 1322 "configure"
+#line 1363 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1329,7 +1370,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:1333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -1346,19 +1387,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:1350: checking for mingw32 environment" >&5
+echo "configure:1391: 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 1355 "configure"
+#line 1396 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:1362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -1377,7 +1418,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=y
 
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1381: checking for executable suffix" >&5
+echo "configure:1422: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1387,7 +1428,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1408,17 +1449,39 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6
 ac_exeext=$EXEEXT
 
 
+    ecos_CFLAGS=""
+    ecos_CXXFLAGS=""
+    ecos_LDADD=""
+    ecos_INCLUDES=""
+    ecos_LIBS=""
+    
+    
+    
+    
+    
+
+
+    
     
     
 
     echo $ac_n "checking "for Visual C++"""... $ac_c" 1>&6
-echo "configure:1416: checking "for Visual C++"" >&5
+echo "configure:1470: checking "for Visual C++"" >&5
     MSVC="no";
     if test "${CC}" = "cl" ; then
        MSVC="yes"
+       CXX="cl"
+       
+    
+    
+    if test "${MSVC}" = "yes" ; then
+      MSVC_SRCDIR=`cygpath -w ${MSVC_SRCDIR} | tr \\\\\\\\ /`
     fi
-    if test "${CXX}" = "cl" ; then
-       MSVC="yes"
+
+       
+       ecos_INCLUDES="${ecos_INCLUDES} \"-I${msvc_srcdir}\""
+       ecos_LDADD="-link"
+       ecos_LIBS="advapi32.lib"
     fi
     
 
@@ -1429,409 +1492,473 @@ else
   MSVC_TRUE='#'
   MSVC_FALSE=
 fi
-    echo "$ac_t""${MSVC}" 1>&6
+    if test "${MSVC}" = "yes" ; then
+        echo "$ac_t""unfortunately yes" 1>&6
+    else
+        echo "$ac_t""no" 1>&6
+    fi
 
 
     
     
     
+    
 
     echo $ac_n "checking "the default compiler flags"""... $ac_c" 1>&6
-echo "configure:1441: checking "the default compiler flags"" >&5
+echo "configure:1509: checking "the default compiler flags"" >&5
 
-                        cygflags_enable_debug="no"
+            ecosflags_enable_debug="no"
     # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
   enableval="$enable_debug"
   case "${enableval}" in
-       yes) cygflags_enable_debug="yes" ;;
-       *)   cygflags_enable_debug="no" ;;
+       yes) ecosflags_enable_debug="yes" ;;
+       *)   ecosflags_enable_debug="no" ;;
     esac
 fi
 
 
-            cygflags_enable_ansi="no"
+                    ecosflags_enable_ansi="no"
     if test "${MSVC}" = "yes" ; then
       # Check whether --enable-ansi or --disable-ansi was given.
 if test "${enable_ansi+set}" = set; then
   enableval="$enable_ansi"
   case "${enableval}" in
-         yes) cygflags_enable_ansi="yes" ;;
-         *)   cygflags_enable_ansi="no" ;;
+         yes) ecosflags_enable_ansi="yes" ;;
+         *)   ecosflags_enable_ansi="no" ;;
       esac
 fi
 
     fi
 
         if test "${GCC}" = "yes" ; then
-        cyg_CFLAGS="-pipe -Wall -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs"
-        cyg_CXXFLAGS="-pipe -Wall -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Woverloaded-virtual"
+        ecos_CFLAGS="${ecos_CFLAGS} -pipe -Wall -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs"
+        ecos_CXXFLAGS="${ecos_CXXFLAGS} -pipe -Wall -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Woverloaded-virtual"
     elif test "${MSVC}" = "yes" ; then
-        cyg_CFLAGS="-nologo -W3"
-        cyg_CXXFLAGS="-nologo -W3 -GR -GX"
+        ecos_CFLAGS="${ecos_CFLAGS} -nologo -W3"
+        ecos_CXXFLAGS="${ecos_CXXFLAGS} -nologo -W3 -GR -GX"
     else
         { echo "configure: error: "default flags for ${CC} are not known"" 1>&2; exit 1; }
     fi
 
-        if test "${cygflags_enable_debug}" = "yes" ; then
+        if test "${ecosflags_enable_debug}" = "yes" ; then
         if test "${GCC}" = "yes" ; then
-            cyg_CFLAGS="${cyg_CFLAGS} -g -O0"
-            cyg_CXXFLAGS="${cyg_CXXFLAGS} -g -O0"
+            ecos_CFLAGS="${ecos_CFLAGS} -g -O0"
+            ecos_CXXFLAGS="${ecos_CXXFLAGS} -g -O0"
         elif test "${MSVC}" = "yes" ; then
-            cyg_CFLAGS="${cyg_CFLAGS} -MDd -Zi"
-            cyg_CXXFLAGS="${cyg_CXXFLAGS} -MDd -Zi"
+            ecos_CFLAGS="${ecos_CFLAGS} -MDd -Zi"
+            ecos_CXXFLAGS="${ecos_CXXFLAGS} -MDd -Zi"
         fi
     else
-        if test "${GCC}" = "yes" ; then
-            cyg_CFLAGS="${cyg_CFLAGS} -O0"
-            cyg_CXXFLAGS="${cyg_CXXFLAGS} -O0"
+                                        if test "${GCC}" = "yes" ; then
+            ecos_CFLAGS="${ecos_CFLAGS} -O0"
+            ecos_CXXFLAGS="${ecos_CXXFLAGS} -O0"
         elif test "${MSVC}" = "yes" ; then
-            cyg_CFLAGS="${cyg_CFLAGS} -MD -O2"
-            cyg_CXXFLAGS="${cyg_CXXFLAGS} -MD -O2"
+            ecos_CFLAGS="${ecos_CFLAGS} -MD -O2"
+            ecos_CXXFLAGS="${ecos_CXXFLAGS} -MD -O2"
         fi
     fi
 
     CFLAGS="${ac_save_CFLAGS}"
     CXXFLAGS="${ac_save_CXXFLAGS}"
-    
-    
+
     echo "$ac_t""done" 1>&6
 
 
 
-
-
-
+    
 
-if test "${cygflags_enable_debug}" = "yes" ; then
-  cyginfra_asserts=yes
-  cyginfra_preconditions=yes
-  cyginfra_postconditions=yes
-  cyginfra_invariants=yes
-  cyginfra_loopinvariants=yes
-  cyginfra_tracing=yes
-  cyginfra_fntracing=yes
-else
-  cyginfra_asserts=no
-  cyginfra_preconditions=no
-  cyginfra_postconditions=no
-  cyginfra_invariants=no
-  cyginfra_loopinvariants=no
-  cyginfra_tracing=no
-  cyginfra_fntracing=no
-fi
+    if test "${ecosflags_enable_debug}" = "yes" ; then
+        ecosinfra_asserts="yes"
+        ecosinfra_preconditions="yes"
+        ecosinfra_postconditions="yes"
+        ecosinfra_invariants="yes"
+        ecosinfra_loopinvariants="yes"
+        ecosinfra_tracing="yes"
+        ecosinfra_fntracing="yes"
+    else
+        ecosinfra_asserts="no"
+        ecosinfra_preconditions="no"
+        ecosinfra_postconditions="no"
+        ecosinfra_invariants="no"
+        ecosinfra_loopinvariants="no"
+        ecosinfra_tracing="no"
+        ecosinfra_fntracing="no"
+    fi
 
-# Check whether --enable-asserts or --disable-asserts was given.
+    # Check whether --enable-asserts or --disable-asserts was given.
 if test "${enable_asserts+set}" = set; then
   enableval="$enable_asserts"
   case "${enableval}" in
-  yes) cyginfra_asserts=yes ;;
-  no)  cyginfra_asserts=no  ;;
-  *)   { echo "configure: error: bad value ${enableval} for disable-asserts option" 1>&2; exit 1; } ;;
-esac
+            yes) ecosinfra_asserts="yes" ;;
+            no)  ecosinfra_asserts="no"  ;;
+            *)   { echo "configure: error: bad value ${enableval} for disable-asserts option" 1>&2; exit 1; } ;;
+        esac
 fi
 
-if test "${cyginfra_asserts}" = "yes"; then
-  cat >> confdefs.h <<\EOF
+    if test "${ecosinfra_asserts}" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define CYGDBG_USE_ASSERTS 1
 EOF
 
-fi
+    fi
 
-# Check whether --enable-preconditions or --disable-preconditions was given.
+    # Check whether --enable-preconditions or --disable-preconditions was given.
 if test "${enable_preconditions+set}" = set; then
   enableval="$enable_preconditions"
   case "${enableval}" in
-  yes) cyginfra_preconditions=yes ;;
-  no)  cyginfra_preconditions=no  ;;
-  *)   { echo "configure: error: bad value ${enableval} for disable-preconditions option" 1>&2; exit 1; } ;;
-esac
+            yes) ecosinfra_preconditions="yes" ;;
+            no)  ecosinfra_preconditions="no"  ;;
+            *)   { echo "configure: error: bad value ${enableval} for disable-preconditions option" 1>&2; exit 1; } ;;
+        esac
 fi
 
-if test "${cyginfra_preconditions}" = "yes"; then
-  cat >> confdefs.h <<\EOF
+    if test "${ecosinfra_preconditions}" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define CYGDBG_INFRA_DEBUG_PRECONDITIONS 1
 EOF
 
-fi
+    fi
 
-# Check whether --enable-postconditions or --disable-postconditions was given.
+    # Check whether --enable-postconditions or --disable-postconditions was given.
 if test "${enable_postconditions+set}" = set; then
   enableval="$enable_postconditions"
   case "${enableval}" in
-  yes) cyginfra_postconditions=yes ;;
-  no)  cyginfra_postconditions=no  ;;
-  *)   { echo "configure: error: bad value ${enableval} for disable-postconditions option" 1>&2; exit 1; } ;;
-esac
+            yes) ecosinfra_postconditions="yes" ;;
+            no)  ecosinfra_postconditions="no"  ;;
+            *)   { echo "configure: error: bad value ${enableval} for disable-postconditions option" 1>&2; exit 1; } ;;
+        esac
 fi
 
-if test "${cyginfra_postconditions}" = "yes"; then
-  cat >> confdefs.h <<\EOF
+    if test "${ecosinfra_postconditions}" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define CYGDBG_INFRA_DEBUG_POSTCONDITIONS 1
 EOF
 
-fi
+    fi
 
-# Check whether --enable-invariants or --disable-invariants was given.
+    # Check whether --enable-invariants or --disable-invariants was given.
 if test "${enable_invariants+set}" = set; then
   enableval="$enable_invariants"
   case "${enableval}" in
-  yes) cyginfra_invariants=yes ;;
-  no)  cyginfra_invariants=no  ;;
-  *)   { echo "configure: error: bad value ${enableval} for disable-invariants option" 1>&2; exit 1; } ;;
-esac
+            yes) ecosinfra_invariants="yes" ;;
+            no)  ecosinfra_invariants="no"  ;;
+            *)   { echo "configure: error: bad value ${enableval} for disable-invariants option" 1>&2; exit 1; } ;;
+        esac
 fi
 
-if test "${cyginfra_invariants}" = "yes"; then
-  cat >> confdefs.h <<\EOF
+    if test "${ecosinfra_invariants}" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define CYGDBG_INFRA_DEBUG_INVARIANTS 1
 EOF
 
-fi
+    fi
 
-# Check whether --enable-loopinvariants or --disable-loopinvariants was given.
+    # Check whether --enable-loopinvariants or --disable-loopinvariants was given.
 if test "${enable_loopinvariants+set}" = set; then
   enableval="$enable_loopinvariants"
   case "${enableval}" in
-  yes) cyginfra_loopinvariants=yes ;;
-  no)  cyginfra_loopinvariants=no  ;;
-  *)   { echo "configure: error: bad value ${enableval} for disable-loopinvariants option" 1>&2; exit 1; } ;;
-esac
+            yes) ecosinfra_loopinvariants="yes" ;;
+            no)  ecosinfra_loopinvariants="no"  ;;
+            *)   { echo "configure: error: bad value ${enableval} for disable-loopinvariants option" 1>&2; exit 1; } ;;
+        esac
 fi
 
-if test "${cyginfra_loopinvariants}" = "yes"; then
-  cat >> confdefs.h <<\EOF
+    if test "${ecosinfra_loopinvariants}" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define CYGDBG_INFRA_DEBUG_LOOP_INVARIANTS 1
 EOF
 
-fi
+    fi
 
-# Check whether --enable-tracing or --disable-tracing was given.
+    # Check whether --enable-tracing or --disable-tracing was given.
 if test "${enable_tracing+set}" = set; then
   enableval="$enable_tracing"
   case "${enableval}" in
-  yes) cyginfra_tracing=yes ;;
-  no)  cyginfra_tracing=no  ;;
-  *)   { echo "configure: error: bad value ${enableval} for disable-tracing option" 1>&2; exit 1; } ;;
-esac
+            yes) ecosinfra_tracing="yes" ;;
+            no)  ecosinfra_tracing="no"  ;;
+            *)   { echo "configure: error: bad value ${enableval} for disable-tracing option" 1>&2; exit 1; } ;;
+        esac
 fi
 
-if test "${cyginfra_tracing}" = "yes"; then
-  cat >> confdefs.h <<\EOF
+    if test "${ecosinfra_tracing}" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define CYGDBG_USE_TRACING 1
 EOF
 
-fi
+    fi
 
-# Check whether --enable-fntracing or --disable-fntracing was given.
+    # Check whether --enable-fntracing or --disable-fntracing was given.
 if test "${enable_fntracing+set}" = set; then
   enableval="$enable_fntracing"
   case "${enableval}" in
-  yes) cyginfra_fntracing=yes ;;
-  no)  cyginfra_fntracing=no  ;;
-  *)   { echo "configure: error: bad value ${enableval} for disable-fntracing option" 1>&2; exit 1; } ;;
-esac
+            yes) ecosinfra_fntracing="yes" ;;
+            no)  ecosinfra_fntracing=no  ;;
+            *)   { echo "configure: error: bad value ${enableval} for disable-fntracing option" 1>&2; exit 1; } ;;
+    esac
 fi
 
-if test "${cyginfra_fntracing}" = "yes"; then
-  cat >> confdefs.h <<\EOF
+    if test "${ecosinfra_fntracing}" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define CYGDBG_INFRA_DEBUG_FUNCTION_REPORTS 1
 EOF
 
+    fi
+
+
+    echo $ac_n "checking for eCos host-side infrastructure""... $ac_c" 1>&6
+echo "configure:1711: checking for eCos host-side infrastructure" >&5
+
+                infra_builddir=""
+    possibles=".. ../.. ../../.. ../../../.. ../../../../.."
+    
+    infra_builddir=""
+    for i in ${possibles}; do
+        if test -d "$i/"infra""; then
+            infra_builddir=$i
+            break
+        fi
+    done
+
+    if test "${infra_builddir}" = "" ; then
+      possibles="../host ../../host ../../../host ../../../../host ../../../../../host ../../../../../../host"
+      
+    infra_builddir=""
+    for i in ${possibles}; do
+        if test -d "$i/"infra""; then
+            infra_builddir=$i
+            break
+        fi
+    done
+
+    fi
+    if test "${infra_builddir}" != "" ; then
+        infra_builddir="${infra_builddir}/infra"
+        infra_builddir=`cd ${infra_builddir} && /bin/pwd`
+    fi
+
+    ecos_infra_incdir=""
+    ecos_infra_libdir=""
+    ecos_infra_libs=""
+
+    # Check whether --with-infra-header or --without-infra-header was given.
+if test "${with_infra_header+set}" = set; then
+  withval="$with_infra_header"
+  :
+fi
+
+    # Check whether --with-infra-lib or --without-infra-lib was given.
+if test "${with_infra_lib+set}" = set; then
+  withval="$with_infra_lib"
+  :
+fi
+
+    # Check whether --with-infra or --without-infra was given.
+if test "${with_infra+set}" = set; then
+  withval="$with_infra"
+  :
 fi
 
 
+    if test "${with_infra_header+set}" = "set"; then
+        ecos_infra_incdir="${with_infra_header}"
+    elif test "${with_infra+set}" = "set"; then
+        ecos_infra_incdir="${with_infra}/include"
+    elif test "${infra_builddir}" != "" ; then
+        ecos_infra_incdir="${infra_builddir}"
+    else
+        { echo "configure: error: infrastructure headers not found" 1>&2; exit 1; }
+    fi
+    if test "${MSVC}" = "yes" ; then
+        ecos_msvc_infra_incdir = ${ecos_infra_incdir}
+        
+    
+    
+    if test "${MSVC}" = "yes" ; then
+      ecos_msvc_infra_incdir=`cygpath -w ${ecos_msvc_infra_incdir} | tr \\\\\\\\ /`
+    fi
 
+        ecos_INCLUDES="${ecos_INCLUDES} \"-I${ecos_msvc_infra_incdir}\""
+    else
+        ecos_INCLUDES="${ecos_INCLUDES} -I${ecos_infra_incdir}"
+    fi
+
+    if test "${with_infra_lib+set}" = "set"; then
+        ecos_infra_libdir="${with_infra_lib}"
+    elif test "${with_infra+set}" = "set"; then
+        ecos_infra_libdir="${with_infra}/lib"
+    elif test "${infra_builddir}" != "" ; then
+        ecos_infra_libdir="${infra_builddir}"
+    else
+        { echo "configure: error: infrastructure library not found" 1>&2; exit 1; }
+    fi
+    if test "${MSVC}" = "yes" ; then
+        ecos_msvc_infra_libdir=${ecos_infra_libdir}
+        
+    
+    
+    if test "${MSVC}" = "yes" ; then
+      ecos_msvc_infra_libdir=`cygpath -w ${ecos_msvc_infra_libdir} | tr \\\\\\\\ /`
+    fi
+
+        ecos_LIBS="${ecos_LIBS} cyginfra.lib"
+        ecos_LDADD="${ecos_LDADD} \"-libpath=${ecos_msvc_infra_libdir}\""
+    else
+        ecos_LIBS="${ecos_LIBS} -lcyginfra"
+        ecos_LDADD="${ecos_LDADD} -L${ecos_infra_libdir}"
+    fi
+
+    
+    
+    echo "$ac_t""-I${ecos_infra_incdir} -L${ecos_infra_libdir}" 1>&6
 
 
 
-
-
+    
+    
 
-echo $ac_n "checking for Tcl version""... $ac_c" 1>&6
-echo "configure:1653: checking for Tcl version" >&5
-# Check whether --with-tcl-version or --without-tcl-version was given.
+    ecos_tcl_version=""
+    ecos_tcl_incdir=""
+    ecos_tcl_libdir=""
+    ecos_tk_libs=""
+
+                
+    echo $ac_n "checking for Tcl version""... $ac_c" 1>&6
+echo "configure:1828: checking for Tcl version" >&5
+    # Check whether --with-tcl-version or --without-tcl-version was given.
 if test "${with_tcl_version+set}" = set; then
   withval="$with_tcl_version"
   
-  cyg_ac_tcl_version=${with_tcl_version}
-
+        ecos_tcl_version=${with_tcl_version}
+    
 else
   
-  if test "${MSVC}" = "yes" ; then
-    cyg_ac_tcl_version=80
-  else
-    if test "${ac_cv_cygwin}" = "yes" ; then
-      cyg_ac_tcl_version=80
-    else
-      cyg_ac_tcl_version=""
-    fi
-  fi
-
+        if test "${MSVC}" = "yes" ; then
+           ecos_tcl_version=80
+        elif test "${ac_cv_cygwin}" = "yes" ; then
+           ecos_tcl_version=80
+        else
+           ecos_tcl_version=""
+        fi
+    
 fi
 
-echo "$ac_t""${cyg_ac_tcl_version}" 1>&6
-
-
+    echo "$ac_t""${ecos_tcl_version}" 1>&6
 
-# Check whether --with-tcl or --without-tcl was given.
-if test "${with_tcl+set}" = set; then
-  withval="$with_tcl"
+        echo $ac_n "checking for Tcl installation""... $ac_c" 1>&6
+echo "configure:1850: checking for Tcl installation" >&5
+
+    # Check whether --with-tcl-header or --without-tcl-header was given.
+if test "${with_tcl_header+set}" = set; then
+  withval="$with_tcl_header"
   :
 fi
 
-# Check whether --with-tcl or --without-tcl was given.
-if test "${with_tcl+set}" = set; then
-  withval="$with_tcl"
+    # Check whether --with-tcl-lib or --without-tcl-lib was given.
+if test "${with_tcl_lib+set}" = set; then
+  withval="$with_tcl_lib"
   :
 fi
 
-# Check whether --with-tcl or --without-tcl was given.
+    # Check whether --with-tcl or --without-tcl was given.
 if test "${with_tcl+set}" = set; then
   withval="$with_tcl"
   :
 fi
 
 
-echo $ac_n "checking for Tcl installation""... $ac_c" 1>&6
-echo "configure:1698: checking for Tcl installation" >&5
-
+                                
+    if test "${MSVC}" = "yes" ; then
 
-if test "${MSVC}" = "yes" ; then
-  if test "${with_tcl_header+set}" = set; then
-    cyg_ac_tcl_incdir=${with_tcl_header}
-  else
-    if test "${with_tcl+set}" = set; then
-      cyg_ac_tcl_incdir="${with_tcl}/include"
-    else
-      { echo "configure: error: You must specify a Tcl installation with either --with-tcl=<path> or --with-tcl-header=<path>" 1>&2; exit 1; }
-    fi
-  fi
-  if test "${with_tcl_lib+set}" = set; then
-    cyg_ac_tcl_libdir=${with_tcl_lib}
-  else
-    if test "${with_tcl+set}" = set; then
-      cyg_ac_tcl_libdir="${with_tcl}/lib"
-    else
-      { echo "configure: error: You must specify a Tcl installation with either --with-tcl=<path> or --with-tcl-lib=<path>" 1>&2; exit 1; }
-    fi
-  fi
-  cyg_ac_tcl_libs="tcl${cyg_ac_tcl_version}.lib"
-else
-  tcl_incdirs="${with_tcl_header} ${with_tcl}/include ${prefix}/include /usr/include/tcl$cyg_ac_tcl_version /usr/include"
+        if test "${with_tcl_header+set}" = set ; then
+            ecos_tcl_incdir=${with_tcl_header}
+        elif test "${with_tcl+set}" = set ; then
+            ecos_tcl_incdir="${with_tcl}/include"
+        else
+            { echo "configure: error: You must specify a Tcl installation with either --with-tcl=<path> or --with-tcl-header=<path>" 1>&2; exit 1; }
+        fi
   
-cyg_ac_tcl_incdir=NO
-for i in $tcl_incdirs;
-do
-  for j in tcl.h;
-  do
-    if test -r "$i/$j"; then
-      cyg_ac_tcl_incdir=$i
-      break 2
+                        if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then
+            { echo "configure: error: unable to locate Tcl header file tcl.h" 1>&2; exit 1; }
+        fi
+        ecos_msvc_tcl_incdir="${ecos_tcl_incdir}"
+        
+    
+    
+    if test "${MSVC}" = "yes" ; then
+      ecos_msvc_tcl_incdir=`cygpath -w ${ecos_msvc_tcl_incdir} | tr \\\\\\\\ /`
     fi
-  done
-done
 
-  tcl_libdirs="${with_tcl_lib} ${with_tcl}/lib ${libdir} ${prefix}/lib /usr/lib/tcl$cyg_ac_tcl_version /usr/lib"
-  
-cyg_ac_tcl_libdir=NO
-for i in $tcl_libdirs;
-do
-  for j in tclConfig.sh;
-  do
-    if test -r "$i/$j"; then
-      cyg_ac_tcl_libdir=$i
-      break 2
-    fi
-  done
-done
+        ecos_INCLUDES="${ecos_INCLUDES} \"-I${ecos_msvc_tcl_incdir}\""
 
-  if test \! -r ${cyg_ac_tcl_libdir}/tclConfig.sh ; then
-    { echo "configure: error: unable to locate Tcl config file tclConfig.sh" 1>&2; exit 1; }
-  else
-    . ${cyg_ac_tcl_libdir}/tclConfig.sh
-    cyg_ac_tcl_libs="-ltcl${cyg_ac_tcl_version} ${TCL_LIBS}"
-  fi
-fi
-
-if test \! -r ${cyg_ac_tcl_incdir}/tcl.h ; then
-  { echo "configure: error: unable to locate Tcl header file tcl.h" 1>&2; exit 1; }
-fi
-
-if test "${MSVC}" = "yes" ; then
-  
+        if test "${with_tcl_lib+set}" = set; then
+            ecos_tcl_libdir=${with_tcl_lib}
+        elif test "${with_tcl+set}" = set; then
+            ecos_tcl_libdir="${with_tcl}/lib"
+        else
+            { echo "configure: error: You must specify a Tcl installation with either --with-tcl=<path> or --with-tcl-lib=<path>" 1>&2; exit 1; }
+        fi
+        
     
     
-
     if test "${MSVC}" = "yes" ; then
-      cyg_ac_tcl_incdir=`cygpath -w ${cyg_ac_tcl_incdir} | tr \\\\\\\\ /`
-    fi
-
-  
-    
-    
-
-    if test "${MSVC}" = "yes" ; then
-      cyg_ac_tcl_libdir=`cygpath -w ${cyg_ac_tcl_libdir} | tr \\\\\\\\ /`
+      ecos_tcl_libdir=`cygpath -w ${ecos_tcl_libdir} | tr \\\\\\\\ /`
     fi
 
-fi
+        ecos_LIBS="${ecos_LIBS} tcl${ecos_tcl_version}.lib"
+        ecos_LDADD="${ecos_LDADD} \"-libpath=${ecos_tcl_libdir}\""
 
-echo "$ac_t""${cyg_ac_tcl_libdir}" 1>&6
-
+                        ecos_tk_libs=""
 
-
-
-
-
-
+    else
+                        possibles="${with_tcl_header} ${with_tcl}/include ${prefix}/include /usr/include/tcl${ecos_tcl_version} /usr/include"
+        
+    ecos_tcl_incdir=""
+    for i in ${possibles}; do
+        if test -r "$i/"tcl.h""; then
+            ecos_tcl_incdir=$i
+            break
+        fi
+    done
 
-echo $ac_n "checking for infrastructure files""... $ac_c" 1>&6
-echo "configure:1791: checking for infrastructure files" >&5
-# Check whether --with-infra or --without-infra was given.
-if test "${with_infra+set}" = set; then
-  withval="$with_infra"
-  
-  cyg_ac_infra_incdir=${with_infra}
-  cyg_ac_infra_libdir=${with_infra}
+        if test \! -r "${ecos_tcl_incdir}/tcl.h" ; then
+            { echo "configure: error: unable to locate Tcl header file tcl.h" 1>&2; exit 1; }
+        else
+                                                                                                            if test "${ecos_tcl_incdir}" != "/usr/include" ; then
+                ecos_INCLUDES="${ecos_INCLUDES} -I${ecos_tcl_incdir}"
+            fi
+        fi
+        possibles="${with_tcl_lib} ${with_tcl}/lib ${libdir} ${prefix}/lib /usr/lib/tcl$${ecos_tcl_version} /usr/lib"
+        
+    ecos_tcl_libdir=""
+    for i in ${possibles}; do
+        if test -r "$i/"tclConfig.sh""; then
+            ecos_tcl_libdir=$i
+            break
+        fi
+    done
 
-else
-  
-  if test -d ../infra ; then
-    cyg_ac_infra_incdir=../infra
-    cyg_ac_infra_libdir=../infra
-  else
-    cyg_ac_infra_incdir=${prefix}/include
-    cyg_ac_ac_infra_libdir=${prefix}/lib
-  fi
+        if test \! -r "${ecos_tcl_libdir}/tclConfig.sh" ; then
+            { echo "configure: error: unable to locate Tcl config file tclConfig.sh" 1>&2; exit 1; }
+        else
+            . ${ecos_tcl_libdir}/tclConfig.sh
+            ecos_LIBS="${ecos_LIBS} -ltcl${ecos_tcl_version} ${TCL_LIBS}"
+        fi
 
-fi
+        if test \! -r "${ecos_tcl_libdir}/tkConfig.sh" ; then
+            { echo "configure: error: unable to locate Tk config file tkConfig.sh" 1>&2; exit 1; }
+        else
+            . ${ecos_tcl_libdir}/tkConfig.sh
+            ecos_tk_libs="-ltk${ecos_tcl_version} ${TK_LIBS}"
+                                    for lib in ${TCL_LIBS} ; do
+                ecos_tk_libs=`echo ${ecos_tk_libs} | sed -e "s!${lib}!!"`
+            done
+        fi
+    fi
 
+    echo "$ac_t""-I${ecos_tcl_incdir} -L${ecos_tcl_libdir}" 1>&6
 
     
-    
-
-    if test "${MSVC}" = "yes" ; then
-      cyg_ac_infra_incdir=`cygpath -w ${cyg_ac_infra_incdir} | tr \\\\\\\\ /`
-    fi
-
-
-    
-    
-
-    if test "${MSVC}" = "yes" ; then
-      cyg_ac_infra_libdir=`cygpath -w ${cyg_ac_infra_libdir} | tr \\\\\\\\ /`
-    fi
-
-
-
-echo "$ac_t""-I${cyg_ac_infra_incdir} -L${cyg_ac_infra_libdir}" 1>&6
-
-if test "${MSVC}" = "yes" ; then
-  INCLUDES="\"-I`cygpath -w ${srcdir} | tr \\\\\\\\ /`\" \"-I${cyg_ac_infra_incdir}\" \"-I${cyg_ac_tcl_incdir}\""
-else
-  INCLUDES="-I${cyg_ac_infra_incdir} -I${cyg_ac_tcl_incdir}"
-fi
 
 
 
@@ -1994,18 +2121,17 @@ s%@CXX@%$CXX%g
 s%@RANLIB@%$RANLIB%g
 s%@OBJEXT@%$OBJEXT%g
 s%@EXEEXT@%$EXEEXT%g
+s%@ecos_CFLAGS@%$ecos_CFLAGS%g
+s%@ecos_CXXFLAGS@%$ecos_CXXFLAGS%g
+s%@ecos_LDADD@%$ecos_LDADD%g
+s%@ecos_INCLUDES@%$ecos_INCLUDES%g
+s%@ecos_LIBS@%$ecos_LIBS%g
+s%@MSVC_SRCDIR@%$MSVC_SRCDIR%g
 s%@MSVC_TRUE@%$MSVC_TRUE%g
 s%@MSVC_FALSE@%$MSVC_FALSE%g
-s%@cyg_CFLAGS@%$cyg_CFLAGS%g
-s%@cyg_CXXFLAGS@%$cyg_CXXFLAGS%g
-s%@cyg_ac_tcl_version@%$cyg_ac_tcl_version%g
-s%@cyg_ac_tcl_incdir@%$cyg_ac_tcl_incdir%g
-s%@cyg_ac_tcl_libdir@%$cyg_ac_tcl_libdir%g
-s%@cyg_ac_tcl_libs@%$cyg_ac_tcl_libs%g
-s%@cyg_ac_tk_libs@%$cyg_ac_tk_libs%g
-s%@cyg_ac_infra_incdir@%$cyg_ac_infra_incdir%g
-s%@cyg_ac_infra_libdir@%$cyg_ac_infra_libdir%g
-s%@INCLUDES@%$INCLUDES%g
+s%@ecos_infra_incdir@%$ecos_infra_incdir%g
+s%@ecos_infra_libdir@%$ecos_infra_libdir%g
+s%@ecos_tk_libs@%$ecos_tk_libs%g
 
 CEOF
 EOF