make users use the latest OpenSSL and Zlib libraries;

added hint to compile with SSPI with MSVC6 without PSDK.

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 7684c4f0031e580cba7942376921b65d1c64a039..a5f5b01260acd66d4b63f091e73fd2eb0325b2f4 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -1,4 +1,5 @@
 #############################################################\r
+# $Id: Makefile.vc6,v 1.19 2004/11/14 13:48:15 giva Exp $\r
 #\r
 # Makefile for building libcurl with MSVC6\r
 #\r
@@ -34,11 +35,11 @@ IMPLIB_NAME       = libcurl_imp
 IMPLIB_NAME_DEBUG = libcurld_imp\r
 \r
 !IFNDEF OPENSSL_PATH\r
-OPENSSL_PATH   = ../../openssl-0.9.7e\r
+OPENSSL_PATH   = ../../openssl-0.9.8e\r
 !ENDIF\r
 \r
 !IFNDEF ZLIB_PATH\r
-ZLIB_PATH  = ../../zlib-1.2.1\r
+ZLIB_PATH  = ../../zlib-1.2.3\r
 !ENDIF\r
 \r
 !IFNDEF MACHINE\r
@@ -47,8 +48,10 @@ MACHINE  = X86
 \r
 # USE_WINDOWS_SSPI uses windows libraries to allow NTLM authentication\r
 # without an openssl installation and offers the ability to authenticate\r
-# using the "current logged in user".  It does however require that the\r
-# Windows SDK be installed.\r
+# using the "current logged in user". Since at least with MSVC6 the sspi.h\r
+# header is broken it is either required to install the Windows SDK,\r
+# or to fix sspi.h with adding this define at the beginning of sspi.h:\r
+# #define FreeCredentialHandle FreeCredentialsHandle\r
 #\r
 # If, for some reason the Windows SDK is installed but not installed\r
 # in the default location, you can specify WINDOWS_SDK_PATH.\r

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index b307b151353ab8fd73482cffcc20a7b6d22e8ca8..ad13901e84fe50b71b7565eef9f7f7f190609ee5 100644 (file)
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -1,4 +1,4 @@
-########################################################\r
+#############################################################\r
 # $Id: Makefile.vc6,v 1.19 2004/11/14 13:48:15 giva Exp $\r
 #\r
 ## Makefile for building curl.exe with MSVC6\r
@@ -10,17 +10,19 @@
 ## Comments to: Troy Engel <tengel@sonic.net>\r
 ## Updated by: Craig Davison <cd@securityfocus.com>\r
 ## release-ssl added by Miklos Nemeth <mnemeth@kfkisystems.com>\r
-## winmm.lib added by Miklos Nemeth <mnemeth@kfkisystems.com> to support\r
-## timeGetTime() in curlutil.c\r
+## winmm.lib added by Miklos Nemeth <mnemeth@kfkisystems.com> to\r
+## support timeGetTime() in curlutil.c\r
+#\r
+#############################################################\r
 \r
 PROGRAM_NAME = curl.exe\r
 \r
 !IFNDEF ZLIB_PATH\r
-ZLIB_PATH = ../../zlib-1.2.1\r
+ZLIB_PATH = ../../zlib-1.2.3\r
 !ENDIF\r
 \r
 !IFNDEF OPENSSL_PATH\r
-OPENSSL_PATH = ../../openssl-0.9.7e\r
+OPENSSL_PATH = ../../openssl-0.9.8e\r
 !ENDIF\r
 \r
 !IFNDEF MACHINE\r
@@ -29,8 +31,10 @@ MACHINE  = X86
 \r
 # USE_WINDOWS_SSPI uses windows libraries to allow NTLM authentication\r
 # without an openssl installation and offers the ability to authenticate\r
-# using the "current logged in user".  It does however require that the\r
-# Windows SDK be installed.\r
+# using the "current logged in user". Since at least with MSVC6 the sspi.h\r
+# header is broken it is either required to install the Windows SDK,\r
+# or to fix sspi.h with adding this define at the beginning of sspi.h:\r
+# #define FreeCredentialHandle FreeCredentialsHandle\r
 #\r
 # If, for some reason the Windows SDK is installed but not installed\r
 # in the default location, you can specify WINDOWS_SDK_PATH.\r