diff options
| author | Marc Hoersken <info@marc-hoersken.de> | 2012-07-05 08:49:45 +0200 |
|---|---|---|
| committer | Marc Hoersken <info@marc-hoersken.de> | 2012-07-07 23:30:37 +0200 |
| commit | 86871577d966f2d197679dd7e9b5a024bec5a24f (patch) | |
| tree | c16187bba2163da4d5078ed463c311a9c851ce1b /winbuild | |
| parent | aeca33f96c7928eab38eddfe8eead3acbd99f83f (diff) | |
| download | curl-86871577d966f2d197679dd7e9b5a024bec5a24f.tar.gz | |
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.
Diffstat (limited to 'winbuild')
| -rw-r--r-- | winbuild/Makefile.vc | 15 | ||||
| -rw-r--r-- | winbuild/MakefileBuild.vc | 10 |
2 files changed, 18 insertions, 7 deletions
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index 0bccc9801..4cf7c4480 100644 --- 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
!MESSAGE WITH_ZLIB=<dll or static> - Enable ZLib support, DLL or static
!MESSAGE WITH_SSH2=<dll or static> - Enable LIbSSH2 support, DLL or static
-!MESSAGE USE_SSPI=<yes or no> - Enable SSPI support, default to yes
+!MESSAGE ENABLE_SSPI=<yes or no> - Enable SSPI support, default to yes
!MESSAGE ENABLE_IPV6=<yes or no> - Enable IPV6, default to yes
!MESSAGE ENABLE_IDN=<yes or no> - Wheter or not to use IDN Windows APIs. Requires Windows Vista or later.
!MESSAGE or to install http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815
@@ -45,9 +45,19 @@ CURL_OBJS=$(CURL_CFILES:hugehelp.c=) CURL_OBJS=$(CURL_OBJS:.c=.obj)
+
+# backwards compatible check for USE_SSPI
+!IFDEF USE_SSPI
+ENABLE_SSPI = $(USE_SSPI)
+!ENDIF
+
# default options
-!IFNDEF USE_SSPI
+!IFNDEF ENABLE_SSPI
+USE_SSPI = true
+!ELSEIF "$(ENABLE_SSPI)"=="yes"
USE_SSPI = true
+!ELSEIF "$(ENABLE_SSPI)"=="no"
+USE_SSPI = false
!ENDIF
!IFNDEF ENABLE_IPV6
@@ -152,6 +162,7 @@ $(MODE): @SET MACRO_NAME=CURL_OBJS
@SET OUTFILE=CURL_OBJS.inc
@gen_resp_file.bat $(CURL_OBJS)
+ @SET USE_SSPI=$(USE_SSPI)
@SET USE_IPV6=$(USE_IPV6)
@SET USE_IDN=$(USE_IDN)
@SET USE_WINSSL=$(USE_WINSSL)
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 442e3c578..5791dee03 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -155,17 +155,17 @@ USE_WINSSL = true !IF "$(USE_WINSSL)"=="true"
SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_SCHANNEL
-USE_SCHANNEL = true
-USE_SSPI = yes
+USE_SSPI = true
!ENDIF
!IFNDEF USE_SSPI
-USE_SSPI = yes
+USE_SSPI = true
+!ELSEIF "$(USE_SSPI)"=="yes"
+USE_SSPI = true
!ENDIF
-!IF "$(USE_SSPI)"=="yes"
-USE_SSPI = true
+!IF "$(USE_SSPI)"=="true"
SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_WINDOWS_SSPI
!ENDIF
|