diff options
| author | dgp <dgp@users.sourceforge.net> | 2008-04-01 16:30:51 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2008-04-01 16:30:51 (GMT) |
| commit | 5e7c4d9bce04c5fbf22ab66e1459a1660ff57e25 (patch) | |
| tree | add0631b057edf9490c467e2c9847231e0c5379e /win/tcl.m4 | |
| parent | 05d2b1f699928197cd82a59538c4b55d22f2df7c (diff) | |
| download | tk-5e7c4d9bce04c5fbf22ab66e1459a1660ff57e25.zip tk-5e7c4d9bce04c5fbf22ab66e1459a1660ff57e25.tar.gz tk-5e7c4d9bce04c5fbf22ab66e1459a1660ff57e25.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/tcl.m4')
| -rw-r--r-- | win/tcl.m4 | 28 |
1 files changed, 14 insertions, 14 deletions
@@ -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) |