From: Viktor Szakats <vszakats@users.noreply.github.com>
Date: Wed, 2 Mar 2016 02:00:37 +0000 (+0100)
Subject: makefile.m32: fix to allow -ssh2-winssl combination
X-Git-Tag: curl-7_48_0~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05401b9a3b14e3ecd647bd0624890805efc6c414;p=curl

makefile.m32: fix to allow -ssh2-winssl combination

In makefile.m32, option -ssh2 (libssh2) automatically implied -ssl
(OpenSSL) option, with no way to override it with -winssl. Since both
libssh2 and curl support using Windows's built-in SSL backend, modify
the logic to allow that combination.
---

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index eeb4311ba..b6d9eb09c 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -153,7 +153,9 @@ ZLIB = 1
 endif
 ifeq ($(findstring -ssh2,$(CFG)),-ssh2)
 SSH2 = 1
+ifneq ($(findstring -winssl,$(CFG)),-winssl)
 SSL = 1
+endif
 ZLIB = 1
 endif
 ifeq ($(findstring -ssl,$(CFG)),-ssl)
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index a6a5b7733..d941da952 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -168,7 +168,9 @@ ZLIB = 1
 endif
 ifeq ($(findstring -ssh2,$(CFG)),-ssh2)
 SSH2 = 1
+ifneq ($(findstring -winssl,$(CFG)),-winssl)
 SSL = 1
+endif
 ZLIB = 1
 endif
 ifeq ($(findstring -ssl,$(CFG)),-ssl)