Commit c45069bf authored by Marc Hoersken's avatar Marc Hoersken Committed by Daniel Stenberg
Browse files

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.
parent 9a51c110

winbuild/Makefile.vc

+0 −4
Original line number Diff line number Diff line
@@ -73,10 +73,6 @@ SSL = dll 
!ELSEIF "$(WITH_SSL)"=="static"

USE_SSL = true

SSL     = static

!ELSEIF "$(WITH_SSL)"=="schannel"

USE_SSL      = true

USE_SSPI     = true

SSL          = schannel

!ENDIF



!IF "$(WITH_ZLIB)"=="dll"

winbuild/MakefileBuild.vc

+7 −7
Original line number Diff line number Diff line
@@ -97,19 +97,16 @@ LFLAGS = $(LFLAGS) "/LIBPATH:$(DEVEL_LIB)" 


!IF "$(WITH_SSL)"=="dll"

SSL_LIBS     = libeay32.lib ssleay32.lib

SSL_CFLAGS   = /DUSE_SSLEAY /I"$(DEVEL_INCLUDE)/openssl"

USE_SSL      = true

SSL          = dll

!ELSEIF "$(WITH_SSL)"=="static"

SSL_LIBS     = libeay32.lib ssleay32.lib gdi32.lib user32.lib advapi32.lib

SSL_CFLAGS   = /DUSE_SSLEAY /I"$(DEVEL_INCLUDE)/openssl"

USE_SSL      = true

SSL          = static

!ELSEIF "$(WITH_SSL)"=="schannel"

USE_SSL      = true

USE_SSPI     = yes

SSL_CFLAGS   = /DUSE_SSL /DUSE_SCHANNEL

SSL          = schannel

!ENDIF



!IFDEF USE_SSL

SSL_CFLAGS   = /DUSE_SSLEAY /I"$(DEVEL_INCLUDE)/openssl"

!ENDIF
@@ -154,6 +151,9 @@ USE_SSPI = yes 
CFLAGS_SSPI = /DUSE_WINDOWS_SSPI

LFLAGS_SSPI = version.lib

USE_SSPI    = true

!IFNDEF USE_SSL

CFLAGS_SSPI = $(CFLAGS_SSPI) /DUSE_SCHANNEL

!ENDIF

!ENDIF