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.in | |
| 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.in')
| -rw-r--r-- | win/configure.in | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/win/configure.in b/win/configure.in index ad21f02..3397844 100644 --- a/win/configure.in +++ b/win/configure.in @@ -3,7 +3,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.49.2.5 2003/10/03 16:32:40 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.49.2.6 2003/11/11 00:05:54 hobbs Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.13) @@ -153,10 +153,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}" @@ -256,14 +263,15 @@ AC_SUBST(POST_MAKE_LIB) AC_SUBST(MAKE_DLL) AC_SUBST(MAKE_EXE) -# undefined at this point for win -AC_SUBST(TK_BUILD_LIB_SPEC) -AC_SUBST(TK_CC_SEARCH_FLAGS) -AC_SUBST(TK_LD_SEARCH_FLAGS) AC_SUBST(TK_LIB_FLAG) AC_SUBST(TK_LIB_SPEC) +AC_SUBST(TK_BUILD_LIB_SPEC) AC_SUBST(TK_STUB_LIB_SPEC) -AC_SUBST(TK_BUILD_STUB_LIB_PATH) AC_SUBST(TK_STUB_LIB_PATH) +AC_SUBST(TK_BUILD_STUB_LIB_PATH) + +# undefined at this point for win +AC_SUBST(TK_CC_SEARCH_FLAGS) +AC_SUBST(TK_LD_SEARCH_FLAGS) AC_OUTPUT(Makefile tkConfig.sh) |