diff options
| author | Yang Tse <yangsita@gmail.com> | 2012-06-13 15:53:51 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2012-06-13 16:42:48 +0200 |
| commit | 819afe46eeab2c7fa4738e4d77fa2a79a7bb8ebe (patch) | |
| tree | 14bb997f237faf1249737cd0580fda083bdab5e9 /winbuild | |
| parent | c13af843727c06ffec1031129ec5c30dfcd5066e (diff) | |
schannel: remove version number and identify its use with 'schannel' literal
Version number is removed in order to make this info consistent with
how we do it with other MS and Linux system libraries for which we don't
provide this info.
Identifier changed from 'WinSSPI' to 'schannel' given that this is the
actual provider of the SSL/TLS support. libcurl can still be built with
SSPI and without SCHANNEL support.
Diffstat (limited to 'winbuild')
| -rw-r--r-- | winbuild/MakefileBuild.vc | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 7063906d7..9569ed9e7 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -143,17 +143,19 @@ SSH2_CFLAGS = $(SSH2_CFLAGS) /I$(WITH_DEVEL)/include/libssh2 !ENDIF +!IFNDEF USE_SSL +CFLAGS_SSPI = /DUSE_SCHANNEL +USE_SCHANNEL = true +USE_SSPI = yes +!ENDIF + !IFNDEF USE_SSPI USE_SSPI = yes !ENDIF !IF "$(USE_SSPI)"=="yes" -CFLAGS_SSPI = /DUSE_WINDOWS_SSPI -LFLAGS_SSPI = version.lib +CFLAGS_SSPI = $(CFLAGS_SSPI) /DUSE_WINDOWS_SSPI USE_SSPI = true -!IFNDEF USE_SSL -CFLAGS_SSPI = $(CFLAGS_SSPI) /DUSE_SCHANNEL -!ENDIF !ENDIF @@ -296,9 +298,12 @@ CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ipv6 !IF "$(USE_SSPI)"=="true" CFLAGS = $(CFLAGS) $(CFLAGS_SSPI) -LFLAGS = $(LFLAGS) $(LFLAGS_SSPI) +!IF "$(USE_SCHANNEL)"=="true" +CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi-schannel +!ELSE CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi !ENDIF +!ENDIF !IF "$(GEN_PDB)"=="true" CFLAGS = $(CFLAGS) $(CFLAGS_PDB) |