moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-10 11:35:07 -05:00
Code Issues Releases Wiki Activity

winbuild: Aligned USE_SSPI with other USE_x defines

Browse Source 
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.
This commit is contained in:
Marc Hoersken 2012-07-05 08:49:45 +02:00
parent aeca33f96c
commit 86871577d9
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
winbuild/Makefile.vc
View File

@ -23,7 +23,7 @@ CFGSET=true
!MESSAGE WITH_SSL=<dll or static> - Enable OpenSSL support, DLL or static !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_ZLIB=<dll or static> - Enable ZLib support, DLL or static
!MESSAGE WITH_SSH2=<dll or static> - Enable LIbSSH2 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_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 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 !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) CURL_OBJS=$(CURL_OBJS:.c=.obj)
# backwards compatible check for USE_SSPI
!IFDEF USE_SSPI
ENABLE_SSPI = $(USE_SSPI)
!ENDIF
# default options # default options
!IFNDEF USE_SSPI !IFNDEF ENABLE_SSPI
USE_SSPI = true USE_SSPI = true
!ELSEIF "$(ENABLE_SSPI)"=="yes"
USE_SSPI = true
!ELSEIF "$(ENABLE_SSPI)"=="no"
USE_SSPI = false
!ENDIF !ENDIF
!IFNDEF ENABLE_IPV6 !IFNDEF ENABLE_IPV6
@ -152,6 +162,7 @@ $(MODE):
@SET MACRO_NAME=CURL_OBJS @SET MACRO_NAME=CURL_OBJS
@SET OUTFILE=CURL_OBJS.inc @SET OUTFILE=CURL_OBJS.inc
@gen_resp_file.bat $(CURL_OBJS) @gen_resp_file.bat $(CURL_OBJS)
@SET USE_SSPI=$(USE_SSPI)
@SET USE_IPV6=$(USE_IPV6) @SET USE_IPV6=$(USE_IPV6)
@SET USE_IDN=$(USE_IDN) @SET USE_IDN=$(USE_IDN)
@SET USE_WINSSL=$(USE_WINSSL) @SET USE_WINSSL=$(USE_WINSSL)

10
winbuild/MakefileBuild.vc
View File

@ -155,17 +155,17 @@ USE_WINSSL = true
!IF "$(USE_WINSSL)"=="true" !IF "$(USE_WINSSL)"=="true"
SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_SCHANNEL SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_SCHANNEL
USE_SCHANNEL = true USE_SSPI = true
USE_SSPI = yes
!ENDIF !ENDIF
!IFNDEF USE_SSPI !IFNDEF USE_SSPI
USE_SSPI = yes USE_SSPI = true
!ELSEIF "$(USE_SSPI)"=="yes"
USE_SSPI = true
!ENDIF !ENDIF
!IF "$(USE_SSPI)"=="yes" !IF "$(USE_SSPI)"=="true"
USE_SSPI = true
SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_WINDOWS_SSPI SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_WINDOWS_SSPI
!ENDIF !ENDIF