replaced wsock32.lib usage with ws2_32.lib in MSVC makefiles

5 files changed, 16 insertions, 12 deletions

diff --git a/CHANGES b/CHANGES
index 919a3d655..64e8ad64d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
 
                                   Changelog
 
+Yang Tse (20 Apr 2010)
+- Ruslan Gazizov detected that MSVC makefiles were using wsock32.lib instead
+  of ws2_32.lib, this generated linking issues on MSVC IPv6 enabled builds
+  that were done using those makefiles.
+
 Daniel Stenberg (19 Apr 2010)
 - -J/--remote-header-name didn't strip trailing carriage returns or linefeeds
   properly, so they could be used in the file name.
diff --git a/Makefile.dist b/Makefile.dist
index bca7c4cd2..efcf9e1a4 100644
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -266,22 +266,22 @@ vc8: lib/Makefile.vc8 src/Makefile.vc8
 
 lib/Makefile.vc8: lib/Makefile.vc6
 	@echo "generate $@"
-	@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/wsock32.lib/wsock32.lib bufferoverflowu.lib/g" -e "s/VC6/VC8/g" lib/Makefile.vc6 > lib/Makefile.vc8
+	@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib bufferoverflowu.lib/g" -e "s/VC6/VC8/g" lib/Makefile.vc6 > lib/Makefile.vc8
 
 src/Makefile.vc8: src/Makefile.vc6
 	@echo "generate $@"
-	@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/wsock32.lib/wsock32.lib bufferoverflowu.lib/g" -e "s/VC6/VC8/g" src/Makefile.vc6 > src/Makefile.vc8
+	@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib bufferoverflowu.lib/g" -e "s/VC6/VC8/g" src/Makefile.vc6 > src/Makefile.vc8
 
 # VC9 makefiles are for use with VS2008
 vc9: lib/Makefile.vc9 src/Makefile.vc9
 
 lib/Makefile.vc9: lib/Makefile.vc6
 	@echo "generate $@"
-	@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/wsock32.lib/ws2_32.lib/g" -e "s/vc6/vc9/g" -e "s/VC6/VC9/g" lib/Makefile.vc6 > lib/Makefile.vc9
+	@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib/g" -e "s/vc6/vc9/g" -e "s/VC6/VC9/g" lib/Makefile.vc6 > lib/Makefile.vc9
 
 src/Makefile.vc9: src/Makefile.vc6
 	@echo "generate $@"
-	@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/wsock32.lib/ws2_32.lib/g" -e "s/vc6/vc9/g" -e "s/VC6/VC9/g" src/Makefile.vc6 > src/Makefile.vc9
+	@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib/g" -e "s/vc6/vc9/g" -e "s/VC6/VC9/g" src/Makefile.vc6 > src/Makefile.vc9
 
 ca-bundle: lib/mk-ca-bundle.pl
 	@echo "generate a fresh ca-bundle.crt"
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e496826f2..d180686d8 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -18,6 +18,7 @@ This release includes the following bugfixes:
  o GnuTLS: EOF caused error when it wasn't
  o GnuTLS: SSL handshake phase is non-blocking
  o -J/--remote-header-name strips CRLF
+ o MSVC makefiles now use ws2_32.lib instead of wsock32.lib
 
 This release includes the following known bugs:
 
@@ -26,6 +27,6 @@ This release includes the following known bugs:
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
- Rainer Canavan, Paul Howarth, Jerome Vouillon
+ Rainer Canavan, Paul Howarth, Jerome Vouillon, Ruslan Gazizov
 
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 2262444e3..d1a9f8d49 100644
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___

 #                             \___|\___/|_| \_\_____|

 #

-# Copyright (C) 1999 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.

+# Copyright (C) 1999 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.

 #

 # This software is licensed as described in the file COPYING, which

 # you should have received as part of this distribution. The terms

@@ -18,7 +18,6 @@
 # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY

 # KIND, either express or implied.

 #

-# $Id: Makefile.am,v 1.139 2008-11-03 08:50:58 bagder Exp $

 ###########################################################################

 #

 # Makefile for building libcurl with MSVC6

@@ -101,7 +100,7 @@ LFLAGS     = /nologo /machine:$(MACHINE)
 SSLLIBS    = libeay32.lib ssleay32.lib

 ZLIBLIBSDLL= zdll.lib

 ZLIBLIBS   = zlib.lib

-WINLIBS    = wsock32.lib wldap32.lib

+WINLIBS    = ws2_32.lib wldap32.lib

 CFLAGS     = $(CFLAGS)

 

 CFGSET     = FALSE

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index a906967c5..8384834f0 100644
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -1,5 +1,4 @@
 #############################################################

-# $Id: Makefile.vc6,v 1.19 2004/11/14 13:48:15 giva Exp $

 #

 ## Makefile for building curl.exe with MSVC6

 ## Use: nmake -f makefile.vc6 [release | debug] [CFG=release-ssl]

@@ -225,8 +224,8 @@ LFLAGS         = $(LFLAGS) $(SSL_IMP_LFLAGS) $(ZLIB_LFLAGS)
 !ENDIF

 

 

-LINKLIBS       = $(LINKLIBS) wsock32.lib wldap32.lib

-LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) wsock32.lib wldap32.lib

+LINKLIBS       = $(LINKLIBS) ws2_32.lib wldap32.lib

+LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) ws2_32.lib wldap32.lib

 

 all : release