From ebbffb3ea5b1b5609e3fb86ddea543aa3d24693d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 7 May 2013 11:38:35 +0000
Subject: No longer link Cygwin executables with zlib1.dll, but with cygz.dll.
 On Cygwin64 this doesn't work, and on Cygwin32 it was a bad idea anyway.

---
 unix/Makefile.in  | 8 --------
 unix/configure    | 6 +-----
 unix/configure.in | 6 +-----
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 00e694d..3b14752 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -614,9 +614,6 @@ doc:
 ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
 	rm -f $@
 	@MAKE_LIB@
-	@if test "x$(DLL_INSTALL_DIR)" = "x$(BIN_INSTALL_DIR)"; then\
-	    cp ${ZLIB_DIR}/win32/zlib1.dll .;\
-	fi
 
 
 ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
@@ -787,11 +784,6 @@ install-binaries: binaries
 		else true; \
 		fi; \
 	    done;
-	@if test "x$(DLL_INSTALL_DIR)" = "x$(BIN_INSTALL_DIR)"; then\
-	    echo "Installing zlib1.dll to $(BIN_INSTALL_DIR)/";\
-	    $(INSTALL_LIBRARY) zlib1.dll "$(BIN_INSTALL_DIR)";\
-	    chmod 555 "$(BIN_INSTALL_DIR)/zlib1.dll";\
-	fi
 	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
 	@@INSTALL_LIB@
 	@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
diff --git a/unix/configure b/unix/configure
index c178bf1..8a9a462 100755
--- a/unix/configure
+++ b/unix/configure
@@ -14384,11 +14384,7 @@ _ACEOF
 #	lack blkcnt_t.
 #--------------------------------------------------------------------
 
-if test "$ac_cv_cygwin" = "yes"; then
-    if test "x${SHARED_BUILD}" = "x1"; then
-	TCL_SHLIB_LD_EXTRAS="${TCL_SHLIB_LD_EXTRAS} \${COMPAT_DIR}/zlib/win32/zdll.lib"
-    fi
-else
+if test "$ac_cv_cygwin" != "yes"; then
     echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
 echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6
 if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then
diff --git a/unix/configure.in b/unix/configure.in
index 19db579..dca8b8c 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -310,11 +310,7 @@ SC_TIME_HANDLER
 #	lack blkcnt_t.
 #--------------------------------------------------------------------
 
-if test "$ac_cv_cygwin" = "yes"; then
-    if test "x${SHARED_BUILD}" = "x1"; then
-	TCL_SHLIB_LD_EXTRAS="${TCL_SHLIB_LD_EXTRAS} \${COMPAT_DIR}/zlib/win32/zdll.lib"
-    fi
-else
+if test "$ac_cv_cygwin" != "yes"; then
     AC_CHECK_MEMBERS([struct stat.st_blocks, struct stat.st_blksize])
 fi
 AC_CHECK_TYPES([blkcnt_t])
-- 
cgit v0.12