From 2479e06848a7625b1b55511b43f86abc3a76c93d Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 3 Mar 2004 13:32:56 +0000
Subject: David Byron's work on making libcurl only require winsock 1.1 on
 Windows machines.

---
 src/Makefile.vc6 | 12 +++++++-----
 src/main.c       |  7 +++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index 392df671d..d0bf9153e 100644
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -30,8 +30,8 @@ ZLIB_PATH  = ../../zlib-1.1.4
 
 CFLAGS = /I "../lib" /I "../include" /I "$(ZLIB_PATH)" /nologo /W3 /GX /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 LFLAGS = /nologo /libpath:"$(ZLIB_PATH)" /out:$(PROGRAM_NAME) /subsystem:console /machine:I386
-LINKLIBS = ws2_32.lib libcurl.lib winmm.lib zlib.lib
-LINKLIBS_DEBUG = ws2_32.lib libcurld.lib winmm.lib zlib.lib
+LINKLIBS = wsock32.lib libcurl.lib winmm.lib zlib.lib
+LINKLIBS_DEBUG = wsock32.lib libcurld.lib winmm.lib zlib.lib
 
 RELEASE_OBJS= \
 	hugehelpr.obj \
@@ -58,6 +58,7 @@ OPENSSL_PATH   = ../../openssl-0.9.7a
 !ENDIF
 LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32"
 SSLLIBS   = libeay32.lib ssleay32.lib gdi32.lib 
+CFLAGS = $(CFLAGS) -DUSE_SSLEAY
 LINKLIBS  = $(LINKLIBS) $(SSLLIBS)
 LINKLIBS_DEBUG  = $(LINKLIBS_DEBUG) $(SSLLIBS)
 LFLAGS = $(LFLAGS) $(LFLAGSSSL)
@@ -100,12 +101,13 @@ maind.obj: main.c
 	$(CCD) $(CFLAGS) /Fo"$@" main.c
 
 clean:
-	-@erase homedir.obj
-	-@erase hugehelp.obj
-	-@erase main.obj
+	-@erase $(RELEASE_OBJS)
+	-@erase $(DEBUG_OBJS)
 	-@erase vc60.idb
 	-@erase vc60.pdb
 	-@erase vc60.pch
+	-@erase vc70.idb
+	-@erase vc70.pch
 	-@erase curl.ilk
 	-@erase curl.pdb
 
diff --git a/src/main.c b/src/main.c
index 2872fc78c..414db7ddb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2647,8 +2647,11 @@ operate(struct Configurable *config, int argc, char *argv[])
 
   errorbuffer[0]=0; /* prevent junk from being output */
 
-  main_init(); /* inits */
-
+  /* inits */
+  if (main_init() != CURLE_OK) {
+    helpf("error initializing curl library\n");
+    return CURLE_FAILED_INIT;
+  }
   config->showerror=TRUE;
   config->conf=CONF_DEFAULT;
   config->use_httpget=FALSE;
-- 
cgit v1.2.3