summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
Diffstat (limited to 'win')
-rw-r--r--win/README4
-rwxr-xr-xwin/configure6
-rw-r--r--win/configure.in8
-rw-r--r--win/makefile.vc4
-rw-r--r--win/tcl.m428
5 files changed, 25 insertions, 25 deletions
diff --git a/win/README b/win/README
index 14d8d52..a7781bc 100644
--- a/win/README
+++ b/win/README
@@ -1,8 +1,8 @@
-Tk 8.4 for Windows
+Tk 8.5 for Windows
Originally by Scott Stanton while at Sun Microsystems Labs
-RCS: @(#) $Id: README,v 1.16 2002/03/04 23:31:45 hobbs Exp $
+RCS: @(#) $Id: README,v 1.17 2003/03/04 23:50:45 dgp Exp $
This is the directory where you configure and compile the Windows
version of Tk. This directory also contains source files for Tk
diff --git a/win/configure b/win/configure
index 0db2034..83fab07 100755
--- a/win/configure
+++ b/win/configure
@@ -533,10 +533,10 @@ fi
-TK_VERSION=8.4
+TK_VERSION=8.5
TK_MAJOR_VERSION=8
-TK_MINOR_VERSION=4
-TK_PATCH_LEVEL=".2"
+TK_MINOR_VERSION=5
+TK_PATCH_LEVEL="a0"
VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
#------------------------------------------------------------------------
diff --git a/win/configure.in b/win/configure.in
index aea2314..67974db 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,15 +3,15 @@
# generate the file "configure", which is run during Tk installation
# to configure the system for the local environment.
#
-# RCS: @(#) $Id: configure.in,v 1.49 2003/02/15 02:21:01 hobbs Exp $
+# RCS: @(#) $Id: configure.in,v 1.50 2003/03/04 23:50:47 dgp Exp $
AC_INIT(../generic/tk.h)
AC_PREREQ(2.13)
-TK_VERSION=8.4
+TK_VERSION=8.5
TK_MAJOR_VERSION=8
-TK_MINOR_VERSION=4
-TK_PATCH_LEVEL=".2"
+TK_MINOR_VERSION=5
+TK_PATCH_LEVEL="a0"
VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
#------------------------------------------------------------------------
diff --git a/win/makefile.vc b/win/makefile.vc
index c8fe5bf..a225626 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
# Copyright (c) 2001-2002 David Gravereaux.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.67 2003/02/14 20:30:36 davygrvy Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.68 2003/03/04 23:50:49 dgp Exp $
#------------------------------------------------------------------------------
!if "$(MSVCDIR)" == ""
@@ -165,7 +165,7 @@ PROJECT = tk
!endif
STUBPREFIX = $(PROJECT)stub
-DOTVERSION = 8.4
+DOTVERSION = 8.5
VERSION = $(DOTVERSION:.=)
WISHNAMEPREFIX = wish
diff --git a/win/tcl.m4 b/win/tcl.m4
index 0c07b21..48c4ba3 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -20,15 +20,15 @@
AC_DEFUN(SC_PATH_TCLCONFIG, [
AC_MSG_CHECKING([the location of tclConfig.sh])
- if test -d ../../tcl8.4$1/win; then
- TCL_BIN_DIR_DEFAULT=../../tcl8.4$1/win
- elif test -d ../../tcl8.4/win; then
- TCL_BIN_DIR_DEFAULT=../../tcl8.4/win
+ if test -d ../../tcl8.5$1/win; then
+ TCL_BIN_DIR_DEFAULT=../../tcl8.5$1/win
+ elif test -d ../../tcl8.5/win; then
+ TCL_BIN_DIR_DEFAULT=../../tcl8.5/win
else
TCL_BIN_DIR_DEFAULT=../../tcl/win
fi
- AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.4 binaries from DIR],
+ AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.5 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)
@@ -60,15 +60,15 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [
AC_DEFUN(SC_PATH_TKCONFIG, [
AC_MSG_CHECKING([the location of tkConfig.sh])
- if test -d ../../tk8.4$1/win; then
- TK_BIN_DIR_DEFAULT=../../tk8.4$1/win
- elif test -d ../../tk8.4/win; then
- TK_BIN_DIR_DEFAULT=../../tk8.4/win
+ if test -d ../../tk8.5$1/win; then
+ TK_BIN_DIR_DEFAULT=../../tk8.5$1/win
+ elif test -d ../../tk8.5/win; then
+ TK_BIN_DIR_DEFAULT=../../tk8.5/win
else
TK_BIN_DIR_DEFAULT=../../tk/win
fi
- AC_ARG_WITH(tk, [ --with-tk=DIR use Tk 8.4 binaries from DIR],
+ AC_ARG_WITH(tk, [ --with-tk=DIR use Tk 8.5 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)
@@ -646,13 +646,13 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
#------------------------------------------------------------------------
AC_DEFUN(SC_WITH_TCL, [
- if test -d ../../tcl8.4$1/win; then
- TCL_BIN_DEFAULT=../../tcl8.4$1/win
+ if test -d ../../tcl8.5$1/win; then
+ TCL_BIN_DEFAULT=../../tcl8.5$1/win
else
- TCL_BIN_DEFAULT=../../tcl8.4/win
+ TCL_BIN_DEFAULT=../../tcl8.5/win
fi
- AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.4 binaries from DIR],
+ AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.5 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)