winbuild: Make USE_WINSSL depend on USE_SSPI

Since WinSSL cannot be build without SSPI being enabled,
USE_WINSSL now defaults to the value of USE_SSPI.

The makefile does now raise an error if WinSSL is enabled
while SSPI is disabled.

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 4cf7c448020af093001f46b6b7fc0be8f41d0aa2..a75747877d6344b8f32cdad77b547a8fdd66831b 100644 (file)
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -77,7 +77,7 @@ USE_IDN = false
 !ENDIF\r
 \r
 !IFNDEF ENABLE_WINSSL\r
-USE_WINSSL = true\r
+USE_WINSSL = $(USE_SSPI)\r
 !ELSEIF "$(ENABLE_WINSSL)"=="yes"\r
 USE_WINSSL = true\r
 !ELSEIF "$(ENABLE_WINSSL)"=="no"\r

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 5791dee030939b6cf8ef5a7b50eb1e7a9335717a..5ec638f853783947ee8c001b6be350b405b335a7 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -143,22 +143,6 @@ SSH2_CFLAGS = $(SSH2_CFLAGS) /I$(WITH_DEVEL)/include/libssh2
 !ENDIF\r
 \r
 \r
-!IFNDEF USE_WINSSL\r
-!IF "$(USE_SSL)"=="true"\r
-USE_WINSSL  = false\r
-!ELSE\r
-USE_WINSSL  = true\r
-!ENDIF\r
-!ELSEIF "$(USE_WINSSL)"=="yes"\r
-USE_WINSSL  = true\r
-!ENDIF\r
-\r
-!IF "$(USE_WINSSL)"=="true"\r
-SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_SCHANNEL\r
-USE_SSPI    = true\r
-!ENDIF\r
-\r
-\r
 !IFNDEF USE_SSPI\r
 USE_SSPI  = true\r
 !ELSEIF "$(USE_SSPI)"=="yes"\r
@@ -193,6 +177,24 @@ LFLAGS    = $(LFLAGS) Normaliz.lib
 !ENDIF\r
 \r
 \r
+!IFNDEF USE_WINSSL\r
+!IF "$(USE_SSL)"=="true"\r
+USE_WINSSL  = false\r
+!ELSE\r
+USE_WINSSL  = $(USE_SSPI)\r
+!ENDIF\r
+!ELSEIF "$(USE_WINSSL)"=="yes"\r
+USE_WINSSL  = true\r
+!ENDIF\r
+\r
+!IF "$(USE_WINSSL)"=="true"\r
+!IF "$(USE_SSPI)"!="true"\r
+!ERROR cannot build with WinSSL without SSPI\r
+!ENDIF\r
+SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_SCHANNEL\r
+!ENDIF\r
+\r
+\r
 \r
 !IF "$(GEN_PDB)"=="yes"\r
 GEN_PDB = true\r