diff options
| author | hobbs <hobbs@noemail.net> | 2000-08-05 23:52:32 (GMT) |
|---|---|---|
| committer | hobbs <hobbs@noemail.net> | 2000-08-05 23:52:32 (GMT) |
| commit | 4d6f0eba5ba2db5a453bf5b05929a5826b154743 (patch) | |
| tree | 7db94b437ae67d2c88ca9af9953fbd6531d4d888 /win | |
| parent | df77f1ea3a03fdcd8ae9b0ffcf0560a4259274ea (diff) | |
| download | tk-4d6f0eba5ba2db5a453bf5b05929a5826b154743.zip tk-4d6f0eba5ba2db5a453bf5b05929a5826b154743.tar.gz tk-4d6f0eba5ba2db5a453bf5b05929a5826b154743.tar.bz2 | |
* win/Makefile.in (cat32.${OBJEXT}): corrected where to find cat.c
given the change in default def'n of TCL_SRC_DIR.
* win/tcl.m4: changed references from 8.4 to 8.3 (leftover from a
backported file).
FossilOrigin-Name: 8f49c58623a490990aa18d7178f190e1cdd3aa25
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 4 | ||||
| -rw-r--r-- | win/tcl.m4 | 24 |
2 files changed, 14 insertions, 14 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 64647a4..d143289 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.24.2.3 2000/07/28 08:12:05 mo Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.24.2.4 2000/08/05 23:52:32 hobbs Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -509,7 +509,7 @@ $(TKTEST): $(TK_LIB_FILE) $(TKTEST_OBJS) $(WISH_RES) $(CAT32) $(TK_LIB_FILE) $(LIBS) \ $(WISH_RES) $(CC_EXENAME) $(LDFLAGS_WINDOW) -cat32.${OBJEXT}: $(TCL_SRC_DIR)/cat.c +cat32.${OBJEXT}: $(TCL_SRC_DIR)/win/cat.c $(CC) -c $(CC_SWITCHES) $(DEPARG) $(CC_OBJNAME) $(CAT32): cat32.${OBJEXT} @@ -20,13 +20,13 @@ 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 + if test -d ../../tcl8.3$1/win; then + TCL_BIN_DIR_DEFAULT=../../tcl8.3$1/win else - TCL_BIN_DIR_DEFAULT=../../tcl8.4/win + TCL_BIN_DIR_DEFAULT=../../tcl8.3/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.3 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.4$1/win; then - TK_BIN_DIR_DEFAULT=../../tk8.4$1/win + if test -d ../../tk8.3$1/win; then + TK_BIN_DIR_DEFAULT=../../tk8.3$1/win else - TK_BIN_DIR_DEFAULT=../../tk8.4/win + TK_BIN_DIR_DEFAULT=../../tk8.3/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.3 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) @@ -557,13 +557,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.3$1/win; then + TCL_BIN_DEFAULT=../../tcl8.3$1/win else - TCL_BIN_DEFAULT=../../tcl8.4/win + TCL_BIN_DEFAULT=../../tcl8.3/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.3 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) |