diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-06-25 10:01:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-06-25 10:01:36 (GMT) |
| commit | 4ddfabceb1dd92219b221373226f24345bd86759 (patch) | |
| tree | dccec125103eba842f379dfcfa174b8349ce64b9 /win/configure.ac | |
| parent | 1b7e7f9d63511b6a708a4b20a4f4f66b242eca97 (diff) | |
| download | tk-4ddfabceb1dd92219b221373226f24345bd86759.zip tk-4ddfabceb1dd92219b221373226f24345bd86759.tar.gz tk-4ddfabceb1dd92219b221373226f24345bd86759.tar.bz2 | |
TIP #628 for Tk: Shared 8.7/9.0 build environment
Diffstat (limited to 'win/configure.ac')
| -rw-r--r-- | win/configure.ac | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/win/configure.ac b/win/configure.ac index c843ebc..ae5a1e3 100644 --- a/win/configure.ac +++ b/win/configure.ac @@ -259,7 +259,11 @@ else fi fi -eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${VER}${LIBSUFFIX}" +if test "${TCL_MAJOR_VERSION}" -gt 8 ; then + eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${LIBSUFFIX}" ; +else + eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${VER}${LIBSUFFIX}" ; +fi # 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 @@ -271,7 +275,11 @@ eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}${VER}${LIBFLAGSUFFIX}\"" TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" eval "TK_BUILD_LIB_SPEC=\"-L`$CYGPATH $(pwd)` ${TK_LIB_FLAG}\"" -eval "TK_STUB_LIB_FLAG=\"-ltkstub${VER}${LIBFLAGSUFFIX}\"" +if test "${TCL_MAJOR_VERSION}" -gt 8 ; then + eval "TK_STUB_LIB_FLAG=\"-ltkstub${LIBFLAGSUFFIX}\"" +else + eval "TK_STUB_LIB_FLAG=\"-ltkstub${VER}${LIBFLAGSUFFIX}\"" +fi eval "TK_BUILD_STUB_LIB_SPEC=\"-L`$CYGPATH $(pwd)` ${TK_STUB_LIB_FLAG}\"" TK_STUB_LIB_SPEC="-L${libdir} ${TK_STUB_LIB_FLAG}" |