From d86d21d052235b888eeae25dc76e8a8d8e8bf616 Mon Sep 17 00:00:00 2001
From: nijtmans <nijtmans>
Date: Tue, 23 Dec 2008 16:46:18 +0000
Subject: fix build of zlib objects with msvc

---
 ChangeLog       |  6 ++++++
 win/Makefile.in | 28 ++++++++++++++--------------
 win/configure   |  2 +-
 win/tcl.m4      |  2 +-
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9710b79..74b3df9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-23  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* win/Makefile.in:  fix build of zlib objects with msvc
+	* win/tcl.m4:
+	* win/configure:	autoconf-2.59
+
 2008-12-23  Donal K. Fellows  <dkf@users.sf.net>
 
 	* win/Makefile.in: Handle file extensions correctly. [Bug 2459725]
diff --git a/win/Makefile.in b/win/Makefile.in
index 1f6c664..29097c2 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
 # "./configure", which is a configuration script generated by the "autoconf"
 # program (constructs like "@foo@" will get replaced in the actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.147 2008/12/23 08:55:30 dkf Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.148 2008/12/23 16:46:19 nijtmans Exp $
 
 VERSION = @TCL_VERSION@
 
@@ -179,7 +179,7 @@ EXEEXT		= @EXEEXT@
 OBJEXT		= @OBJEXT@
 STLIB_LD	= @STLIB_LD@
 SHLIB_LD	= @SHLIB_LD@
-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ $(LIBS)
+SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
 SHLIB_CFLAGS	= @SHLIB_CFLAGS@
 SHLIB_SUFFIX	= @SHLIB_SUFFIX@
 LIBS		= @LIBS@
@@ -503,29 +503,29 @@ tclAppInit.${OBJEXT} : tclAppInit.c
 # For building zlib, only used in some build configurations
 
 Zadler32.$(OBJEXT): $(ZLIB_DIR)/adler32.c
-	$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
+	$(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME)
 Zcompress.$(OBJEXT): $(ZLIB_DIR)/compress.c
-	$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
+	$(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME)
 Zcrc32.$(OBJEXT):    $(ZLIB_DIR)/crc32.c
-	$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
+	$(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME)
 Zdeflate.$(OBJEXT):  $(ZLIB_DIR)/deflate.c
-	$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
+	$(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME)
 Zgzio.$(OBJEXT):     $(ZLIB_DIR)/gzio.c
-	$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
+	$(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME)
 Zinfback.$(OBJEXT):  $(ZLIB_DIR)/infback.c
-	$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
+	$(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME)
 Zinffast.$(OBJEXT):  $(ZLIB_DIR)/inffast.c
-	$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
+	$(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME)
 Zinflate.$(OBJEXT):  $(ZLIB_DIR)/inflate.c
-	$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
+	$(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME)
 Zinftrees.$(OBJEXT): $(ZLIB_DIR)/inftrees.c
-	$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
+	$(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME)
 Ztrees.$(OBJEXT):    $(ZLIB_DIR)/trees.c
-	$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
+	$(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME)
 Zuncompr.$(OBJEXT):  $(ZLIB_DIR)/uncompr.c
-	$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
+	$(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME)
 Zzutil.$(OBJEXT):    $(ZLIB_DIR)/zutil.c
-	$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
+	$(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME)
 
 tclZlib.${OBJEXT} : tclZlib.c
 	$(CC) -c ${ZLIB_INC} $(CC_SWITCHES) -DBUILD_tcl @DEPARG@ $(CC_OBJNAME)
diff --git a/win/configure b/win/configure
index 28a2a65..8b96430 100755
--- a/win/configure
+++ b/win/configure
@@ -3989,7 +3989,7 @@ echo "${ECHO_T}   Using 64-bit $MACHINE mode" >&6
 	    fi
 	fi
 
-	LIBS="user32.lib advapi32.lib ws2_32.lib zdll.lib"
+	LIBS="user32.lib advapi32.lib ws2_32.lib"
 	if test "$do64bit" != "no" ; then
 	    # The space-based-path will work for the Makefile, but will
 	    # not work if AC_TRY_COMPILE is called.  TEA has the
diff --git a/win/tcl.m4 b/win/tcl.m4
index f27720c..1a46527 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -614,7 +614,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    fi
 	fi
 
-	LIBS="user32.lib advapi32.lib ws2_32.lib zdll.lib"
+	LIBS="user32.lib advapi32.lib ws2_32.lib"
 	if test "$do64bit" != "no" ; then
 	    # The space-based-path will work for the Makefile, but will
 	    # not work if AC_TRY_COMPILE is called.  TEA has the
-- 
cgit v0.12