diff options
| author | dgp@users.sourceforge.net <dgp> | 2008-04-01 16:30:51 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2008-04-01 16:30:51 (GMT) |
| commit | 8adc5f9b39e23d19ab32c7c4b9f4b6aca3207c7c (patch) | |
| tree | add0631b057edf9490c467e2c9847231e0c5379e /win | |
| parent | efc970d059cdd8b72a386ff57a4236ec19de44bd (diff) | |
| download | tk-8adc5f9b39e23d19ab32c7c4b9f4b6aca3207c7c.zip tk-8adc5f9b39e23d19ab32c7c4b9f4b6aca3207c7c.tar.gz tk-8adc5f9b39e23d19ab32c7c4b9f4b6aca3207c7c.tar.bz2 | |
* README: Bump version number to 8.6a0
* generic/tk.h:
* library/tk.tcl:
* macosx/Wish-Common.xcconfig:
* unix/configure.in:
* unix/tk.spec:
* win/README:
* win/configure.in:
* win/tcl.m4:
* unix/configure: autoconf-2.59
* win/configure:
* generic/tkConsole.c: Relax Tcl_InitStubs() calls so that a Tk 8.6
* generic/tkMain.c: might [load] into a Tcl 8.5 interp.
* generic/tkWindow.c:
* generic/tkStubLib.c: Update to compatibility with a libtcl.so
that contains no "tclStubsPtr" [Tcl Bug 1819422].
* generic/tkDecls.h: make genstubs
* generic/tkIntDecls.h:
* generic/tkIntPlatDecls.h:
* generic/tkIntXlibDecls.h:
* generic/tkPlatDecls.h:
Diffstat (limited to 'win')
| -rw-r--r-- | win/README | 4 | ||||
| -rwxr-xr-x | win/configure | 6 | ||||
| -rw-r--r-- | win/configure.in | 8 | ||||
| -rw-r--r-- | win/tcl.m4 | 28 |
4 files changed, 23 insertions, 23 deletions
@@ -1,8 +1,8 @@ -Tk 8.5 for Windows +Tk 8.6 for Windows Originally by Scott Stanton while at Sun Microsystems Labs -RCS: @(#) $Id: README,v 1.17 2003/03/04 23:50:45 dgp Exp $ +RCS: @(#) $Id: README,v 1.18 2008/04/01 16:30:56 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 5932de2..c9f2be5 100755 --- a/win/configure +++ b/win/configure @@ -1306,10 +1306,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # /bin/sh. The bash shell seems to suffer from some strange failures. SHELL=/bin/sh -TK_VERSION=8.5 +TK_VERSION=8.6 TK_MAJOR_VERSION=8 -TK_MINOR_VERSION=5 -TK_PATCH_LEVEL=".2" +TK_MINOR_VERSION=6 +TK_PATCH_LEVEL="a0" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ diff --git a/win/configure.in b/win/configure.in index ff948ec..48ee9ed 100644 --- a/win/configure.in +++ b/win/configure.in @@ -3,7 +3,7 @@ # generate the file "configure", which is run during Tk installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.77 2008/03/28 18:13:42 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.78 2008/04/01 16:30:56 dgp Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.59) @@ -13,10 +13,10 @@ AC_PREREQ(2.59) # /bin/sh. The bash shell seems to suffer from some strange failures. SHELL=/bin/sh -TK_VERSION=8.5 +TK_VERSION=8.6 TK_MAJOR_VERSION=8 -TK_MINOR_VERSION=5 -TK_PATCH_LEVEL=".2" +TK_MINOR_VERSION=6 +TK_PATCH_LEVEL="a0" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ @@ -20,15 +20,15 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ AC_MSG_CHECKING([the location of tclConfig.sh]) - 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 + if test -d ../../tcl8.6$1/win; then + TCL_BIN_DIR_DEFAULT=../../tcl8.6$1/win + elif test -d ../../tcl8.6/win; then + TCL_BIN_DIR_DEFAULT=../../tcl8.6/win else TCL_BIN_DIR_DEFAULT=../../tcl/win fi - AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.5 binaries from DIR], + AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.6 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.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 + if test -d ../../tk8.6$1/win; then + TK_BIN_DIR_DEFAULT=../../tk8.6$1/win + elif test -d ../../tk8.6/win; then + TK_BIN_DIR_DEFAULT=../../tk8.6/win else TK_BIN_DIR_DEFAULT=../../tk/win fi - AC_ARG_WITH(tk, [ --with-tk=DIR use Tk 8.5 binaries from DIR], + AC_ARG_WITH(tk, [ --with-tk=DIR use Tk 8.6 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) @@ -796,13 +796,13 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ #------------------------------------------------------------------------ AC_DEFUN([SC_WITH_TCL], [ - if test -d ../../tcl8.5$1/win; then - TCL_BIN_DEFAULT=../../tcl8.5$1/win + if test -d ../../tcl8.6$1/win; then + TCL_BIN_DEFAULT=../../tcl8.6$1/win else - TCL_BIN_DEFAULT=../../tcl8.5/win + TCL_BIN_DEFAULT=../../tcl8.6/win fi - AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.5 binaries from DIR], + AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.6 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) |