* Changed version to 8.2b2.

* win/tclWinPort.h: Block out include of sys/*.h in order to
build extensions with MetroWerks compiler for Win32. [Bug: 2385]

* generic/tclCmdMZ.c:
* generic/tclIO.c: Fix ANSI-style prototypes based on patch from
Ulrich Ring.  [Bug: 2391]

* unix/Makefile.in: Need to make install-sh executable before
calling (with chmod +x).  [Bug: 2413]

* tests/var.test:
* generic/tclVar.c:  Fixed bug that caused a seg. fault when using
"array set a(b) {}", which is a bad array name anyway.  Now the
"array set" command will return an error in this case.  Added test
case and fixed existing test. [Bug: 2427]

20 files changed, 139 insertions, 82 deletions

diff --git a/ChangeLog b/ChangeLog
index 605477a..d9f9915 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+1999-07-22    <redman@scriptics.com>
+
+	* Changed version to 8.2b2.
+
+	* win/tclWinPort.h: Block out include of sys/*.h in order to
+	build extensions with MetroWerks compiler for Win32. [Bug: 2385]
+	
+	* generic/tclCmdMZ.c:
+	* generic/tclIO.c: Fix ANSI-style prototypes based on patch from
+	Ulrich Ring.  [Bug: 2391]
+	
+	* unix/Makefile.in: Need to make install-sh executable before
+	calling (with chmod +x).  [Bug: 2413]
+	
+	* tests/var.test:
+	* generic/tclVar.c:  Fixed bug that caused a seg. fault when using
+	"array set a(b) {}", which is a bad array name anyway.  Now the
+	"array set" command will return an error in this case.  Added test
+	case and fixed existing test. [Bug: 2427]
+
 1999-07-21    <redman@scriptics.com>
 
 	* tests/info.test:
diff --git a/README b/README
index ed14f0a..9df133a 100644
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
 README:  Tcl
-    This is the Tcl 8.2b1 source distribution.
+    This is the Tcl 8.2b2 source distribution.
     You can get this release from:
-        http://www.scriptics.com/registration/8.2b1.tml
+        http://www.scriptics.com/registration/8.2b2.tml
 
-RCS: @(#) $Id: README,v 1.21 1999/07/21 16:04:23 jpeek Exp $
+RCS: @(#) $Id: README,v 1.22 1999/07/22 21:50:53 redman Exp $
 
 Contents
 --------
@@ -50,7 +50,7 @@ Information about new features in 8.2 can be found at
     http://www.scriptics.com/software/whatsnew82.html
 
 Detailed release notes can be found at
-    http://www.scriptics.com/software/relnotes/tcl8.2b1
+    http://www.scriptics.com/software/relnotes/tcl8.2b2
 
 Information about Tcl itself can be found at
     http://www.scriptics.com/scripting/
diff --git a/generic/tcl.h b/generic/tcl.h
index 6674670..d62faa6 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tcl.h,v 1.54 1999/07/21 21:29:43 redman Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.55 1999/07/22 21:50:54 redman Exp $
  */
 
 #ifndef _TCL
@@ -56,10 +56,10 @@ extern "C" {
 #define TCL_MAJOR_VERSION   8
 #define TCL_MINOR_VERSION   2
 #define TCL_RELEASE_LEVEL   TCL_BETA_RELEASE
-#define TCL_RELEASE_SERIAL  1
+#define TCL_RELEASE_SERIAL  2
 
 #define TCL_VERSION	    "8.2"
-#define TCL_PATCH_LEVEL	    "8.2b1"
+#define TCL_PATCH_LEVEL	    "8.2b2"
 
 /*
  * The following definitions set up the proper options for Windows
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index db92f19..585ffa7 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclCmdMZ.c,v 1.18 1999/07/09 02:11:56 stanton Exp $
+ * RCS: @(#) $Id: tclCmdMZ.c,v 1.19 1999/07/22 21:50:54 redman Exp $
  */
 
 #include "tclInt.h"
@@ -1089,7 +1089,12 @@ Tcl_StringObjCmd(dummy, interp, objc, objv)
 	case STR_IS: {
 	    char *end;
 	    Tcl_UniChar ch;
-	    int (*chcomp)(int) = NULL;	/* The UniChar comparison function */
+
+            /*
+	     * The UniChar comparison function
+	     */
+
+	    int (*chcomp)_ANSI_ARGS_((int)) = NULL; 
 	    int i, failat = 0, result = 1, strict = 0;
 	    Tcl_Obj *objPtr, *failVarObj = NULL;
 
diff --git a/generic/tclIO.c b/generic/tclIO.c
index ab3dfaa..d679f9a 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclIO.c,v 1.10 1999/07/02 19:51:29 welch Exp $
+ * RCS: @(#) $Id: tclIO.c,v 1.11 1999/07/22 21:50:54 redman Exp $
  */
 
 #include "tclInt.h"
@@ -1815,7 +1815,8 @@ Tcl_UnstackChannel (interp, chan)
  */
 
 Tcl_Channel
-Tcl_GetStackedChannel(Tcl_Channel chan)
+Tcl_GetStackedChannel(chan)
+    Tcl_Channel chan;
 {
   Channel* chanPtr = (Channel*) chan;
   return (Tcl_Channel) chanPtr->supercedes;
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 0618012..2dc867d 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -14,7 +14,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclVar.c,v 1.10 1999/06/17 00:20:55 hershey Exp $
+ * RCS: @(#) $Id: tclVar.c,v 1.11 1999/07/22 21:50:54 redman Exp $
  */
 
 #include "tclInt.h"
@@ -3198,9 +3198,23 @@ TclArraySet(interp, arrayNameObj, arrayElemObj)
     Var *varPtr, *arrayPtr;
     Tcl_Obj **elemPtrs;
     int result, elemLen, i;
-    char *varName;
+    char *varName, *p;
     
     varName = TclGetString(arrayNameObj);
+    for (p = varName; *p ; p++) {
+	if (*p == '(') {
+	    do {
+		p++;
+	    } while (*p != '\0');
+	    p--;
+	    if (*p == ')') {
+		VarErrMsg(interp, varName, NULL, "set", needArray);
+		return TCL_ERROR;
+	    }
+	    break;
+	}
+    }
+
     varPtr = TclLookupVar(interp, varName, (char *) NULL, /*flags*/ 0,
             /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
 
@@ -3257,6 +3271,7 @@ TclArraySet(interp, arrayNameObj, arrayElemObj)
 	
 	varPtr = TclLookupVar(interp, varName, (char *) NULL, 0, 0,
 	        /*createPart1*/ 1, /*createPart2*/ 0, &arrayPtr);
+
     }
     TclSetVarArray(varPtr);
     TclClearVarUndefined(varPtr);
diff --git a/tests/var.test b/tests/var.test
index de08a35..d9d0fe0 100644
--- a/tests/var.test
+++ b/tests/var.test
@@ -14,7 +14,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: var.test,v 1.7 1999/06/26 20:55:17 rjohnson Exp $
+# RCS: @(#) $Id: var.test,v 1.8 1999/07/22 21:50:55 redman Exp $
 #
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
@@ -577,7 +577,12 @@ test var-9.12 {behaviour of TclSetVar write trace error} {
 test var-10.1 {can't nest arrays with array set} {
    catch {unset arr}
    list [catch {array set arr(x) {a 1 b 2}} res] $res
-} {1 {can't set "arr(x)(a)": variable isn't array}}
+} {1 {can't set "arr(x)": variable isn't array}}
+
+test var-10.2 {can't nest arrays with array set} {
+   catch {unset arr}
+   list [catch {array set arr(x) {}} res] $res
+} {1 {can't set "arr(x)": variable isn't array}}
 
 catch {namespace delete ns}
 catch {unset arr}
diff --git a/tools/checkLibraryDoc.tcl b/tools/checkLibraryDoc.tcl
index 290f7a6..c6a8006 100755
--- a/tools/checkLibraryDoc.tcl
+++ b/tools/checkLibraryDoc.tcl
@@ -3,7 +3,7 @@
 # This script attempts to determine what APIs exist in the source base that 
 # have not been documented.  By grepping through all of the doc/*.3 man 
 # pages, looking for "Pkg_*" (e.g., Tcl_ or Tk_), and comparing this list
-# against the list of Pkg_ APIs found in the source (e.g., tcl8.1/*/*.[ch])
+# against the list of Pkg_ APIs found in the source (e.g., tcl8.2/*/*.[ch])
 # we create six lists:
 #      1) APIs in Source not in Docs.
 #      2) APIs in Docs not in Source.
@@ -19,7 +19,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 # 
-# RCS: @(#) $Id: checkLibraryDoc.tcl,v 1.5 1999/04/21 21:50:32 rjohnson Exp $
+# RCS: @(#) $Id: checkLibraryDoc.tcl,v 1.6 1999/07/22 21:50:55 redman Exp $
 
 
 lappend auto_path "c:/program\ files/tclpro1.2/win32-ix86/bin"
@@ -109,7 +109,7 @@ proc main {} {
     if {($len != 2) && ($len != 3)} {
 	puts "usage: $argv0 pkgName pkgDir \[outFile\]"
 	puts "   pkgName == Tcl,Tk"
-	puts "   pkgDir  == /home/surles/cvs/tcl8.1"
+	puts "   pkgDir  == /home/surles/cvs/tcl8.2"
 	exit 1
     }
 
diff --git a/tools/tcl.wse.in b/tools/tcl.wse.in
index fce2dc9..282dcf9 100644
--- a/tools/tcl.wse.in
+++ b/tools/tcl.wse.in
@@ -12,7 +12,7 @@ item: Global
   Log Pathname=%MAINDIR%\INSTALL.LOG
   Message Font=MS Sans Serif
   Font Size=8
-  Disk Label=tcl8.2b1
+  Disk Label=tcl8.2b2
   Disk Filename=setup
   Patch Flags=0000000000000001
   Patch Threshold=85
diff --git a/tools/tcl8.1-tk8.1-man-html.tcl b/tools/tcl8.1-tk8.1-man-html.tcl
index ac01cd2..3fbfeff 100644
--- a/tools/tcl8.1-tk8.1-man-html.tcl
+++ b/tools/tcl8.1-tk8.1-man-html.tcl
@@ -77,8 +77,8 @@ proc parse_command_line {} {
     set webdir ../html
 
     # Directory names for Tcl and Tk, in priority order.
-    set tclDirList {tcl8.1 tcl8.0 tcl tcl7.4 tcl7.5 tcl7.6}
-    set tkDirList {tk8.1 tk8.0 tk tk4.0 tk4.1 tk4.2}
+    set tclDirList {tcl8.2 tcl8.1 tcl8.0 tcl tcl7.4 tcl7.5 tcl7.6}
+    set tkDirList {tk8.2 tk8.1 tk8.0 tk tk4.0 tk4.1 tk4.2}
 
     # Handle arguments a la GNU:
     #   --version
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 8debce5..e4bd94d 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.41 1999/07/22 00:38:40 redman Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.42 1999/07/22 21:50:56 redman Exp $
 
 VERSION 		= @TCL_VERSION@
 
@@ -501,6 +501,7 @@ install-binaries:
 		fi; \
 	    done;
 	@echo "Installing $(TCL_LIB_FILE)"
+	chmod +x $(SRC_DIR)/install-sh
 	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
 	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
 	@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
@@ -539,6 +540,7 @@ install-libraries:
 		else true; \
 		fi; \
 	    done;
+	chmod +x $(SRC_DIR)/install-sh
 	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h ; \
 	    do \
 	    echo "Installing $$i"; \
diff --git a/unix/README b/unix/README
index c35ae82..862a7de 100644
--- a/unix/README
+++ b/unix/README
@@ -18,7 +18,7 @@ SGI, as well as PCs running Linux, BSDI, and SCO UNIX.  To compile for
 a PC running Windows, see the README file in the directory ../win.  To
 compile for a Macintosh, see the README file in the directory ../mac.
 
-RCS: @(#) $Id: README,v 1.6 1999/05/17 20:22:29 welch Exp $
+RCS: @(#) $Id: README,v 1.7 1999/07/22 21:50:56 redman Exp $
 
 How To Compile And Install Tcl:
 -------------------------------
@@ -93,9 +93,9 @@ How To Compile And Install Tcl:
     Tcl then you'll first need to set your TCL_LIBRARY variable to
     hold the full path name of the "library" subdirectory.  Note that
     the installed versions of tclsh, libtcl.a, and libtcl.so have a
-    version number in their names, such as "tclsh8.1" or "libtcl8.1.so";
+    version number in their names, such as "tclsh8.2" or "libtcl8.2.so";
     to use the installed versions, either specify the version number
-    or create a symbolic link (e.g. from "tclsh" to "tclsh8.1").
+    or create a symbolic link (e.g. from "tclsh" to "tclsh8.2").
 
 If you have trouble compiling Tcl, check out the following Web URL:
     http://www.scriptics.com/software/install.html#Database
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index 344686d..b0ca270 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -7,7 +7,7 @@
  * Copyright (c) 1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tclUnixInit.c,v 1.16 1999/07/21 02:01:36 hershey Exp $
+ * RCS: @(#) $Id: tclUnixInit.c,v 1.17 1999/07/22 21:50:56 redman Exp $
  */
 
 #include "tclInt.h"
@@ -267,17 +267,17 @@ CONST char *path;		/* Path to the executable in native
      * This code looks in the following directories:
      *
      *	<bindir>/../<installLib>
-     *		(e.g. /usr/local/bin/../lib/tcl8.1)
+     *		(e.g. /usr/local/bin/../lib/tcl8.2)
      *	<bindir>/../../<installLib>
-     *		(e.g. /usr/local/TclPro/solaris-sparc/bin/../../lib/tcl8.1)
+     *		(e.g. /usr/local/TclPro/solaris-sparc/bin/../../lib/tcl8.2)
      *	<bindir>/../library
-     *		(e.g. /usr/src/tcl8.1/unix/../library)
+     *		(e.g. /usr/src/tcl8.2/unix/../library)
      *	<bindir>/../../library
-     *		(e.g. /usr/src/tcl8.1/unix/solaris-sparc/../../library)
+     *		(e.g. /usr/src/tcl8.2/unix/solaris-sparc/../../library)
      *	<bindir>/../../<developLib>
-     *		(e.g. /usr/src/tcl8.1/unix/../../tcl8.1/library)
+     *		(e.g. /usr/src/tcl8.2/unix/../../tcl8.2/library)
      *	<bindir>/../../../<devlopLib>
-     *		(e.g. /usr/src/tcl8.1/unix/solaris-sparc/../../../tcl8.1/library)
+     *		(e.g. /usr/src/tcl8.2/unix/solaris-sparc/../../../tcl8.2/library)
      */
      
     if (path != NULL) {
diff --git a/win/README b/win/README
index cc9fc11..8f80a47 100644
--- a/win/README
+++ b/win/README
@@ -4,7 +4,7 @@ by Scott Stanton
 Scriptics Corporation
 scott.stanton@scriptics.com
 
-RCS: @(#) $Id: README,v 1.12 1999/06/25 23:29:55 welch Exp $
+RCS: @(#) $Id: README,v 1.13 1999/07/22 21:50:56 redman Exp $
 
 1. Introduction
 ---------------
@@ -21,11 +21,11 @@ The information in this file is maintained on the web at:
 
 In order to compile Tcl for Windows, you need the following items:
 
-	Tcl 8.1 Source Distribution (plus any patches)
+	Tcl 8.2 Source Distribution (plus any patches)
 
 	Visual C++ 2.x/4.x/5.x
 
-In practice, the 8.1 release is built with Visual C++ 5.0
+In practice, the 8.2 release is built with Visual C++ 5.0
 
 In the "win" subdirectory of the source release, you will find
 "makefile.vc".  This is the makefile Visual C++ compiler.  You should
@@ -45,7 +45,7 @@ find them.  Tcl looks in one of three places for the library files:
 		HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.2
 
 	3) Relative to the directory containing the current .exe.
-	    Tcl will look for a directory "..\lib\tcl8.1" relative to the
+	    Tcl will look for a directory "..\lib\tcl8.2" relative to the
 	    directory containing the currently running .exe.
 
 Note that in order to run tclsh82.exe, you must ensure that tcl82.dll
diff --git a/win/README.binary b/win/README.binary
index fb5a345..ebb745d 100644
--- a/win/README.binary
+++ b/win/README.binary
@@ -1,11 +1,11 @@
-Tcl/Tk 8.2b1 for Windows, Binary Distribution
+Tcl/Tk 8.2b2 for Windows, Binary Distribution
 
-RCS: @(#) $Id: README.binary,v 1.8 1999/06/25 23:29:55 welch Exp $ 
+RCS: @(#) $Id: README.binary,v 1.9 1999/07/22 21:50:56 redman Exp $ 
 
 1. Introduction
 --------------- 
 
-This directory contains the binary distribution of Tcl/Tk 8.2b1 for
+This directory contains the binary distribution of Tcl/Tk 8.2b2 for
 Windows.  It was compiled with Microsoft Visual C++ 5.0 using Win32
 API, so that it will run under Windows NT, Windows 95, and Windows 98.
 
@@ -25,14 +25,14 @@ Tcl community by Scriptics Corporation.
 The official home for Tcl and Tk on the Web is at:
 	http://www.scriptics.com
 
-The home page for the Tcl/Tk 8.1 release is
-    http://www.scriptics.com/software/8.1.html
+The home page for the Tcl/Tk 8.2 release is
+    http://www.scriptics.com/software/8.2.html
 
-Information about new features in Tcl/Tk 8.1 can be found at
-    http://www.scriptics.com/software/whatsnew81.html
+Information about new features in Tcl/Tk 8.2 can be found at
+    http://www.scriptics.com/software/whatsnew82.html
 
 Detailed release notes can be found at
-    http://www.scriptics.com/software/relnotes/tcl8.1.1
+    http://www.scriptics.com/software/relnotes/tcl8.2b2
 
 Information about Tcl itself can be found at
     http://www.scriptics.com/scripting/
@@ -47,7 +47,7 @@ There are notes about compiling Tcl at
 ---------------
 
 The binary release is distributed as a self-extracting archive called
-tcl811.exe.  The setup program which will prompt you for an
+tcl82b2.exe.  The setup program which will prompt you for an
 installation directory.  It will create the installation heirarchy
 under the specified directory, and install a wish application icon
 under the program manager group of your choice.
@@ -64,8 +64,8 @@ this release, you will need to use the appropriate .lib file for your
 compiler.  In the lib directory of the installation directory, there
 are library files for the Microsoft Visual C++ compiler:
 
-	tcl81.lib
-	tk81.lib
+	tcl82.lib
+	tk82.lib
 
 5. Building dynamically loadable extensions
 --------------------------------------------
diff --git a/win/aclocal.m4 b/win/aclocal.m4
index d74df1a..9fad38c 100644
--- a/win/aclocal.m4
+++ b/win/aclocal.m4
@@ -20,13 +20,13 @@
 AC_DEFUN(SC_PATH_TCLCONFIG, [
     AC_MSG_CHECKING([the location of tclConfig.sh])
 
-    if test -d ../../tcl8.1$1/win;  then
-	TCL_BIN_DIR_DEFAULT=../../tcl8.1$1/win
+    if test -d ../../tcl8.2$1/win;  then
+	TCL_BIN_DIR_DEFAULT=../../tcl8.2$1/win
     else
-	TCL_BIN_DIR_DEFAULT=../../tcl8.1/win
+	TCL_BIN_DIR_DEFAULT=../../tcl8.2/win
     fi
     
-    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.1 binaries from DIR],
+    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.2 binaries from DIR],
 	    TCL_BIN_DIR=$withval, TCL_BIN_DIR=`cd $TCL_BIN_DIR_DEFAULT; pwd`)
     if test ! -d $TCL_BIN_DIR; then
 	AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR does not exist)
@@ -58,13 +58,13 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [
 AC_DEFUN(SC_PATH_TKCONFIG, [
     AC_MSG_CHECKING([the location of tkConfig.sh])
 
-    if test -d ../../tk8.1$1/win;  then
-	TK_BIN_DIR_DEFAULT=../../tk8.1$1/win
+    if test -d ../../tk8.2$1/win;  then
+	TK_BIN_DIR_DEFAULT=../../tk8.2$1/win
     else
-	TK_BIN_DIR_DEFAULT=../../tk8.1/win
+	TK_BIN_DIR_DEFAULT=../../tk8.2/win
     fi
     
-    AC_ARG_WITH(tk, [  --with-tk=DIR          use Tk 8.1 binaries from DIR],
+    AC_ARG_WITH(tk, [  --with-tk=DIR          use Tk 8.2 binaries from DIR],
 	    TK_BIN_DIR=$withval, TK_BIN_DIR=`cd $TK_BIN_DIR_DEFAULT; pwd`)
     if test ! -d $TK_BIN_DIR; then
 	AC_MSG_ERROR(Tk directory $TK_BIN_DIR does not exist)
@@ -423,13 +423,13 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
 #------------------------------------------------------------------------
 
 AC_DEFUN(SC_WITH_TCL, [
-    if test -d ../../tcl8.1$1/win;  then
-	TCL_BIN_DEFAULT=../../tcl8.1$1/win
+    if test -d ../../tcl8.2$1/win;  then
+	TCL_BIN_DEFAULT=../../tcl8.2$1/win
     else
-	TCL_BIN_DEFAULT=../../tcl8.1/win
+	TCL_BIN_DEFAULT=../../tcl8.2/win
     fi
     
-    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.1 binaries from DIR],
+    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.2 binaries from DIR],
 	    TCL_BIN_DIR=$withval, TCL_BIN_DIR=`cd $TCL_BIN_DEFAULT; pwd`)
     if test ! -d $TCL_BIN_DIR; then
 	AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR does not exist)
diff --git a/win/makefile.vc b/win/makefile.vc
index 59680cf..4d77b51 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -6,7 +6,7 @@
 # Copyright (c) 1995-1996 Sun Microsystems, Inc.
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 #
-# RCS: @(#) $Id: makefile.vc,v 1.40 1999/07/22 00:13:13 redman Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.41 1999/07/22 21:50:57 redman Exp $
 
 # Does not depend on the presence of any environment variables in
 # order to compile tcl; all needed information is derived from 
@@ -48,7 +48,7 @@ MACHINE	= IX86
 #THREADDEFINES = -DTCL_THREADS=1
 
 # Set NODEBUG to 0 to compile with symbols
-NODEBUG = 1
+NODEBUG = 0
 
 # The following defines can be used to control the amount of debugging
 # code that is added to the compilation.
diff --git a/win/tcl.m4 b/win/tcl.m4
index d74df1a..9fad38c 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -20,13 +20,13 @@
 AC_DEFUN(SC_PATH_TCLCONFIG, [
     AC_MSG_CHECKING([the location of tclConfig.sh])
 
-    if test -d ../../tcl8.1$1/win;  then
-	TCL_BIN_DIR_DEFAULT=../../tcl8.1$1/win
+    if test -d ../../tcl8.2$1/win;  then
+	TCL_BIN_DIR_DEFAULT=../../tcl8.2$1/win
     else
-	TCL_BIN_DIR_DEFAULT=../../tcl8.1/win
+	TCL_BIN_DIR_DEFAULT=../../tcl8.2/win
     fi
     
-    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.1 binaries from DIR],
+    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.2 binaries from DIR],
 	    TCL_BIN_DIR=$withval, TCL_BIN_DIR=`cd $TCL_BIN_DIR_DEFAULT; pwd`)
     if test ! -d $TCL_BIN_DIR; then
 	AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR does not exist)
@@ -58,13 +58,13 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [
 AC_DEFUN(SC_PATH_TKCONFIG, [
     AC_MSG_CHECKING([the location of tkConfig.sh])
 
-    if test -d ../../tk8.1$1/win;  then
-	TK_BIN_DIR_DEFAULT=../../tk8.1$1/win
+    if test -d ../../tk8.2$1/win;  then
+	TK_BIN_DIR_DEFAULT=../../tk8.2$1/win
     else
-	TK_BIN_DIR_DEFAULT=../../tk8.1/win
+	TK_BIN_DIR_DEFAULT=../../tk8.2/win
     fi
     
-    AC_ARG_WITH(tk, [  --with-tk=DIR          use Tk 8.1 binaries from DIR],
+    AC_ARG_WITH(tk, [  --with-tk=DIR          use Tk 8.2 binaries from DIR],
 	    TK_BIN_DIR=$withval, TK_BIN_DIR=`cd $TK_BIN_DIR_DEFAULT; pwd`)
     if test ! -d $TK_BIN_DIR; then
 	AC_MSG_ERROR(Tk directory $TK_BIN_DIR does not exist)
@@ -423,13 +423,13 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
 #------------------------------------------------------------------------
 
 AC_DEFUN(SC_WITH_TCL, [
-    if test -d ../../tcl8.1$1/win;  then
-	TCL_BIN_DEFAULT=../../tcl8.1$1/win
+    if test -d ../../tcl8.2$1/win;  then
+	TCL_BIN_DEFAULT=../../tcl8.2$1/win
     else
-	TCL_BIN_DEFAULT=../../tcl8.1/win
+	TCL_BIN_DEFAULT=../../tcl8.2/win
     fi
     
-    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.1 binaries from DIR],
+    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.2 binaries from DIR],
 	    TCL_BIN_DIR=$withval, TCL_BIN_DIR=`cd $TCL_BIN_DEFAULT; pwd`)
     if test ! -d $TCL_BIN_DIR; then
 	AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR does not exist)
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index 27b86d5..70895ca 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -7,7 +7,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tclWinInit.c,v 1.19 1999/07/21 23:28:05 hershey Exp $
+ * RCS: @(#) $Id: tclWinInit.c,v 1.20 1999/07/22 21:50:57 redman Exp $
  */
 
 #include "tclWinInt.h"
@@ -233,17 +233,17 @@ TclpInitLibraryPath(path)
      * This code looks in the following directories:
      *
      *	<bindir>/../<installLib>
-     *		(e.g. /usr/local/bin/../lib/tcl8.1)
+     *		(e.g. /usr/local/bin/../lib/tcl8.2)
      *	<bindir>/../../<installLib>
-     *		(e.g. /usr/local/TclPro/solaris-sparc/bin/../../lib/tcl8.1)
+     *		(e.g. /usr/local/TclPro/solaris-sparc/bin/../../lib/tcl8.2)
      *	<bindir>/../library
-     *		(e.g. /usr/src/tcl8.1/unix/../library)
+     *		(e.g. /usr/src/tcl8.2/unix/../library)
      *	<bindir>/../../library
-     *		(e.g. /usr/src/tcl8.1/unix/solaris-sparc/../../library)
+     *		(e.g. /usr/src/tcl8.2/unix/solaris-sparc/../../library)
      *	<bindir>/../../<developLib>
-     *		(e.g. /usr/src/tcl8.1/unix/../../tcl8.1/library)
+     *		(e.g. /usr/src/tcl8.2/unix/../../tcl8.2/library)
      *	<bindir>/../../../<devlopLib>
-     *		(e.g. /usr/src/tcl8.1/unix/solaris-sparc/../../../tcl8.1/library)
+     *		(e.g. /usr/src/tcl8.2/unix/solaris-sparc/../../../tcl8.2/library)
      */
      
     if (path != NULL) {
@@ -304,7 +304,7 @@ TclpInitLibraryPath(path)
  *	Append the value of the TCL_LIBRARY environment variable onto the
  *	path pointer.  If the env variable points to another version of
  *	tcl (e.g. "tcl7.6") also append the path to this version (e.g.,
- *	"tcl7.6/../tcl8.1")
+ *	"tcl7.6/../tcl8.2")
  *
  * Results:
  *	None.
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index aba6807..1f0e46d 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinPort.h,v 1.9 1999/04/22 20:28:02 redman Exp $
+ * RCS: @(#) $Id: tclWinPort.h,v 1.10 1999/07/22 21:50:57 redman Exp $
  */
 
 #ifndef _TCLWINPORT
@@ -52,8 +52,17 @@ typedef float *TCHAR;
 #include <process.h>
 #include <signal.h>
 #include <string.h>
+
+/*
+ * Need to block out these includes for building extensions with MetroWerks
+ * compiler for Win32.
+ */
+
+#ifndef __MWERKS__
 #include <sys/stat.h>
 #include <sys/timeb.h>
+#endif
+
 #include <tchar.h>
 #include <time.h>
 #include <winsock2.h>