moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

winbuild: Change Makefile to honor ENABLE_OPENSSL_AUTO_LOAD_CONFIG

Browse Source 
- 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
This commit is contained in:
Shankar Jadhavar 2019-07-05 00:25:50 -05:00 committed by Jay Satiro
parent 8ad61c6847
commit 5feb58ca12
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
winbuild/Makefile.vc
View File

@ -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 # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # 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 Libraries can be fetched at https://windows.php.net/downloads/php-sdk/deps/
!MESSAGE Uncompress them into the deps folder. !MESSAGE Uncompress them into the deps folder.
!MESSAGE WITH_PREFIX=<path> - Installation directory path !MESSAGE WITH_PREFIX=<path> - Installation directory path
!MESSAGE Defaults to a configuration dependent (SSL, zlib, etc.) !MESSAGE Defaults to a configuration dependent (SSL, zlib, etc.)
!MESSAGE directory inside curl's subdirectory builds: ./builds !MESSAGE directory inside curl's subdirectory builds: ./builds
!MESSAGE Use backslashes as path separator !MESSAGE Use backslashes as path separator
!MESSAGE WITH_SSL=<dll or static> - Enable OpenSSL support, DLL or static !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 !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 !IFNDEF ENABLE_OPENSSL_AUTO_LOAD_CONFIG
ENABLE_OPENSSL_AUTO_LOAD_CONFIG = true 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 !ENDIF
CONFIG_NAME_LIB = libcurl CONFIG_NAME_LIB = libcurl