Merged 8.0.3 changes into 8.1

31 files changed, 140 insertions, 89 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index cff8c7d..038bd2c 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.
 #
-# SCCS: @(#) Makefile.in 1.154 98/02/10 10:24:55
+# RCS: @(#) $Id: Makefile.in,v 1.1.4.2 1998/09/30 02:19:10 stanton Exp $
 
 # Current Tk version;  used in various names.
 
@@ -82,6 +82,24 @@ TCL_UNIX_DIR =		@TCL_SRC_DIR@/unix
 # for this version of Tk:
 TCL_BIN_DIR =		@TCL_BIN_DIR@
 
+# Libraries built with optimization switches have this additional extension
+TK_DBGX =		@TK_DBGX@
+TCL_DBGX =		@TCL_DBGX@
+
+# warning flags
+CFLAGS_WARNING =	@CFLAGS_WARNING@
+
+# The default switches for optimization or debugging
+CFLAGS_DEBUG =		@CFLAGS_DEBUG@
+CFLAGS_OPTIMIZE =	@CFLAGS_OPTIMIZE@
+
+# To change the compiler switches, for example to change from optimization to
+# debugging symbols, change the following line:
+#CFLAGS = 		$(CFLAGS_DEBUG)
+#CFLAGS = 		$(CFLAGS_OPTIMIZE)
+#CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
+CFLAGS = 		$(@CFLAGS_DEFAULT@)
+
 # A "-I" switch that can be used when compiling to make all of the
 # X11 include files accessible (the configure script will try to
 # set this value, and will cause it to be an empty string if the
@@ -97,10 +115,6 @@ X11_LIB_SWITCHES =	@XLIBSW@
 # configure script.
 LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
 
-# To change the compiler switches, for example to change from -O
-# to -g, change the following line:
-CFLAGS = -O
-
 # To turn off the security checks that disallow incoming sends when
 # the X server appears to be insecure, reverse the comments on the
 # following lines:
@@ -156,6 +170,12 @@ TK_SHLIB_CFLAGS = @TK_SHLIB_CFLAGS@
 TK_LIB_FILE = @TK_LIB_FILE@
 #TK_LIB_FILE = libtk.a
 
+TK_LIB_FLAG = @TK_LIB_FLAG@
+#TK_LIB_FLAG = -ltk
+
+TCL_LIB_FLAG = @TCL_LIB_FLAG@
+#TCL_LIB_FLAG = -ltcl
+
 # The symbol below provides support for dynamic loading and shared
 # libraries.  See configure.in for a description of what it means.
 # The values of the symbolis normally set by the configure script.
@@ -191,7 +211,8 @@ TOOL_DIR =		@TCL_SRC_DIR@/tools
 
 
 CC =		@CC@
-CC_SWITCHES =	${CFLAGS} ${TK_SHLIB_CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} \
+CC_SWITCHES =	${CFLAGS} ${CFLAGS_WARNING} ${TK_SHLIB_CFLAGS} \
+-I${UNIX_DIR} -I${GENERIC_DIR} \
 -I${BMAP_DIR} -I${TCL_GENERIC_DIR} ${X11_INCLUDES} ${AC_FLAGS} ${PROTO_FLAGS} \
 ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} ${NO_DEPRECATED_FLAGS}
 
@@ -296,10 +317,10 @@ all: wish
 
 # The following target is configured by autoconf to generate either
 # a shared library or non-shared library for Tk.
-@TK_LIB_FILE@: ${OBJS}
-	rm -f @TK_LIB_FILE@
+${TK_LIB_FILE}: ${OBJS}
+	rm -f ${TK_LIB_FILE}
 	@MAKE_LIB@
-	$(RANLIB) @TK_LIB_FILE@
+	$(RANLIB) ${TK_LIB_FILE}
 
 # Make target which outputs the list of the .o contained in the Tk lib
 # usefull to build a single big shared library containing Tcl/Tk and other
@@ -479,7 +500,7 @@ clean:
 
 distclean: clean
 	rm -f Makefile config.status config.cache config.log tkConfig.sh \
-		SUNWtk.* prototype
+		$(PACKAGE).* prototype
 
 depend:
 	makedepend -- $(DEPEND_SWITCHES) -- $(SRCS)
@@ -789,9 +810,10 @@ checkexports: $(TK_LIB_FILE)
 # to put the distribution.  DISTDIR must be an absolute path name.
 #
 
+DISTROOT = /tmp/dist
 DISTNAME =	tk@TK_VERSION@@TK_PATCH_LEVEL@
 ZIPNAME =	tk@TK_MAJOR_VERSION@@TK_MINOR_VERSION@@TK_PATCH_LEVEL@.zip
-DISTDIR =	/proj/tcl/dist/$(DISTNAME)
+DISTDIR =	$(DISTROOT)/$(DISTNAME)
 TCLDIR = 	@TCL_SRC_DIR@
 $(UNIX_DIR)/configure: $(UNIX_DIR)/configure.in
 	autoconf $(UNIX_DIR)/configure.in > $(UNIX_DIR)/configure
@@ -828,6 +850,7 @@ dist:   $(UNIX_DIR)/configure
 	rm -f $(DISTDIR)/generic/blt*.[ch]
 	mkdir $(DISTDIR)/win
 	cp -p $(TOP_DIR)/win/*.c $(TOP_DIR)/win/*.h $(DISTDIR)/win
+	cp -p $(TOP_DIR)/win/*.bat $(DISTDIR)/win
 	cp -p $(TOP_DIR)/win/makefile.* $(DISTDIR)/win
 	cp -p $(TOP_DIR)/win/README $(DISTDIR)/win
 	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/win
@@ -836,10 +859,7 @@ dist:   $(UNIX_DIR)/configure
 		$(TOP_DIR)/win/rc/*.ico $(TOP_DIR)/win/rc/*.bmp \
 		$(DISTDIR)/win/rc
 	mkdir $(DISTDIR)/mac
-	sccs edit -s $(TOP_DIR)/mac/tkMacProjects.sit.hqx
-	cp -p tkMacProjects.sit.hqx $(DISTDIR)/mac
-	sccs unedit $(TOP_DIR)/mac/tkMacProjects.sit.hqx
-	rm -f tkMacProjects.sit.hqx
+	cp -p $(TOP_DIR)/mac/tkMacProjects.sea.hqx $(DISTDIR)/mac
 	cp -p $(TOP_DIR)/mac/*.c $(TOP_DIR)/mac/*.h $(TOP_DIR)/mac/*.r \
 		$(DISTDIR)/mac
 	cp -p $(TOP_DIR)/mac/README $(DISTDIR)/mac
@@ -889,7 +909,6 @@ dist:   $(UNIX_DIR)/configure
 	mkdir $(DISTDIR)/doc
 	cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/doc/*.[13n] \
 		$(TCLDIR)/doc/man.macros $(DISTDIR)/doc
-	cp /home/ouster/papers/tk4.0/tk4.0.ps $(DISTDIR)/doc
 	mkdir $(DISTDIR)/tests
 	cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/tests/*.test \
 		$(TOP_DIR)/tests/visual $(TOP_DIR)/tests/*.tcl \
@@ -903,10 +922,10 @@ dist:   $(UNIX_DIR)/configure
 #
 
 alldist: dist
-	rm -f $(DISTDIR)/../$(DISTNAME).tar.Z \
-		$(DISTDIR)/../$(DISTNAME).tar.gz \
-		$(DISTDIR)/../$(ZIPNAME)
-	cd $(DISTDIR)/..; tar cf $(DISTNAME).tar $(DISTNAME); \
+	rm -f $(DISTROOT)/$(DISTNAME).tar.Z \
+		$(DISTROOT)/$(DISTNAME).tar.gz \
+		$(DISTROOT)/$(ZIPNAME)
+	cd $(DISTROOT); tar cf $(DISTNAME).tar $(DISTNAME); \
 		gzip -9 -c $(DISTNAME).tar > $(DISTNAME).tar.gz; \
 		compress $(DISTNAME).tar; zip -r8 $(ZIPNAME) $(DISTNAME)
 
@@ -919,16 +938,16 @@ alldist: dist
 #
 
 allpatch: dist
-	rm -f /proj/tcl/dist/$(DISTNAME).tar.Z \
-		/proj/tcl/dist/$(DISTNAME).tar.gz \
-		/proj/tcl/dist/$(ZIPNAME)
-	mv /proj/tcl/dist/tk${VERSION} /proj/tcl/dist/old
-	mv /proj/tcl/dist/$(DISTNAME) /proj/tcl/dist/tk${VERSION}
-	cd /proj/tcl/dist; tar cf $(DISTNAME).tar tk${VERSION}; \
+	rm -f $(DISTROOT)/$(DISTNAME).tar.Z \
+		$(DISTROOT)/$(DISTNAME).tar.gz \
+		$(DISTROOT)/$(ZIPNAME)
+	mv $(DISTROOT)/tk${VERSION} $(DISTROOT)/old
+	mv $(DISTROOT)/$(DISTNAME) $(DISTROOT)/tk${VERSION}
+	cd $(DISTROOT); tar cf $(DISTNAME).tar tk${VERSION}; \
 		gzip -9 -c $(DISTNAME).tar > $(DISTNAME).tar.gz; \
 		compress $(DISTNAME).tar; zip -r8 $(ZIPNAME) tk${VERSION}
-	mv /proj/tcl/dist/tk${VERSION} /proj/tcl/dist/$(DISTNAME)
-	mv /proj/tcl/dist/old /proj/tcl/dist/tk${VERSION}
+	mv $(DISTROOT)/tk${VERSION} $(DISTROOT)/$(DISTNAME)
+	mv $(DISTROOT)/old $(DISTROOT)/tk${VERSION}
 
 #
 # Target to create a Macintosh version of the distribution.  This will
@@ -938,7 +957,7 @@ allpatch: dist
 #
 
 macdist: dist
-	rm -f $(DISTDIR)/mac/tkMacProjects.sit.hqx
+	rm -f $(DISTDIR)/mac/tkMacProjects.sea.hqx
 	tclsh $(TOOL_DIR)/man2html.tcl $(DISTDIR)/tmp ../.. tk$(VERSION)
 	mv $(DISTDIR)/tmp/tk$(VERSION) $(DISTDIR)/html
 	rm -rf $(DISTDIR)/doc
@@ -959,13 +978,15 @@ macdist: dist
 #     make DISTDIR=<distdir> package-quick
 #
 # <distdir> is the absolute path to a directory where the build should
-# take place.  These steps will generate the SUNWtk.sun4 and
-# SUNWtk.i86pc stream packages.  It is important that the packages be
+# take place.  These steps will generate the $(PACKAGE).sun4 and
+# $(PACKAGE).i86pc stream packages.  It is important that the packages be
 # built in this fashion in order to ensure that the architecture
 # independent files are exactly the same, including timestamps, in
 # both packages.
 #
 
+PACKAGE=SCRPtk
+
 package: dist package-config package-common package-binaries package-generate
 package-quick: package-config package-binaries package-generate
 
@@ -1022,7 +1043,7 @@ package-generate:
 	| tclsh $(TCLDIR)/unix/mkProto.tcl $(TCLVERSION) \
 		$(UNIX_DIR) > prototype
 	pkgmk -o -d . -f prototype -a `arch`
-	pkgtrans -s . SUNWtk.`arch` SUNWtk
-	rm -rf SUNWtk
+	pkgtrans -s . $(PACKAGE).`arch` $(PACKAGE)
+	rm -rf $(PACKAGE)
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/unix/README b/unix/README
index ae07ad5..446ac10 100644
--- a/unix/README
+++ b/unix/README
@@ -10,7 +10,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.
 
-SCCS: @(#) README 1.26 98/02/18 18:04:01
+RCS: @(#) $Id: README,v 1.1.4.2 1998/09/30 02:19:10 stanton Exp $
 
 How To Compile And Install Tk:
 ------------------------------
diff --git a/unix/configure.in b/unix/configure.in
index 57c3e13..920a0f5 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -1,8 +1,9 @@
+#! /bin/bash -norc
 dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tk installation
 dnl	to configure the system for the local environment.
 AC_INIT(../generic/tk.h)
-# SCCS: @(#) configure.in 1.97 98/02/19 14:17:04
+# RCS: @(#) $Id: configure.in,v 1.1.4.2 1998/09/30 02:19:11 stanton Exp $
 
 TK_VERSION=8.1
 TK_MAJOR_VERSION=8
@@ -34,13 +35,23 @@ fi
 AC_C_CROSS
 AC_HAVE_HEADERS(unistd.h limits.h)
 
+# set the warning flags depending on whether or not we are using gcc
+if test "${GCC}" = "yes" ; then
+    # leave -Wimplicit-int out, the X libs generate so many of these warnings
+    # that they obscure everything else.
+
+    CFLAGS_WARNING="-Wall -Wconversion -Wno-implicit-int"
+else
+    CFLAGS_WARNING=""
+fi
+
 #--------------------------------------------------------------------
 #	See if there was a command-line option for where Tcl is;  if
 #	not, assume that its top-level directory is a sibling of ours.
 #--------------------------------------------------------------------
 
 AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.1 binaries from DIR],
-	TCL_BIN_DIR=$withval, TCL_BIN_DIR=`cd ../../tcl8.1a2/unix; pwd`)
+	TCL_BIN_DIR=$withval, TCL_BIN_DIR=`cd ../../tcl8.1$TK_PATCH_LEVEL/unix; pwd`)
 if test ! -d $TCL_BIN_DIR; then
     AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR doesn't exist)
 fi
@@ -56,6 +67,19 @@ fi
 
 file=$TCL_BIN_DIR/tclConfig.sh
 . $file
+
+# Set the default compiler switches based on the --enable-symbols option
+
+AC_ARG_ENABLE(symbols, [  --enable-symbols        build with debugging symbols],
+    [tcl_ok=$enableval], [tcl_ok=no])
+if test "$tcl_ok" = "yes"; then
+    CFLAGS_DEFAULT=CFLAGS_DEBUG
+    TK_DBGX=g
+else
+    CFLAGS_DEFAULT=CFLAGS_OPTIMIZE
+    TK_DBGX=""
+fi
+
 SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
 SHLIB_LD=$TCL_SHLIB_LD
 SHLIB_LD_LIBS=$TCL_SHLIB_LD_LIBS
@@ -63,6 +87,8 @@ SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
 SHLIB_VERSION=$TCL_SHLIB_VERSION
 DL_LIBS=$TCL_DL_LIBS
 LD_FLAGS=$TCL_LD_FLAGS
+CFLAGS_DEBUG=$TCL_CFLAGS_DEBUG
+CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
 
 LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
 
@@ -350,29 +376,37 @@ AC_ARG_ENABLE(shared,
 if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
     TK_SHARED_BUILD=1
     TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
-    eval "TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}"
-    MAKE_LIB="\${SHLIB_LD} -o ${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
+    TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
+    MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
     RANLIB=":"
 else
     TK_SHARED_BUILD=0
     TK_SHLIB_CFLAGS=""
-    eval "TK_LIB_FILE=libtk${TCL_UNSHARED_LIB_SUFFIX}"
-    MAKE_LIB="ar cr ${TK_LIB_FILE} \${OBJS}"
+    TK_LIB_FILE=libtk${TCL_UNSHARED_LIB_SUFFIX}
+    MAKE_LIB="ar cr \${TK_LIB_FILE} \${OBJS}"
 fi
 
+DBGX='${TK_DBGX}'
+eval "TK_LIB_FILE=${TK_LIB_FILE}"
+
 # Note:  in the following variable, it's important to use the absolute
 # path name of the Tcl directory rather than "..":  this is because
 # AIX remembers this path and will attempt to use it at run-time to look
 # up the Tcl library.
 
 if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-    TK_BUILD_LIB_SPEC="-L`pwd` -ltk${VERSION}"
-    TK_LIB_SPEC="-L${exec_prefix}/lib -ltk${VERSION}"
+    TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
 else
-    TK_BUILD_LIB_SPEC="-L`pwd` -ltk`echo ${VERSION} | tr -d .`"
-    TK_LIB_SPEC="-L${exec_prefix}/lib -ltk`echo ${VERSION} | tr -d .`"
+    TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}"
 fi
-
+TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}"
+TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_FLAG}"
+
+AC_SUBST(CFLAGS_DEBUG)
+AC_SUBST(CFLAGS_DEFAULT)
+AC_SUBST(CFLAGS_OPTIMIZE)
+AC_SUBST(CFLAGS_WARNING)
+AC_SUBST(TK_DBGX)
 AC_SUBST(DL_LIBS)
 AC_SUBST(LD_FLAGS)
 AC_SUBST(MATH_LIBS)
@@ -384,12 +418,15 @@ AC_SUBST(SHLIB_SUFFIX)
 AC_SUBST(SHLIB_VERSION)
 AC_SUBST(TCL_BIN_DIR)
 AC_SUBST(TCL_BUILD_LIB_SPEC)
+AC_SUBST(TCL_DBGX)
+AC_SUBST(TCL_LIB_FLAG)
 AC_SUBST(TCL_SRC_DIR)
 AC_SUBST(TCL_VERSION)
 AC_SUBST(TK_BUILD_LIB_SPEC)
 AC_SUBST(TK_CC_SEARCH_FLAGS)
 AC_SUBST(TK_LD_SEARCH_FLAGS)
 AC_SUBST(TK_LIB_FILE)
+AC_SUBST(TK_LIB_FLAG)
 AC_SUBST(TK_LIB_SPEC)
 AC_SUBST(TK_MAJOR_VERSION)
 AC_SUBST(TK_MINOR_VERSION)
diff --git a/unix/porting.notes b/unix/porting.notes
index ecb395d..2813bd5 100644
--- a/unix/porting.notes
+++ b/unix/porting.notes
@@ -26,7 +26,7 @@ and Tk to compile.  You can also add new entries to that database
 when you install Tcl and Tk on a new platform.  The Web database is
 likely to be more up-to-date than this file.
 
-sccsid = SCCS: @(#) porting.notes 1.10 96/04/10 15:38:54
+RCS: @(#) $Id: porting.notes,v 1.1.4.1 1998/09/30 02:19:11 stanton Exp $
 
 --------------------------------------------
 Solaris, various versions
diff --git a/unix/porting.old b/unix/porting.old
index ea8aa5c..b85a6a7 100644
--- a/unix/porting.old
+++ b/unix/porting.old
@@ -14,7 +14,7 @@ questions about porting Tcl to a particular machine;  in these
 cases the person's name and e-mail address are listed.  I'd be
 happy to receive corrections or updates.
 
-sccsid = SCCS: @(#) porting.old 1.2 96/02/16 10:27:30
+RCS: @(#) $Id: porting.old,v 1.1.4.1 1998/09/30 02:19:12 stanton Exp $
 
 ---------------------------------------------
 DEC Alphas:
diff --git a/unix/tkAppInit.c b/unix/tkAppInit.c
index fdd9afd..0616268 100644
--- a/unix/tkAppInit.c
+++ b/unix/tkAppInit.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.
  *
- * SCCS: @(#) tkAppInit.c 1.24 98/01/13 17:21:40
+ * RCS: @(#) $Id: tkAppInit.c,v 1.1.4.2 1998/09/30 02:19:12 stanton Exp $
  */
 
 #include "tk.h"
diff --git a/unix/tkConfig.sh.in b/unix/tkConfig.sh.in
index 544d658..cc5c33d 100644
--- a/unix/tkConfig.sh.in
+++ b/unix/tkConfig.sh.in
@@ -11,7 +11,7 @@
 #
 # The information in this file is specific to a single platform.
 #
-# SCCS: @(#) tkConfig.sh.in 1.11 97/10/30 13:29:13
+# RCS: @(#) $Id: tkConfig.sh.in,v 1.1.4.1 1998/09/30 02:19:13 stanton Exp $
 
 # Tk's version number.
 TK_VERSION='@TK_VERSION@'
@@ -25,8 +25,11 @@ TK_DEFS='@DEFS@'
 # Flag, 1: we built a shared lib, 0 we didn't
 TK_SHARED_BUILD=@TK_SHARED_BUILD@
 
+# This indicates if Tk was build with debugging symbols
+TK_DBGX=@TK_DBGX@
+
 # The name of the Tk library (may be either a .a file or a shared library):
-TK_LIB_FILE=@TK_LIB_FILE@
+TK_LIB_FILE='@TK_LIB_FILE@'
 
 # Additional libraries to use when linking Tk.
 TK_LIBS='@XLIBSW@ @DL_LIBS@ @LIBS@ @MATH_LIBS@'
@@ -45,6 +48,9 @@ TK_XINCLUDES='@XINCLUDES@'
 # Linker switch(es) to use to link with the X11 library archive.
 TK_XLIBSW='@XLIBSW@'
 
+# -l flag to pass to the linker to pick up the Tcl library
+TK_LIB_FLAG='@TK_LIB_FLAG@'
+
 # String to pass to linker to pick up the Tk library from its
 # build directory.
 TK_BUILD_LIB_SPEC='@TK_BUILD_LIB_SPEC@'
diff --git a/unix/tkUnix.c b/unix/tkUnix.c
index 25b1997..e1cd27d 100644
--- a/unix/tkUnix.c
+++ b/unix/tkUnix.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.
  *
- * SCCS: @(#) tkUnix.c 1.6 97/11/07 21:24:29
+ * RCS: @(#) $Id: tkUnix.c,v 1.1.4.2 1998/09/30 02:19:13 stanton Exp $
  */
 
 #include <tkInt.h>
diff --git a/unix/tkUnix3d.c b/unix/tkUnix3d.c
index e7584ce..1b6285d 100644
--- a/unix/tkUnix3d.c
+++ b/unix/tkUnix3d.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkUnix3d.c 1.3 96/11/20 14:24:38
+ * RCS: @(#) $Id: tkUnix3d.c,v 1.1.4.1 1998/09/30 02:19:13 stanton Exp $
  */
 
 #include <tk3d.h>
diff --git a/unix/tkUnixButton.c b/unix/tkUnixButton.c
index fcb3d38..25228d2 100644
--- a/unix/tkUnixButton.c
+++ b/unix/tkUnixButton.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkUnixButton.c 1.6 97/12/22 10:44:42
+ * RCS: @(#) $Id: tkUnixButton.c,v 1.1.4.2 1998/09/30 02:19:14 stanton Exp $
  */
 
 #include "tkButton.h"
diff --git a/unix/tkUnixColor.c b/unix/tkUnixColor.c
index d3a5a27..c517545 100644
--- a/unix/tkUnixColor.c
+++ b/unix/tkUnixColor.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkUnixColor.c 1.1 96/10/22 16:52:31
+ * RCS: @(#) $Id: tkUnixColor.c,v 1.1.4.1 1998/09/30 02:19:14 stanton Exp $
  */
 
 #include <tkColor.h>
diff --git a/unix/tkUnixConfig.c b/unix/tkUnixConfig.c
index 4333cdf..4569adf 100644
--- a/unix/tkUnixConfig.c
+++ b/unix/tkUnixConfig.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkUnixConfig.c 1.3 97/10/09 10:57:51
+ * RCS: @(#) $Id: tkUnixConfig.c,v 1.1.2.2 1998/09/30 02:19:15 stanton Exp $
  */
 
 #include "tk.h"
diff --git a/unix/tkUnixCursor.c b/unix/tkUnixCursor.c
index 46000df..9123aaf 100644
--- a/unix/tkUnixCursor.c
+++ b/unix/tkUnixCursor.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkUnixCursor.c 1.7 98/02/04 13:56:12
+ * RCS: @(#) $Id: tkUnixCursor.c,v 1.1.4.2 1998/09/30 02:19:15 stanton Exp $
  */
 
 #include "tkPort.h"
@@ -250,7 +250,7 @@ TkGetCursorByName(interp, tkwin, string)
 	if ((argc != 2) && (argc != 4)) {
 	    goto badString;
 	}
-	if (XReadBitmapFile(display,
+	if (TkReadBitmapFile(display,
 		RootWindowOfScreen(Tk_Screen(tkwin)), &argv[0][1],
 		(unsigned int *) &width, (unsigned int *) &height,
 		&source, &xHot, &yHot) != BitmapSuccess) {
@@ -273,7 +273,7 @@ TkGetCursorByName(interp, tkwin, string)
 	    cursor = XCreatePixmapCursor(display, source, source,
 		    &fg, &fg, (unsigned) xHot, (unsigned) yHot);
 	} else {
-	    if (XReadBitmapFile(display,
+	    if (TkReadBitmapFile(display,
 		    RootWindowOfScreen(Tk_Screen(tkwin)), argv[1],
 		    (unsigned int *) &maskWidth, (unsigned int *) &maskHeight,
 		    &mask, &dummy1, &dummy2) != BitmapSuccess) {
diff --git a/unix/tkUnixDefault.h b/unix/tkUnixDefault.h
index b1b35f5..c3dae54 100644
--- a/unix/tkUnixDefault.h
+++ b/unix/tkUnixDefault.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.
  *
- * SCCS: @(#) tkUnixDefault.h 1.106 97/12/13 15:47:22
+ * RCS: @(#) $Id: tkUnixDefault.h,v 1.1.4.2 1998/09/30 02:19:15 stanton Exp $
  */
 
 #ifndef _TKUNIXDEFAULT
diff --git a/unix/tkUnixDraw.c b/unix/tkUnixDraw.c
index 65bf2e4..db2af5e 100644
--- a/unix/tkUnixDraw.c
+++ b/unix/tkUnixDraw.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkUnixDraw.c 1.9 97/03/21 11:16:18
+ * RCS: @(#) $Id: tkUnixDraw.c,v 1.1.4.1 1998/09/30 02:19:16 stanton Exp $
  */
 
 #include "tkPort.h"
diff --git a/unix/tkUnixEmbed.c b/unix/tkUnixEmbed.c
index 6136905..af90cfa 100644
--- a/unix/tkUnixEmbed.c
+++ b/unix/tkUnixEmbed.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkUnixEmbed.c 1.23 97/11/07 21:24:52
+ * RCS: @(#) $Id: tkUnixEmbed.c,v 1.1.4.2 1998/09/30 02:19:16 stanton Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c
index 6fc30bb..cf2e523 100644
--- a/unix/tkUnixEvent.c
+++ b/unix/tkUnixEvent.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkUnixEvent.c 1.18 97/10/28 18:47:15
+ * RCS: @(#) $Id: tkUnixEvent.c,v 1.1.4.2 1998/09/30 02:19:17 stanton Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixFocus.c b/unix/tkUnixFocus.c
index 5c1a4f6..8a61d39 100644
--- a/unix/tkUnixFocus.c
+++ b/unix/tkUnixFocus.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkUnixFocus.c 1.9 97/10/31 09:54:04
+ * RCS: @(#) $Id: tkUnixFocus.c,v 1.1.4.1 1998/09/30 02:19:17 stanton Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c
index 2a76e4d..88f31a0 100644
--- a/unix/tkUnixFont.c
+++ b/unix/tkUnixFont.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkUnixFont.c 1.22 98/02/18 17:09:20
+ * RCS: @(#) $Id: tkUnixFont.c,v 1.1.4.2 1998/09/30 02:19:18 stanton Exp $
  */
  
 #include "tkUnixInt.h"
diff --git a/unix/tkUnixInit.c b/unix/tkUnixInit.c
index c90eb16..5096fe4 100644
--- a/unix/tkUnixInit.c
+++ b/unix/tkUnixInit.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkUnixInit.c 1.26 98/01/02 17:45:36
+ * RCS: @(#) $Id: tkUnixInit.c,v 1.1.4.2 1998/09/30 02:19:18 stanton Exp $
  */
 
 #include "tkInt.h"
@@ -21,13 +21,6 @@
  */
 #include "tkInitScript.h"
 
-
-/*
- * Default directory in which to look for libraries:
- */
-
-static char defaultLibraryDir[200] = TK_LIBRARY;
-
 
 /*
  *----------------------------------------------------------------------
@@ -51,12 +44,6 @@ int
 TkpInit(interp)
     Tcl_Interp *interp;
 {
-    char *libDir;
-
-    libDir = Tcl_GetVar(interp, "tk_library", TCL_GLOBAL_ONLY);
-    if (libDir == NULL) {
-	Tcl_SetVar(interp, "tk_library", defaultLibraryDir, TCL_GLOBAL_ONLY);
-    }
     TkCreateXEventSource();
     return Tcl_Eval(interp, initScript);
 }
diff --git a/unix/tkUnixInt.h b/unix/tkUnixInt.h
index bef2f38..6fb896a 100644
--- a/unix/tkUnixInt.h
+++ b/unix/tkUnixInt.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.
  *
- * SCCS: @(#) tkUnixInt.h 1.10 97/05/15 14:47:03
+ * RCS: @(#) $Id: tkUnixInt.h,v 1.1.4.2 1998/09/30 02:19:19 stanton Exp $
  */
 
 #ifndef _TKUNIXINT
diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c
index 6df12fc..0fc2117 100644
--- a/unix/tkUnixKey.c
+++ b/unix/tkUnixKey.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkUnixKey.c 1.3 98/01/13 17:34:38
+ * RCS: @(#) $Id: tkUnixKey.c,v 1.1.2.2 1998/09/30 02:19:19 stanton Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixMenu.c b/unix/tkUnixMenu.c
index 20d7196..3ecdee7 100644
--- a/unix/tkUnixMenu.c
+++ b/unix/tkUnixMenu.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkUnixMenu.c 1.80 98/01/20 16:39:28
+ * RCS: @(#) $Id: tkUnixMenu.c,v 1.1.4.2 1998/09/30 02:19:19 stanton Exp $
  */
 
 #include "tkPort.h"
diff --git a/unix/tkUnixMenubu.c b/unix/tkUnixMenubu.c
index b5f4fd5..9f203b9 100644
--- a/unix/tkUnixMenubu.c
+++ b/unix/tkUnixMenubu.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkUnixMenubu.c 1.9 97/05/23 16:25:01
+ * RCS: @(#) $Id: tkUnixMenubu.c,v 1.1.4.1 1998/09/30 02:19:20 stanton Exp $
  */
 
 #include "tkMenubutton.h"
diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h
index 0bc3632..4d84c0f 100644
--- a/unix/tkUnixPort.h
+++ b/unix/tkUnixPort.h
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkUnixPort.h 1.40 98/02/10 10:33:38
+ * RCS: @(#) $Id: tkUnixPort.h,v 1.1.4.2 1998/09/30 02:19:21 stanton Exp $
  */
 
 #ifndef _UNIXPORT
diff --git a/unix/tkUnixScale.c b/unix/tkUnixScale.c
index 05b2a19..86e0cf5 100644
--- a/unix/tkUnixScale.c
+++ b/unix/tkUnixScale.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkUnixScale.c 1.5 96/07/31 14:22:29
+ * RCS: @(#) $Id: tkUnixScale.c,v 1.1.4.1 1998/09/30 02:19:21 stanton Exp $
  */
 
 #include "tkScale.h"
diff --git a/unix/tkUnixScrlbr.c b/unix/tkUnixScrlbr.c
index 74b46e8..f776ded 100644
--- a/unix/tkUnixScrlbr.c
+++ b/unix/tkUnixScrlbr.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkUnixScrlbr.c 1.8 96/12/10 20:05:07
+ * RCS: @(#) $Id: tkUnixScrlbr.c,v 1.1.4.1 1998/09/30 02:19:21 stanton Exp $
  */
 
 #include "tkScrollbar.h"
diff --git a/unix/tkUnixSelect.c b/unix/tkUnixSelect.c
index ff355ea..dfeb0c3 100644
--- a/unix/tkUnixSelect.c
+++ b/unix/tkUnixSelect.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkUnixSelect.c 1.6 97/11/07 21:24:34
+ * RCS: @(#) $Id: tkUnixSelect.c,v 1.1.4.2 1998/09/30 02:19:22 stanton Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixSend.c b/unix/tkUnixSend.c
index 932c4b4..5f028e1 100644
--- a/unix/tkUnixSend.c
+++ b/unix/tkUnixSend.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkUnixSend.c 1.76 97/11/07 21:25:10
+ * RCS: @(#) $Id: tkUnixSend.c,v 1.1.4.2 1998/09/30 02:19:22 stanton Exp $
  */
 
 #include "tkPort.h"
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index 33dcd78..aecdac5 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -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.
  *
- * SCCS: @(#) tkUnixWm.c 1.158 98/01/20 14:19:48
+ * RCS: @(#) $Id: tkUnixWm.c,v 1.1.4.2 1998/09/30 02:19:23 stanton Exp $
  */
 
 #include "tkPort.h"
diff --git a/unix/tkUnixXId.c b/unix/tkUnixXId.c
index 2bcab2b..1d0d94b 100644
--- a/unix/tkUnixXId.c
+++ b/unix/tkUnixXId.c
@@ -17,7 +17,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tkUnixXId.c 1.24 98/01/12 15:30:26
+ * RCS: @(#) $Id: tkUnixXId.c,v 1.1.4.2 1998/09/30 02:19:24 stanton Exp $
  */
 
 /*