diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-25 13:53:20 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-25 13:53:20 (GMT) |
| commit | fa31023365ece2d5c33d226c77b1aaa061cc10fa (patch) | |
| tree | 146be4229d49816cbca05fb8b07b11e158b3ea10 /win | |
| parent | 25b3e364d0e21bb057ddb735dc65fcbcaf6f070e (diff) | |
| parent | a2eecbce351c9dc1436c1a7a1582e1df477e7d8d (diff) | |
| download | tk-fa31023365ece2d5c33d226c77b1aaa061cc10fa.zip tk-fa31023365ece2d5c33d226c77b1aaa061cc10fa.tar.gz tk-fa31023365ece2d5c33d226c77b1aaa061cc10fa.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'win')
| -rwxr-xr-x | win/configure | 6 | ||||
| -rw-r--r-- | win/configure.ac | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/win/configure b/win/configure index 1309818..872005d 100755 --- a/win/configure +++ b/win/configure @@ -5825,7 +5825,11 @@ 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 spaces in path names -eval "TK_LIB_FLAG=\"-ltk${VER}${LIBFLAGSUFFIX}\"" +TK_LIB_FLAG="-l" +if test "${TCL_MAJOR_VERSION}" -gt 8 ; then + TK_LIB_FLAG="${TK_LIB_FLAG}tcl9" +fi +eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}${VER}${LIBFLAGSUFFIX}\"" TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" diff --git a/win/configure.ac b/win/configure.ac index a6b45b8..5fd3b8e 100644 --- a/win/configure.ac +++ b/win/configure.ac @@ -260,7 +260,11 @@ 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 spaces in path names -eval "TK_LIB_FLAG=\"-ltk${VER}${LIBFLAGSUFFIX}\"" +TK_LIB_FLAG="-l" +if test "${TCL_MAJOR_VERSION}" -gt 8 ; then + TK_LIB_FLAG="${TK_LIB_FLAG}tcl9" +fi +eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}${VER}${LIBFLAGSUFFIX}\"" TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" |