From c45069bfbeb2085447e3fcf5a1b5831f76bf2cb3 Mon Sep 17 00:00:00 2001 From: Marc Hoersken Date: Mon, 11 Jun 2012 19:04:49 +0200 Subject: 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. --- winbuild/MakefileBuild.vc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'winbuild/MakefileBuild.vc') diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 92b4bbb0d..7063906d7 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -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 -- cgit v1.2.3