From: Jan-E <github@ehrhardt.nl>
Date: Thu, 19 May 2016 20:35:50 +0000 (+0200)
Subject: winbuild/Makefile.vc: Fix check on SSL, MBEDTLS, WINSSL exclusivity
X-Git-Tag: curl-7_49_1~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bdc6092a0609d5681e6dcf757cb025719d71a04;p=thirdparty%2Fcurl.git

winbuild/Makefile.vc: Fix check on SSL, MBEDTLS, WINSSL exclusivity

Closes #818
---

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 9e1eb07d0a..bd5c8e0323 100644
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -38,10 +38,6 @@ CFGSET=true
 
 !ENDIF
 
-!IF DEFINED(WITH_SSL) && DEFINED(ENABLE_WINSSL) || DEFINED(WITH_SSL) && DEFINED(WITH_MBEDTLS) || DEFINED(WITH_MBEDTLS) && DEFINED(ENABLE_WINSSL)
-!ERROR WITH_SSL, WITH_MBEDTLS and ENABLE_WINSSL are mutual exclusive options.
-!ENDIF
-
 !INCLUDE "../lib/Makefile.inc"
 LIBCURL_OBJS=$(CSOURCES:.c=.obj)
 
@@ -118,6 +114,12 @@ USE_MBEDTLS = true
 MBEDTLS     = $(WITH_MBEDTLS)
 !ENDIF
 
+!IF ( "$(USE_SSL)"=="true" && "$(USE_WINSSL)"=="true" ) \
+ || ( "$(USE_SSL)"=="true" && "$(USE_MBEDTLS)"=="true" ) \
+ || ( "$(USE_MBEDTLS)"=="true" && "$(USE_WINSSL)"=="true" )
+!ERROR SSL, MBEDTLS and WINSSL are mutual exclusive options.
+!ENDIF
+
 !IF "$(WITH_CARES)"=="dll"
 USE_CARES = true
 CARES     = dll