From 8223972af2dd1245d0a37b47c7eb31a021982fe8 Mon Sep 17 00:00:00 2001
From: Steve Holme <steve_holme@hotmail.com>
Date: Fri, 6 Jun 2014 14:09:59 +0100
Subject: winbuild: Don't USE_WINSSL when WITH_SSL is being used

Regression of commit d39bbcfa8d when compiling against OpenSSL.
---
 winbuild/Makefile.vc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'winbuild')

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"
-- 
cgit v1.2.3