From dab569d76c5bb89c72a1bdf9ab19896b9d34170b Mon Sep 17 00:00:00 2001 From: Gunter Knauf Date: Sun, 15 Jul 2007 13:00:39 +0000 Subject: make users use the latest OpenSSL and Zlib libraries; added hint to compile with SSPI with MSVC6 without PSDK. --- lib/Makefile.vc6 | 11 +++++++---- src/Makefile.vc6 | 18 +++++++++++------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index 7684c4f00..a5f5b0126 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -1,4 +1,5 @@ ############################################################# +# $Id: Makefile.vc6,v 1.19 2004/11/14 13:48:15 giva Exp $ # # Makefile for building libcurl with MSVC6 # @@ -34,11 +35,11 @@ IMPLIB_NAME = libcurl_imp IMPLIB_NAME_DEBUG = libcurld_imp !IFNDEF OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.7e +OPENSSL_PATH = ../../openssl-0.9.8e !ENDIF !IFNDEF ZLIB_PATH -ZLIB_PATH = ../../zlib-1.2.1 +ZLIB_PATH = ../../zlib-1.2.3 !ENDIF !IFNDEF MACHINE @@ -47,8 +48,10 @@ MACHINE = X86 # USE_WINDOWS_SSPI uses windows libraries to allow NTLM authentication # without an openssl installation and offers the ability to authenticate -# using the "current logged in user". It does however require that the -# Windows SDK be installed. +# using the "current logged in user". Since at least with MSVC6 the sspi.h +# header is broken it is either required to install the Windows SDK, +# or to fix sspi.h with adding this define at the beginning of sspi.h: +# #define FreeCredentialHandle FreeCredentialsHandle # # If, for some reason the Windows SDK is installed but not installed # in the default location, you can specify WINDOWS_SDK_PATH. diff --git a/src/Makefile.vc6 b/src/Makefile.vc6 index b307b1513..ad13901e8 100644 --- a/src/Makefile.vc6 +++ b/src/Makefile.vc6 @@ -1,4 +1,4 @@ -######################################################## +############################################################# # $Id: Makefile.vc6,v 1.19 2004/11/14 13:48:15 giva Exp $ # ## Makefile for building curl.exe with MSVC6 @@ -10,17 +10,19 @@ ## Comments to: Troy Engel ## Updated by: Craig Davison ## release-ssl added by Miklos Nemeth -## winmm.lib added by Miklos Nemeth to support -## timeGetTime() in curlutil.c +## winmm.lib added by Miklos Nemeth to +## support timeGetTime() in curlutil.c +# +############################################################# PROGRAM_NAME = curl.exe !IFNDEF ZLIB_PATH -ZLIB_PATH = ../../zlib-1.2.1 +ZLIB_PATH = ../../zlib-1.2.3 !ENDIF !IFNDEF OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.7e +OPENSSL_PATH = ../../openssl-0.9.8e !ENDIF !IFNDEF MACHINE @@ -29,8 +31,10 @@ MACHINE = X86 # USE_WINDOWS_SSPI uses windows libraries to allow NTLM authentication # without an openssl installation and offers the ability to authenticate -# using the "current logged in user". It does however require that the -# Windows SDK be installed. +# using the "current logged in user". Since at least with MSVC6 the sspi.h +# header is broken it is either required to install the Windows SDK, +# or to fix sspi.h with adding this define at the beginning of sspi.h: +# #define FreeCredentialHandle FreeCredentialsHandle # # If, for some reason the Windows SDK is installed but not installed # in the default location, you can specify WINDOWS_SDK_PATH. -- cgit v1.2.3