diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2014-06-06 14:09:59 +0100 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2014-06-06 14:14:30 +0100 |
| commit | 8223972af2dd1245d0a37b47c7eb31a021982fe8 (patch) | |
| tree | b655349a002b5c5b083d6ab8c86e1977b4321f1d /winbuild | |
| parent | 2b2e8e0e4bcc598b638ad0be7067d76bd610bab1 (diff) | |
| download | curl-8223972af2dd1245d0a37b47c7eb31a021982fe8.tar.gz | |
winbuild: Don't USE_WINSSL when WITH_SSL is being used
Regression of commit d39bbcfa8d when compiling against OpenSSL.
Diffstat (limited to 'winbuild')
| -rw-r--r-- | winbuild/Makefile.vc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index 16235de05..90719a885 100644 --- a/winbuild/Makefile.vc +++ b/winbuild/Makefile.vc @@ -95,7 +95,11 @@ USE_SPNEGO = false !ENDIF
!IFNDEF ENABLE_WINSSL
+!IFDEF WITH_SSL
+USE_WINSSL = false
+!ELSE
USE_WINSSL = $(USE_SSPI)
+!ENDIF
!ELSEIF "$(ENABLE_WINSSL)"=="yes"
USE_WINSSL = true
!ELSEIF "$(ENABLE_WINSSL)"=="no"
|