aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorViktor Szakats <vszakats@users.noreply.github.com>2016-03-02 03:00:37 +0100
committerJay Satiro <raysatiro@yahoo.com>2016-03-05 13:40:34 -0500
commit05401b9a3b14e3ecd647bd0624890805efc6c414 (patch)
tree39f9199fc84d2b14401f3743bee3d4a3a9796db6 /lib
parent20de9b4f090e9000f90362ec6fdede7d1153a643 (diff)
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.
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.m322
1 files changed, 2 insertions, 0 deletions
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)