winbuild: Added support for building with SPNEGO enabled

Since Simple and Protected GSSAPI Negotiation Mechanism
is already implemented in curl and supported by the MinGW
builds, this change adds build support to winbuild makefiles.

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index e61ee92..137be21 100644 (file)
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -28,6 +28,7 @@ CFGSET=true
 !MESSAGE                                  http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815\r
 !MESSAGE   ENABLE_IPV6=<yes or no>      - Enable IPv6, defaults to yes\r
 !MESSAGE   ENABLE_SSPI=<yes or no>      - Enable SSPI support, defaults to yes\r
+!MESSAGE   ENABLE_SPNEGO=<yes or no>    - Enable Simple and Protected GSSAPI Negotiation Mechanism, defaults to yes\r
 !MESSAGE   ENABLE_WINSSL=<yes or no>    - Enable native Windows SSL support, defaults to yes\r
 !MESSAGE   GEN_PDB=<yes or no>          - Generate Program Database (debug symbols for release build)\r
 !MESSAGE   DEBUG=<yes or no>            - Debug builds\r
@@ -77,6 +78,14 @@ USE_SSPI = true
 USE_SSPI = false\r
 !ENDIF\r
 \r
+!IFNDEF ENABLE_SPNEGO\r
+USE_SPNEGO = true\r
+!ELSEIF "$(ENABLE_SPNEGO)"=="yes"\r
+USE_SPNEGO = true\r
+!ELSEIF "$(ENABLE_SPNEGO)"=="no"\r
+USE_SPNEGO = false\r
+!ENDIF\r
+\r
 !IFNDEF ENABLE_WINSSL\r
 USE_WINSSL = $(USE_SSPI)\r
 !ELSEIF "$(ENABLE_WINSSL)"=="yes"\r
@@ -143,6 +152,10 @@ CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ipv6
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi\r
 !ENDIF\r
 \r
+!IF "$(USE_SPNEGO)"=="true"\r
+CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-spnego\r
+!ENDIF\r
+\r
 !IF "$(USE_WINSSL)"=="true"\r
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-winssl\r
 !ENDIF\r
@@ -166,6 +179,7 @@ $(MODE):
        @SET USE_IDN=$(USE_IDN)\r
        @SET USE_IPV6=$(USE_IPV6)\r
        @SET USE_SSPI=$(USE_SSPI)\r
+       @SET USE_SPNEGO=$(USE_SPNEGO)\r
        @SET USE_WINSSL=$(USE_WINSSL)\r
        @$(MAKE) /NOLOGO /F MakefileBuild.vc\r
 \r

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 218b7c9..de23e1a 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -177,6 +177,17 @@ SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_WINDOWS_SSPI
 !ENDIF\r
 \r
 \r
+!IFNDEF USE_SPNEGO\r
+USE_SPNEGO  = true\r
+!ELSEIF "$(USE_SPNEGO)"=="yes"\r
+USE_SPNEGO  = true\r
+!ENDIF\r
+\r
+!IF "$(USE_SPNEGO)"=="true"\r
+SPNEGO_CFLAGS = $(SPNEGO_CFLAGS) /DHAVE_SPNEGO\r
+!ENDIF\r
+\r
+\r
 !IFNDEF USE_WINSSL\r
 !IF "$(USE_SSL)"=="true"\r
 USE_WINSSL  = false\r
@@ -314,6 +325,11 @@ CFLAGS = $(CFLAGS) $(SSPI_CFLAGS)
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi\r
 !ENDIF\r
 \r
+!IF "$(USE_SPNEGO)"=="true"\r
+CFLAGS = $(CFLAGS) $(SPNEGO_CFLAGS)\r
+CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-spnego\r
+!ENDIF\r
+\r
 !IF "$(USE_WINSSL)"=="true"\r
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-winssl\r
 !ENDIF\r
@@ -375,6 +391,7 @@ $(TARGET): $(LIB_OBJS) $(LIB_DIROBJ) $(DISTDIR)
        @echo Using IDN:  $(USE_IDN)\r
        @echo Using IPv6: $(USE_IPV6)\r
        @echo Using SSPI: $(USE_SSPI)\r
+       @echo Using SPNEGO: $(USE_SPNEGO)\r
        @echo Using WinSSL: $(USE_WINSSL)\r
        @echo CFLAGS:     $(CFLAGS)\r
        @echo LFLAGS:     $(LFLAGS)\r