diff options
| author | redman <redman@noemail.net> | 1999-07-22 21:51:24 (GMT) |
|---|---|---|
| committer | redman <redman@noemail.net> | 1999-07-22 21:51:24 (GMT) |
| commit | 8a7d95bb244b22dc364bb2966fea0182ef0dfb3a (patch) | |
| tree | 3e5ecb70f53d8151539286c00e94d4c231419d18 /win | |
| parent | 8502ea91651b2ef1c5cb798b54c6e694f81f6479 (diff) | |
| download | tk-8a7d95bb244b22dc364bb2966fea0182ef0dfb3a.zip tk-8a7d95bb244b22dc364bb2966fea0182ef0dfb3a.tar.gz tk-8a7d95bb244b22dc364bb2966fea0182ef0dfb3a.tar.bz2 | |
* Changed version to 8.2b2
* win/tkWinPort.h: Block out include of sys/stat.h in order to
build extensions with MetroWerks compiler for Win32. [Bug: 2385]
* unix/Makefile.in: Need to make install-sh executable before
calling (with chmod +x). [Bug: 2413]
* library/menu.tcl: Applied patch from Jeff Hobbs to fix typo.
[Bug: 2425]
FossilOrigin-Name: 8d1544514d4de7b610d7ad3f699f05aba70712c7
Diffstat (limited to 'win')
| -rw-r--r-- | win/aclocal.m4 | 24 | ||||
| -rw-r--r-- | win/tkWinPort.h | 11 |
2 files changed, 22 insertions, 13 deletions
diff --git a/win/aclocal.m4 b/win/aclocal.m4 index d74df1a..9fad38c 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.1$1/win; then - TCL_BIN_DIR_DEFAULT=../../tcl8.1$1/win + if test -d ../../tcl8.2$1/win; then + TCL_BIN_DIR_DEFAULT=../../tcl8.2$1/win else - TCL_BIN_DIR_DEFAULT=../../tcl8.1/win + TCL_BIN_DIR_DEFAULT=../../tcl8.2/win fi - AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.1 binaries from DIR], + AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.2 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.1$1/win; then - TK_BIN_DIR_DEFAULT=../../tk8.1$1/win + if test -d ../../tk8.2$1/win; then + TK_BIN_DIR_DEFAULT=../../tk8.2$1/win else - TK_BIN_DIR_DEFAULT=../../tk8.1/win + TK_BIN_DIR_DEFAULT=../../tk8.2/win fi - AC_ARG_WITH(tk, [ --with-tk=DIR use Tk 8.1 binaries from DIR], + AC_ARG_WITH(tk, [ --with-tk=DIR use Tk 8.2 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.1$1/win; then - TCL_BIN_DEFAULT=../../tcl8.1$1/win + if test -d ../../tcl8.2$1/win; then + TCL_BIN_DEFAULT=../../tcl8.2$1/win else - TCL_BIN_DEFAULT=../../tcl8.1/win + TCL_BIN_DEFAULT=../../tcl8.2/win fi - AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.1 binaries from DIR], + AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.2 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/tkWinPort.h b/win/tkWinPort.h index 5391b21..4eaa443 100644 --- a/win/tkWinPort.h +++ b/win/tkWinPort.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. * - * RCS: @(#) $Id: tkWinPort.h,v 1.5 1999/04/16 01:51:53 stanton Exp $ + * RCS: @(#) $Id: tkWinPort.h,v 1.6 1999/07/22 21:51:25 redman Exp $ */ #ifndef _WINPORT @@ -31,7 +31,16 @@ #include <limits.h> #include <fcntl.h> #include <io.h> + +/* + * Need to block out this include for building extensions with MetroWerks + * compiler for Win32. + */ + +#ifndef __MWERKS__ #include <sys/stat.h> +#endif + #include <time.h> #include <tchar.h> |