summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
Diffstat (limited to 'win')
-rw-r--r--win/README4
-rw-r--r--win/aclocal.m424
-rw-r--r--win/configure.in8
-rw-r--r--win/makefile.vc8
4 files changed, 22 insertions, 22 deletions
diff --git a/win/README b/win/README
index 7d9cdcf..592f93c 100644
--- a/win/README
+++ b/win/README
@@ -1,10 +1,10 @@
-Tk 8.3 for Windows
+Tk 8.4 for Windows
by Scott Stanton
Scriptics Corporation
scott.stanton@scriptics.com
-RCS: @(#) $Id: README,v 1.13 2000/04/26 17:37:36 hobbs Exp $
+RCS: @(#) $Id: README,v 1.14 2000/05/03 00:18:37 hobbs 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/aclocal.m4 b/win/aclocal.m4
index f10cc28..d76248d 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.3$1/win; then
- TCL_BIN_DIR_DEFAULT=../../tcl8.3$1/win
+ if test -d ../../tcl8.4$1/win; then
+ TCL_BIN_DIR_DEFAULT=../../tcl8.4$1/win
else
- TCL_BIN_DIR_DEFAULT=../../tcl8.3/win
+ TCL_BIN_DIR_DEFAULT=../../tcl8.4/win
fi
- AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.3 binaries from DIR],
+ AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.4 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.3$1/win; then
- TK_BIN_DIR_DEFAULT=../../tk8.3$1/win
+ if test -d ../../tk8.4$1/win; then
+ TK_BIN_DIR_DEFAULT=../../tk8.4$1/win
else
- TK_BIN_DIR_DEFAULT=../../tk8.3/win
+ TK_BIN_DIR_DEFAULT=../../tk8.4/win
fi
- AC_ARG_WITH(tk, [ --with-tk=DIR use Tk 8.3 binaries from DIR],
+ AC_ARG_WITH(tk, [ --with-tk=DIR use Tk 8.4 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.3$1/win; then
- TCL_BIN_DEFAULT=../../tcl8.3$1/win
+ if test -d ../../tcl8.4$1/win; then
+ TCL_BIN_DEFAULT=../../tcl8.4$1/win
else
- TCL_BIN_DEFAULT=../../tcl8.3/win
+ TCL_BIN_DEFAULT=../../tcl8.4/win
fi
- AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.3 binaries from DIR],
+ AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.4 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/configure.in b/win/configure.in
index aa256d8..f7bb113 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -2,14 +2,14 @@
# generate the file "configure", which is run during Tk installation
# to configure the system for the local environment.
#
-# RCS: @(#) $Id: configure.in,v 1.16 2000/04/19 09:25:54 hobbs Exp $
+# RCS: @(#) $Id: configure.in,v 1.17 2000/05/03 00:18:37 hobbs Exp $
AC_INIT(../generic/tk.h)
-TK_VERSION=8.3
+TK_VERSION=8.4
TK_MAJOR_VERSION=8
-TK_MINOR_VERSION=3
-TK_PATCH_LEVEL=".1"
+TK_MINOR_VERSION=4
+TK_PATCH_LEVEL="a1"
VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
#--------------------------------------------------------------------
diff --git a/win/makefile.vc b/win/makefile.vc
index 6cac887..124891d 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -4,7 +4,7 @@
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
# Copyright (c) 1995-1997 Sun Microsystems, Inc.
-# RCS: @(#) $Id: makefile.vc,v 1.33 2000/04/08 06:59:09 hobbs Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.34 2000/05/03 00:18:37 hobbs Exp $
# Does not depend on the presence of any environment variables in
# order to compile tcl; all needed information is derived from
@@ -26,7 +26,7 @@
#
ROOT = ..
-TCLDIR = ..\..\tcl8.3
+TCLDIR = ..\..\tcl8.4
INSTALLDIR = c:\progra~1\tcl
# Set this to the appropriate value of /MACHINE: for your platform
@@ -56,8 +56,8 @@ NODEBUG = 1
TCLNAMEPREFIX = tcl
TKNAMEPREFIX = tk
WISHNAMEPREFIX = wish
-VERSION = 83
-DOTVERSION = 8.3
+VERSION = 84
+DOTVERSION = 8.4
TCLSTUBPREFIX = $(TCLNAMEPREFIX)stub
TKSTUBPREFIX = $(TKNAMEPREFIX)stub