aboutsummaryrefslogtreecommitdiff
path: root/winbuild
diff options
context:
space:
mode:
authorMarc Hoersken <info@marc-hoersken.de>2012-06-11 19:04:49 +0200
committerDaniel Stenberg <daniel@haxx.se>2012-06-11 19:04:49 +0200
commitc45069bfbeb2085447e3fcf5a1b5831f76bf2cb3 (patch)
treec15e9bbc1b42f1f86f74980cf2fcced8bbea3839 /winbuild
parent9a51c1107470af5ea43d4e40ea4884f8db6781dc (diff)
winbuild: Removed WITH_SSL=schannel and tie schannel to SSPI
Removed specific WITH_SSL=schannel paramter that did not fit the general schema and complicated the parameters. For now Schannel will be enabled if SSPI is enabled and OpenSSL is disabled.
Diffstat (limited to 'winbuild')
-rw-r--r--winbuild/Makefile.vc4
-rw-r--r--winbuild/MakefileBuild.vc14
2 files changed, 7 insertions, 11 deletions
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index a35e9beab..a45e4ee56 100644
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -73,10 +73,6 @@ SSL = dll
!ELSEIF "$(WITH_SSL)"=="static"
USE_SSL = true
SSL = static
-!ELSEIF "$(WITH_SSL)"=="schannel"
-USE_SSL = true
-USE_SSPI = true
-SSL = schannel
!ENDIF
!IF "$(WITH_ZLIB)"=="dll"
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 92b4bbb0d..7063906d7 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -97,19 +97,16 @@ LFLAGS = $(LFLAGS) "/LIBPATH:$(DEVEL_LIB)"
!IF "$(WITH_SSL)"=="dll"
SSL_LIBS = libeay32.lib ssleay32.lib
-SSL_CFLAGS = /DUSE_SSLEAY /I"$(DEVEL_INCLUDE)/openssl"
USE_SSL = true
SSL = dll
!ELSEIF "$(WITH_SSL)"=="static"
SSL_LIBS = libeay32.lib ssleay32.lib gdi32.lib user32.lib advapi32.lib
-SSL_CFLAGS = /DUSE_SSLEAY /I"$(DEVEL_INCLUDE)/openssl"
USE_SSL = true
SSL = static
-!ELSEIF "$(WITH_SSL)"=="schannel"
-USE_SSL = true
-USE_SSPI = yes
-SSL_CFLAGS = /DUSE_SSL /DUSE_SCHANNEL
-SSL = schannel
+!ENDIF
+
+!IFDEF USE_SSL
+SSL_CFLAGS = /DUSE_SSLEAY /I"$(DEVEL_INCLUDE)/openssl"
!ENDIF
@@ -154,6 +151,9 @@ USE_SSPI = yes
CFLAGS_SSPI = /DUSE_WINDOWS_SSPI
LFLAGS_SSPI = version.lib
USE_SSPI = true
+!IFNDEF USE_SSL
+CFLAGS_SSPI = $(CFLAGS_SSPI) /DUSE_SCHANNEL
+!ENDIF
!ENDIF