Index: tcl.m4
==================================================================
--- tcl.m4
+++ tcl.m4
@@ -1,11 +1,11 @@
 # tcl.m4 --
 #
 #	This file provides a set of autoconf macros to help TEA-enable
 #	a Tcl extension.
 #
-# Copyright (c) 1999-2000 Scriptics Corporation.
+# Copyright (c) 1999 Scriptics Corporation.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 #------------------------------------------------------------------------
@@ -301,11 +301,11 @@
 	[ok=$enableval], [ok=no])
     if test "$ok" = "yes"; then
 	CC=gcc
     else
 	case "`uname -s`" in
-	    *win32* | *WIN32* | *CYGWIN_NT*)
+	    *win32* | *WIN32* | *CYGWIN_NT* | *CYGWIN_98* | *CYGWIN_95*)
 		CC=cl
 	    ;;
 	    *)
 		CC=${CC-cc}
 	    ;;
@@ -1892,12 +1892,10 @@
     if test "x$1_LIB_NAME" = x ; then
 	AC_MSG_ERROR(not found)
     else
 	AC_MSG_RESULT(${$1_LIB_SPEC})
     fi
-    AC_SUBST($1_LIB_SPEC)
-    AC_SUBST($1_LIB_NAME)
 ])
 
 #------------------------------------------------------------------------
 # SC_PRIVATE_TCL_HEADERS --
 #
@@ -2203,12 +2201,12 @@
     AC_MSG_CHECKING([for tclsh])
 
     AC_CACHE_VAL(ac_cv_path_tclsh, [
 	search_path=`echo ${exec_prefix}/bin:${prefix}/bin:${TCL_BIN_DIR}:${TCL_BIN_DIR}/../bin:${PATH} | sed -e 's/:/ /g'`
 	for dir in $search_path ; do
-	    for j in `ls -r $dir/tclsh[[8-9]]* 2> /dev/null` \
-		    `ls -r $dir/tclsh* 2> /dev/null` ; do
+	    for j in `ls -r $dir/tclsh[[8-9]]*${EXEEXT} 2> /dev/null` \
+		    `ls -r $dir/tclsh*${EXEEXT} 2> /dev/null` ; do
 		if test x"$ac_cv_path_tclsh" = x ; then
 		    if test -f "$j" ; then
 			ac_cv_path_tclsh=$j
 			break
 		    fi
@@ -2247,12 +2245,12 @@
     AC_MSG_CHECKING([for wish])
 
     AC_CACHE_VAL(ac_cv_path_wish, [
 	search_path=`echo ${exec_prefix}/bin:${prefix}/bin:${TCL_BIN_DIR}:${TCL_BIN_DIR}/../bin:${PATH} | sed -e 's/:/ /g'`
 	for dir in $search_path ; do
-	    for j in `ls -r $dir/wish[[8-9]]* 2> /dev/null` \
-		    `ls -r $dir/wish* 2> /dev/null` ; do
+	    for j in `ls -r $dir/wish[[8-9]]*${EXEEXT} 2> /dev/null` \
+		    `ls -r $dir/wish*${EXEEXT} 2> /dev/null` ; do
 		if test x"$ac_cv_path_wish" = x ; then
 		    if test -f "$j" ; then
 			ac_cv_path_wish=$j
 			break
 		    fi