winbuild: Aligned USE_SSPI with other USE_x defines

Renamed external parameter USE_SSPI = yes/no to ENABLE_SSPI = yes/no.
Backwards compatible change: USE_SSPI can still be passed as external
parameter with yes/no value as long as ENABLE_SSPI is not given.

USE_x defines are passed around with true/false values internally,
USE_SSPI is now aligned to this approach, but still accepts external
values yes/no being passed, just like the other defines.

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 0bccc98..4cf7c44 100644 (file)
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -23,7 +23,7 @@ CFGSET=true
 !MESSAGE   WITH_SSL=<dll or static>     - Enable OpenSSL support, DLL or static\r
 !MESSAGE   WITH_ZLIB=<dll or static>    - Enable ZLib support, DLL or static\r
 !MESSAGE   WITH_SSH2=<dll or static>    - Enable LIbSSH2 support, DLL or static\r
-!MESSAGE   USE_SSPI=<yes or no>         - Enable SSPI support, default to yes\r
+!MESSAGE   ENABLE_SSPI=<yes or no>      - Enable SSPI support, default to yes\r
 !MESSAGE   ENABLE_IPV6=<yes or no>      - Enable IPV6, default to yes\r
 !MESSAGE   ENABLE_IDN=<yes or no>       - Wheter or not to use IDN Windows APIs. Requires Windows Vista or later.\r
 !MESSAGE                                  or to install http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815\r
@@ -45,9 +45,19 @@ CURL_OBJS=$(CURL_CFILES:hugehelp.c=)
 \r
 CURL_OBJS=$(CURL_OBJS:.c=.obj)\r
 \r
+\r
+# backwards compatible check for USE_SSPI\r
+!IFDEF USE_SSPI\r
+ENABLE_SSPI = $(USE_SSPI)\r
+!ENDIF\r
+\r
 # default options\r
-!IFNDEF USE_SSPI\r
+!IFNDEF ENABLE_SSPI\r
+USE_SSPI = true\r
+!ELSEIF "$(ENABLE_SSPI)"=="yes"\r
 USE_SSPI = true\r
+!ELSEIF "$(ENABLE_SSPI)"=="no"\r
+USE_SSPI = false\r
 !ENDIF\r
 \r
 !IFNDEF ENABLE_IPV6\r
@@ -152,6 +162,7 @@ $(MODE):
        @SET MACRO_NAME=CURL_OBJS\r
        @SET OUTFILE=CURL_OBJS.inc\r
        @gen_resp_file.bat $(CURL_OBJS)\r
+       @SET USE_SSPI=$(USE_SSPI)\r
        @SET USE_IPV6=$(USE_IPV6)\r
        @SET USE_IDN=$(USE_IDN)\r
        @SET USE_WINSSL=$(USE_WINSSL)\r

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 442e3c5..5791dee 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -155,17 +155,17 @@ USE_WINSSL  = true
 \r
 !IF "$(USE_WINSSL)"=="true"\r
 SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_SCHANNEL\r
-USE_SCHANNEL = true\r
-USE_SSPI     = yes\r
+USE_SSPI    = true\r
 !ENDIF\r
 \r
 \r
 !IFNDEF USE_SSPI\r
-USE_SSPI = yes\r
+USE_SSPI  = true\r
+!ELSEIF "$(USE_SSPI)"=="yes"\r
+USE_SSPI  = true\r
 !ENDIF\r
 \r
-!IF "$(USE_SSPI)"=="yes"\r
-USE_SSPI    = true\r
+!IF "$(USE_SSPI)"=="true"\r
 SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_WINDOWS_SSPI\r
 !ENDIF\r
 \r