summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-E <github@ehrhardt.nl>2016-05-19 22:35:50 +0200
committerDaniel Stenberg <daniel@haxx.se>2016-05-20 16:41:59 +0200
commit6bdc6092a0609d5681e6dcf757cb025719d71a04 (patch)
tree99b5306e9e3e3cb442d733dd56c69a8637e83dea
parentfd8d2a0f63ae3c16f8de58c7a059a706b528271a (diff)
downloadcurl-6bdc6092a0609d5681e6dcf757cb025719d71a04.tar.gz
winbuild/Makefile.vc: Fix check on SSL, MBEDTLS, WINSSL exclusivity
Closes #818
-rw-r--r--winbuild/Makefile.vc10
1 files changed, 6 insertions, 4 deletions
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 9e1eb07d0..bd5c8e032 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