projects
/
platform
/
upstream
/
curl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2b2e8e0
)
winbuild: Don't USE_WINSSL when WITH_SSL is being used
author
Steve Holme
<steve_holme@hotmail.com>
Fri, 6 Jun 2014 13:09:59 +0000
(14:09 +0100)
committer
Steve Holme
<steve_holme@hotmail.com>
Fri, 6 Jun 2014 13:14:30 +0000
(14:14 +0100)
Regression of commit
d39bbcfa8d
when compiling against OpenSSL.
winbuild/Makefile.vc
patch
|
blob
|
history
diff --git
a/winbuild/Makefile.vc
b/winbuild/Makefile.vc
index
16235de
..
90719a8
100644
(file)
--- a/
winbuild/Makefile.vc
+++ b/
winbuild/Makefile.vc
@@
-95,7
+95,11
@@
USE_SPNEGO = false
!ENDIF
\r
\r
!IFNDEF ENABLE_WINSSL
\r
+!IFDEF WITH_SSL
\r
+USE_WINSSL = false
\r
+!ELSE
\r
USE_WINSSL = $(USE_SSPI)
\r
+!ENDIF
\r
!ELSEIF "$(ENABLE_WINSSL)"=="yes"
\r
USE_WINSSL = true
\r
!ELSEIF "$(ENABLE_WINSSL)"=="no"
\r