diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | win/configure.in | 25 |
2 files changed, 26 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2000-07-21 Mo DeJong <mdejong@redhat.com> + + * win/configure.in: Add TK_STUB_LIB_FLAG and + TK_BUILD_STUB_LIB_SPEC. These are needed to + build a stub enabled extension. + 2000-07-20 Eric Melski <ericm@ajubasolutions.com> * unix/tkUnixDraw.c (TkScrollWindow): Replaced a use of a trinary diff --git a/win/configure.in b/win/configure.in index abb14f2..57681f6 100644 --- a/win/configure.in +++ b/win/configure.in @@ -2,7 +2,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.19 2000/07/07 11:20:33 mo Exp $ +# RCS: @(#) $Id: configure.in,v 1.20 2000/07/21 16:27:35 mo Exp $ AC_INIT(../generic/tk.h) @@ -103,13 +103,24 @@ TK_UNSHARED_LIB_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" TK_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" eval "TK_SRC_DIR=`cd $srcdir/..; pwd`" -eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub$VER${LIBSUFFIX}" + eval "TK_DLL_FILE=tk$VER${DLLSUFFIX}" eval "TK_LIB_FILE=${LIBPREFIX}tk$VER${LIBSUFFIX}" -eval "TCL_STUB_LIB_FILE=${LIBPREFIX}tclstub$VER${LIBSUFFIX}" -eval "TCL_DLL_FILE=tcl$VER${DLLSUFFIX}" -eval "TCL_LIB_FILE=${LIBPREFIX}tcl$VER${LIBSUFFIX}" +eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${VER}${LIBSUFFIX}" +# FIXME: All of this var junk needs to be done in tcl.m4 !!!! +# I left out the other vars that also need to get defined here. +# we also need to double check about including DBGX in lib names +# and spaces in file or directory names for the eval +eval "TK_STUB_LIB_FLAG=\"-ltkstub${VER}${LIBSUFFIX}\"" +eval "TK_BUILD_STUB_LIB_SPEC=\"-L`pwd` ${TK_STUB_LIB_FLAG}\"" + +eval "TCL_DLL_FILE=\"tcl$VER${DLLSUFFIX}\"" +eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl$VER${LIBSUFFIX}\"" + +eval "TCL_STUB_LIB_FILE=\"${LIBPREFIX}tclstub${VER}${LIBSUFFIX}\"" +eval "TCL_STUB_LIB_FLAG=\"-ltclstub${VER}${LIBSUFFIX}\"" +eval "TCL_BUILD_STUB_LIB_SPEC=\"-L`pwd` ${TCL_STUB_LIB_FLAG}\"" eval "DLLSUFFIX=${DLLSUFFIX}" eval "LIBPREFIX=${LIBPREFIX}" @@ -128,6 +139,8 @@ AC_SUBST(TK_DBGX) AC_SUBST(TK_LIB_FILE) AC_SUBST(TK_DLL_FILE) AC_SUBST(TK_STUB_LIB_FILE) +AC_SUBST(TK_STUB_LIB_FLAG) +AC_SUBST(TK_BUILD_STUB_LIB_SPEC) AC_SUBST(TK_SRC_DIR) AC_SUBST(TK_BIN_DIR) @@ -138,6 +151,8 @@ AC_SUBST(TCL_PATCH_LEVEL) AC_SUBST(TCL_LIB_FILE) AC_SUBST(TCL_DLL_FILE) AC_SUBST(TCL_STUB_LIB_FILE) +AC_SUBST(TCL_STUB_LIB_FLAG) +AC_SUBST(TCL_BUILD_STUB_LIB_SPEC) AC_SUBST(TCL_SRC_DIR) AC_SUBST(TCL_BIN_DIR) AC_SUBST(TCL_DBGX) |