From: Steve Holme Date: Fri, 6 Jun 2014 13:09:59 +0000 (+0100) Subject: winbuild: Don't USE_WINSSL when WITH_SSL is being used X-Git-Tag: upstream/7.37.1~131 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8223972af2dd1245d0a37b47c7eb31a021982fe8;p=platform%2Fupstream%2Fcurl.git winbuild: Don't USE_WINSSL when WITH_SSL is being used Regression of commit d39bbcfa8d when compiling against OpenSSL. --- diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index 16235de..90719a8 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"