Commit 05401b9a authored Mar 02, 2016 by Viktor Szakats Committed by Jay Satiro Mar 05, 2016

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.

parent 20de9b4f

lib/Makefile.m32

+2 −0

Original line number	Diff line number	Diff line
		@@ -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)

src/Makefile.m32

+2 −0

Original line number	Diff line number	Diff line
		@@ -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)