diff options
| author | hobbs <hobbs> | 2003-11-11 00:05:52 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2003-11-11 00:05:52 (GMT) |
| commit | ffdad8d85818234b95b62f6c512b5144f74e5ec4 (patch) | |
| tree | 4c42704e042654de77f53e2bd8547f6d0d1dbb11 /win/configure | |
| parent | cc28a05ba298a726964b45ca22b9cfc39a65d8a4 (diff) | |
| download | tk-ffdad8d85818234b95b62f6c512b5144f74e5ec4.zip tk-ffdad8d85818234b95b62f6c512b5144f74e5ec4.tar.gz tk-ffdad8d85818234b95b62f6c512b5144f74e5ec4.tar.bz2 | |
* win/configure:
* win/configure.in: define TK_LIB_FLAG, TK_LIB_SPEC,
TK_BUILD_LIB_SPEC, TK_STUB_LIB_SPEC, TK_STUB_LIB_PATH, and
TK_BUILD_STUB_LIB_PATH for tkConfig.sh [Bug #826614]
Diffstat (limited to 'win/configure')
| -rwxr-xr-x | win/configure | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/win/configure b/win/configure index 4b0150b..df5d51d 100755 --- a/win/configure +++ b/win/configure @@ -1762,10 +1762,17 @@ eval "TK_LIB_FILE=${LIBPREFIX}tk$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 +# we also need to double check about spaces in path names +eval "TK_LIB_FLAG=\"-ltk${VER}${LIBFLAGSUFFIX}\"" +TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" +TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" + eval "TK_STUB_LIB_FLAG=\"-ltkstub${VER}${LIBFLAGSUFFIX}\"" -eval "TK_BUILD_STUB_LIB_SPEC=\"-L`pwd` ${TK_STUB_LIB_FLAG}\"" +TK_BUILD_STUB_LIB_SPEC="-L`pwd` ${TK_STUB_LIB_FLAG}" + +TK_STUB_LIB_SPEC="-L${libdir} ${TK_STUB_LIB_FLAG}" +TK_STUB_LIB_PATH="${libdir}/${TK_STUB_LIB_FILE}" +TK_BUILD_STUB_LIB_PATH="`pwd`/${TK_STUB_LIB_FILE}" eval "DLLSUFFIX=${DLLSUFFIX}" eval "LIBPREFIX=${LIBPREFIX}" @@ -1865,7 +1872,6 @@ fi -# undefined at this point for win @@ -1873,6 +1879,8 @@ fi +# undefined at this point for win + trap '' 1 2 15 @@ -2099,14 +2107,14 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@POST_MAKE_LIB@%$POST_MAKE_LIB%g s%@MAKE_DLL@%$MAKE_DLL%g s%@MAKE_EXE@%$MAKE_EXE%g -s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g -s%@TK_CC_SEARCH_FLAGS@%$TK_CC_SEARCH_FLAGS%g -s%@TK_LD_SEARCH_FLAGS@%$TK_LD_SEARCH_FLAGS%g s%@TK_LIB_FLAG@%$TK_LIB_FLAG%g s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g +s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g s%@TK_STUB_LIB_SPEC@%$TK_STUB_LIB_SPEC%g -s%@TK_BUILD_STUB_LIB_PATH@%$TK_BUILD_STUB_LIB_PATH%g s%@TK_STUB_LIB_PATH@%$TK_STUB_LIB_PATH%g +s%@TK_BUILD_STUB_LIB_PATH@%$TK_BUILD_STUB_LIB_PATH%g +s%@TK_CC_SEARCH_FLAGS@%$TK_CC_SEARCH_FLAGS%g +s%@TK_LD_SEARCH_FLAGS@%$TK_LD_SEARCH_FLAGS%g CEOF EOF |