diff options
| author | dgp <dgp@users.sourceforge.net> | 2020-10-29 20:45:52 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2020-10-29 20:45:52 (GMT) |
| commit | 3731d05c07193ff8e555e9e1aff2280eab409852 (patch) | |
| tree | 5e8381b12296f2201eee57c55fcd7ec67e73af41 /win/configure | |
| parent | 3502d63c9c41141cf376b48781a9924d7779e061 (diff) | |
| parent | ab7e7f10137def475bf072146d6270b48a2efe49 (diff) | |
| download | tk-3731d05c07193ff8e555e9e1aff2280eab409852.zip tk-3731d05c07193ff8e555e9e1aff2280eab409852.tar.gz tk-3731d05c07193ff8e555e9e1aff2280eab409852.tar.bz2 | |
merge 8.6
Diffstat (limited to 'win/configure')
| -rwxr-xr-x | win/configure | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/win/configure b/win/configure index 7172a5a..048dbf0 100755 --- a/win/configure +++ b/win/configure @@ -3713,7 +3713,7 @@ echo "$as_me: error: ${CC} does not support the -shared option. SHLIB_LD='${CC} -shared' SHLIB_LD_LIBS='${LIBS}' MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \$@ ${extra_ldflags} \ - -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\$@)" + -Wl,--out-implib,\$(patsubst %.dll,lib%.dll.a,\$@)" # DLLSUFFIX is separate because it is the building block for # users of tclConfig.sh that may build shared or static. DLLSUFFIX="\${DBGX}.dll" @@ -4957,7 +4957,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 !!!! |