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.
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index a35e9be..a45e4ee 100644
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -73,10 +73,6 @@
!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"
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 92b4bbb..7063906 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -97,19 +97,16 @@
!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 @@
CFLAGS_SSPI = /DUSE_WINDOWS_SSPI
LFLAGS_SSPI = version.lib
USE_SSPI = true
+!IFNDEF USE_SSL
+CFLAGS_SSPI = $(CFLAGS_SSPI) /DUSE_SCHANNEL
+!ENDIF
!ENDIF
