diff options
| author | Gunter Knauf <gk@gknw.de> | 2007-07-15 13:00:39 +0000 |
|---|---|---|
| committer | Gunter Knauf <gk@gknw.de> | 2007-07-15 13:00:39 +0000 |
| commit | dab569d76c5bb89c72a1bdf9ab19896b9d34170b (patch) | |
| tree | 4fe2c4d90fa219d40ac79c6bad4ffcacf440494f | |
| parent | 598c589359fc27cd7176e847c0b3670f6a394a1d (diff) | |
make users use the latest OpenSSL and Zlib libraries;
added hint to compile with SSPI with MSVC6 without PSDK.
| -rw-r--r-- | lib/Makefile.vc6 | 11 | ||||
| -rw-r--r-- | 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 <tengel@sonic.net>
## Updated by: Craig Davison <cd@securityfocus.com>
## release-ssl added by Miklos Nemeth <mnemeth@kfkisystems.com>
-## winmm.lib added by Miklos Nemeth <mnemeth@kfkisystems.com> to support
-## timeGetTime() in curlutil.c
+## winmm.lib added by Miklos Nemeth <mnemeth@kfkisystems.com> 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.
|