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 eeb4311baaf3adae052cbc39ff488418adf0b8f1..b6d9eb09cbf27a6c24cd239d986f964194bc471b 100644 (file)
--- 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 a6a5b7733582bf43f5aed14b82f99745a6424f90..d941da9526735d9c89803aa5945fe76bc915d396 100644 (file)
--- 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)