diff options
| -rw-r--r-- | win/Makefile.in | 3 | ||||
| -rwxr-xr-x | win/configure | 12 | ||||
| -rw-r--r-- | win/configure.in | 6 |
3 files changed, 18 insertions, 3 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 325b365..9e9622f 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -459,10 +459,11 @@ ${TEST_DLL_FILE}: ${TCL_STUB_LIB_FILE} ${TCLTEST_OBJS} # use pre-built zlib1.dll ${ZLIB_DLL_FILE}: ${TCL_STUB_LIB_FILE} - @if test "@ZLIB_LIBS@set" != "${ZLIB_DIR}/win32/zdll.libset" ; then \ + @if test "@ZLIB_LIBS@set" != "-L. -lzset" -a "@ZLIB_LIBS@set" != "${ZLIB_DIR}/win32/zdll.libset"; then \ $(COPY) $(ZLIB_DIR)/win64/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \ else \ $(COPY) $(ZLIB_DIR)/win32/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \ + $(COPY) $(ZLIB_DIR)/win32/${ZLIB_DLL_FILE} libz.dll.a; \ fi; # Add the object extension to the implicit rules. By default .obj is not diff --git a/win/configure b/win/configure index cf2b201..a47f226 100755 --- a/win/configure +++ b/win/configure @@ -4377,7 +4377,17 @@ fi else - ZLIB_LIBS=\${ZLIB_DIR}/win32/zdll.lib + if test "$GCC" == "yes"; then + + ZLIB_LIBS="-L. -lz" + + +else + + ZLIB_LIBS=\${ZLIB_DIR}/win32/zdll.lib + + +fi fi diff --git a/win/configure.in b/win/configure.in index aa47505..3509048 100644 --- a/win/configure.in +++ b/win/configure.in @@ -135,7 +135,11 @@ AS_IF([test "$tcl_ok" = "yes"], [ AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/zdll.lib]) ]) ], [ - AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win32/zdll.lib]) + AS_IF([test "$GCC" == "yes"],[ + AC_SUBST(ZLIB_LIBS,["-L. -lz"]) + ], [ + AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win32/zdll.lib]) + ]) ]) ], [ AC_SUBST(ZLIB_OBJS,[\${ZLIB_OBJS}]) |