From 5feb58ca12d576159b176d810dab0212c940ce00 Mon Sep 17 00:00:00 2001 From: Shankar Jadhavar Date: Fri, 5 Jul 2019 00:25:50 -0500 Subject: winbuild: Change Makefile to honor ENABLE_OPENSSL_AUTO_LOAD_CONFIG - Made changes so that ENABLE_OPENSSL_AUTO_LOAD_CONFIG will be honored. - Also removed some ^M chars from file. Prior to this change while building on Windows platform even if we pass the ENABLE_OPENSSL_AUTO_LOAD_CONFIG option with value as "no" it does not set the CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG flag. Closes https://github.com/curl/curl/pull/4086 --- winbuild/Makefile.vc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'winbuild') diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index f5c0c7b00..9b3b35513 100644 --- a/winbuild/Makefile.vc +++ b/winbuild/Makefile.vc @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1999 - 2017, Daniel Stenberg, , et al. +# Copyright (C) 1999 - 2019, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -43,8 +43,8 @@ CFGSET=true !MESSAGE Libraries can be fetched at https://windows.php.net/downloads/php-sdk/deps/ !MESSAGE Uncompress them into the deps folder. !MESSAGE WITH_PREFIX= - Installation directory path -!MESSAGE Defaults to a configuration dependent (SSL, zlib, etc.) -!MESSAGE directory inside curl's subdirectory builds: ./builds +!MESSAGE Defaults to a configuration dependent (SSL, zlib, etc.) +!MESSAGE directory inside curl's subdirectory builds: ./builds !MESSAGE Use backslashes as path separator !MESSAGE WITH_SSL= - Enable OpenSSL support, DLL or static !MESSAGE WITH_NGHTTP2= - Enable HTTP/2 support, DLL or static @@ -138,6 +138,12 @@ USE_WINSSL = false !IFNDEF ENABLE_OPENSSL_AUTO_LOAD_CONFIG ENABLE_OPENSSL_AUTO_LOAD_CONFIG = true +!ELSEIF "$(ENABLE_OPENSSL_AUTO_LOAD_CONFIG)"=="yes" +!UNDEF ENABLE_OPENSSL_AUTO_LOAD_CONFIG +ENABLE_OPENSSL_AUTO_LOAD_CONFIG = true +!ELSEIF "$(ENABLE_OPENSSL_AUTO_LOAD_CONFIG)"=="no" +!UNDEF ENABLE_OPENSSL_AUTO_LOAD_CONFIG +ENABLE_OPENSSL_AUTO_LOAD_CONFIG = false !ENDIF CONFIG_NAME_LIB = libcurl -- cgit v1.2.3