moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

winbuild: Removed WITH_SSL=schannel and tie schannel to SSPI 

Removed specific WITH_SSL=schannel paramter that did not fit the general
schema and complicated the parameters. For now Schannel will be enabled
if SSPI is enabled and OpenSSL is disabled.
This commit is contained in:
Marc Hoersken 2012-06-11 19:04:49 +02:00 committed by Daniel Stenberg
parent 9a51c11074
commit c45069bfbe
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winbuild/Makefile.vc
View File

@ -73,10 +73,6 @@ SSL = dll
!ELSEIF "$(WITH_SSL)"=="static" !ELSEIF "$(WITH_SSL)"=="static"
USE_SSL = true USE_SSL = true
SSL = static SSL = static
!ELSEIF "$(WITH_SSL)"=="schannel"
USE_SSL = true
USE_SSPI = true
SSL = schannel
!ENDIF !ENDIF
!IF "$(WITH_ZLIB)"=="dll" !IF "$(WITH_ZLIB)"=="dll"

14
winbuild/MakefileBuild.vc
View File

@ -97,19 +97,16 @@ LFLAGS = $(LFLAGS) "/LIBPATH:$(DEVEL_LIB)"
!IF "$(WITH_SSL)"=="dll" !IF "$(WITH_SSL)"=="dll"
SSL_LIBS = libeay32.lib ssleay32.lib SSL_LIBS = libeay32.lib ssleay32.lib
SSL_CFLAGS = /DUSE_SSLEAY /I"$(DEVEL_INCLUDE)/openssl"
USE_SSL = true USE_SSL = true
SSL = dll SSL = dll
!ELSEIF "$(WITH_SSL)"=="static" !ELSEIF "$(WITH_SSL)"=="static"
SSL_LIBS = libeay32.lib ssleay32.lib gdi32.lib user32.lib advapi32.lib SSL_LIBS = libeay32.lib ssleay32.lib gdi32.lib user32.lib advapi32.lib
SSL_CFLAGS = /DUSE_SSLEAY /I"$(DEVEL_INCLUDE)/openssl"
USE_SSL = true USE_SSL = true
SSL = static SSL = static
!ELSEIF "$(WITH_SSL)"=="schannel" !ENDIF
USE_SSL = true
USE_SSPI = yes !IFDEF USE_SSL
SSL_CFLAGS = /DUSE_SSL /DUSE_SCHANNEL SSL_CFLAGS = /DUSE_SSLEAY /I"$(DEVEL_INCLUDE)/openssl"
SSL = schannel
!ENDIF !ENDIF
@ -154,6 +151,9 @@ USE_SSPI = yes
CFLAGS_SSPI = /DUSE_WINDOWS_SSPI CFLAGS_SSPI = /DUSE_WINDOWS_SSPI
LFLAGS_SSPI = version.lib LFLAGS_SSPI = version.lib
USE_SSPI = true USE_SSPI = true
!IFNDEF USE_SSL
CFLAGS_SSPI = $(CFLAGS_SSPI) /DUSE_SCHANNEL
!ENDIF
!ENDIF !ENDIF