diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-29 14:14:07 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-29 14:14:07 (GMT) |
| commit | 515f4221def415bff615bfdec46df065af43f93e (patch) | |
| tree | 5cbf0126745f3947156a8fe41322ee5f6831ca16 /win/configure.ac | |
| parent | 23f3f3d7286d69a47c993acf489b768f415cc664 (diff) | |
| parent | 5dab749a31b11a06605c7236dae5c91b0d74a760 (diff) | |
| download | tk-515f4221def415bff615bfdec46df065af43f93e.zip tk-515f4221def415bff615bfdec46df065af43f93e.tar.gz tk-515f4221def415bff615bfdec46df065af43f93e.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'win/configure.ac')
| -rw-r--r-- | win/configure.ac | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/win/configure.ac b/win/configure.ac index 10728e0..56b8813 100644 --- a/win/configure.ac +++ b/win/configure.ac @@ -160,7 +160,11 @@ TK_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" eval "TK_SRC_DIR=\"`cd $srcdir/..; pwd`\"" eval "TK_DLL_FILE=tk$VER${DLLSUFFIX}" -eval "TK_LIB_FILE=${LIBPREFIX}tk$VER${LIBSUFFIX}" +if test ${SHARED_BUILD} = 0 ; then + eval "TK_LIB_FILE=${LIBPREFIX}tk${VER}${LIBSUFFIX}" +else + eval "TK_LIB_FILE=${LIBPREFIX}tk${VER}${DLLSUFFIX}.a" +fi eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${VER}${LIBSUFFIX}" # FIXME: All of this var junk needs to be done in tcl.m4 !!!! |