From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 25 Sep 2001 07:55:19 +0000 (+0000)
Subject: winsock 2 fixes
X-Git-Tag: curl-7_9_1~162
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d16b2b119929310da830a7b8ad19b1bbc41031d;p=thirdparty%2Fcurl.git

winsock 2 fixes
---

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 367ff95222..c892a351e8 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -1,5 +1,4 @@
 #############################################################
-# $Id$
 #
 ## Makefile for building libcurl.a with MingW32 (GCC-2.95) and
 ## optionally OpenSSL (0.9.6)
@@ -12,7 +11,7 @@ CC = gcc
 AR = ar
 RANLIB = ranlib
 STRIP = strip -g
-OPENSSL_PATH = ../../openssl-0.9.6
+OPENSSL_PATH = ../../openssl-0.9.6b
 
 ########################################################
 ## Nothing more to do below this line!
@@ -62,7 +61,7 @@ libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
 
 libcurl.dll libcurldll.a: libcurl.a libcurl.def dllinit.o
 	-@erase $@
-	dllwrap --dllname $@ --output-lib libcurldll.a --export-all --def libcurl.def $(libcurl_a_LIBRARIES) dllinit.o -L$(OPENSSL_PATH)/out $(DLL_LIBS) -lwsock32
+	dllwrap --dllname $@ --output-lib libcurldll.a --export-all --def libcurl.def $(libcurl_a_LIBRARIES) dllinit.o -L$(OPENSSL_PATH)/out $(DLL_LIBS) -lwsock32 -lws2_32
 	$(STRIP) $@
 
 # remove the last line above to keep debug info
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index e840d12a29..aadf4246d1 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -11,7 +11,7 @@
 
 CC = gcc
 STRIP = strip -s
-OPENSSL_PATH = ../../openssl-0.9.6
+OPENSSL_PATH = ../../openssl-0.9.6b
 
 # We may need these someday
 # PERL = perl
@@ -36,7 +36,7 @@ else
   curl_DEPENDENCIES = ../lib/libcurl.a
   curl_LDADD = -L../lib -lcurl
 endif
-curl_LDADD += -lwsock32
+curl_LDADD += -lwsock32 -lws2_32
 ifdef SSL
   curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32 -lRSAglue
 endif