winsock 2 fixes

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 367ff95222d3910468fac41f9e1d1fe41984060d..c892a351e8fd9359ecf0f47d7556106fad8dd70d 100644 (file)
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -1,5 +1,4 @@
 #############################################################\r
-# $Id$\r
 #\r
 ## Makefile for building libcurl.a with MingW32 (GCC-2.95) and\r
 ## optionally OpenSSL (0.9.6)\r
@@ -12,7 +11,7 @@ CC = gcc
 AR = ar\r
 RANLIB = ranlib\r
 STRIP = strip -g\r
-OPENSSL_PATH = ../../openssl-0.9.6\r
+OPENSSL_PATH = ../../openssl-0.9.6b\r
 \r
 ########################################################\r
 ## Nothing more to do below this line!\r
@@ -62,7 +61,7 @@ libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
 \r
 libcurl.dll libcurldll.a: libcurl.a libcurl.def dllinit.o\r
        -@erase $@\r
-       dllwrap --dllname $@ --output-lib libcurldll.a --export-all --def libcurl.def $(libcurl_a_LIBRARIES) dllinit.o -L$(OPENSSL_PATH)/out $(DLL_LIBS) -lwsock32\r
+       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\r
        $(STRIP) $@\r
 \r
 # remove the last line above to keep debug info\r

diff --git a/src/Makefile.m32 b/src/Makefile.m32
index e840d12a295b9168f818ba1250af5c1e91ce6c59..aadf4246d1eb404abb4da56bc15ae6f088ce74ca 100644 (file)
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -11,7 +11,7 @@
 \r
 CC = gcc\r
 STRIP = strip -s\r
-OPENSSL_PATH = ../../openssl-0.9.6\r
+OPENSSL_PATH = ../../openssl-0.9.6b\r
 \r
 # We may need these someday\r
 # PERL = perl\r
@@ -36,7 +36,7 @@ else
   curl_DEPENDENCIES = ../lib/libcurl.a\r
   curl_LDADD = -L../lib -lcurl\r
 endif\r
-curl_LDADD += -lwsock32\r
+curl_LDADD += -lwsock32 -lws2_32\r
 ifdef SSL\r
   curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32 -lRSAglue\r
 endif\r