moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Viktor Szakats 2016-03-02 03:00:37 +01:00 committed by Jay Satiro
parent 20de9b4f09
commit 05401b9a3b
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Makefile.m32
View File

@ -153,7 +153,9 @@ ZLIB = 1
endif endif
ifeq ($(findstring -ssh2,$(CFG)),-ssh2) ifeq ($(findstring -ssh2,$(CFG)),-ssh2)
SSH2 = 1 SSH2 = 1
ifneq ($(findstring -winssl,$(CFG)),-winssl)
SSL = 1 SSL = 1
endif
ZLIB = 1 ZLIB = 1
endif endif
ifeq ($(findstring -ssl,$(CFG)),-ssl) ifeq ($(findstring -ssl,$(CFG)),-ssl)

2
src/Makefile.m32
View File

@ -168,7 +168,9 @@ ZLIB = 1
endif endif
ifeq ($(findstring -ssh2,$(CFG)),-ssh2) ifeq ($(findstring -ssh2,$(CFG)),-ssh2)
SSH2 = 1 SSH2 = 1
ifneq ($(findstring -winssl,$(CFG)),-winssl)
SSL = 1 SSL = 1
endif
ZLIB = 1 ZLIB = 1
endif endif
ifeq ($(findstring -ssl,$(CFG)),-ssl) ifeq ($(findstring -ssl,$(CFG)),-ssl)