diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-10-12 15:09:02 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-10-12 15:09:02 (GMT) |
| commit | 23718fff3fa4498a96ddba775e09ec032b64c6a1 (patch) | |
| tree | 1f10636b6db460edde51cdeedce05d61cc290c89 /unix/configure | |
| parent | 96b66d43c7d89c8cff44d9768c2d57bd4b4a7cdf (diff) | |
| parent | f09480661f2d21a06fc4329c773d93124e674a7a (diff) | |
| download | tk-23718fff3fa4498a96ddba775e09ec032b64c6a1.zip tk-23718fff3fa4498a96ddba775e09ec032b64c6a1.tar.gz tk-23718fff3fa4498a96ddba775e09ec032b64c6a1.tar.bz2 | |
Rebase to 8.7
Diffstat (limited to 'unix/configure')
| -rwxr-xr-x | unix/configure | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/unix/configure b/unix/configure index 7eeeaa7..876d417 100755 --- a/unix/configure +++ b/unix/configure @@ -8903,14 +8903,18 @@ fi #-------------------------------------------------------------------- # Replace ${VERSION} with contents of ${TK_VERSION} -eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}" -eval "TK_STUB_LIB_DIR=${libdir}" - +if test "${TCL_MAJOR_VERSION}" -gt 8 ; then + TK_STUB_LIB_FILE="libtkstub.a" + TK_STUB_LIB_FLAG="-ltkstub" +else + eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}" if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}" else TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`" fi +fi +eval "TK_STUB_LIB_DIR=${libdir}" TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}" TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}" |