From 05401b9a3b14e3ecd647bd0624890805efc6c414 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 2 Mar 2016 03:00:37 +0100 Subject: [PATCH] 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. --- lib/Makefile.m32 | 2 ++ src/Makefile.m32 | 2 ++ 2 files changed, 4 insertions(+) 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) -- 2.40.0