diff options
| author | Shankar Jadhavar <Shankar.Jadhavar@veritas.com> | 2019-07-05 00:25:50 -0500 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2019-07-06 23:18:28 -0400 |
| commit | 5feb58ca12d576159b176d810dab0212c940ce00 (patch) | |
| tree | 567c52f973c925ad9de19c73365293efc0b375d0 | |
| parent | 8ad61c6847349b71e7e7b9c544c4c7b40e6d6ff5 (diff) | |
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
| -rw-r--r-- | winbuild/Makefile.vc | 12 |
1 files changed, 9 insertions, 3 deletions
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, <daniel@haxx.se>, et al. +# Copyright (C) 1999 - 2019, Daniel Stenberg, <daniel@haxx.se>, 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=<path> - 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=<dll or static> - Enable OpenSSL support, DLL or static !MESSAGE WITH_NGHTTP2=<dll or static> - 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 |