Skip to content
Permalink
Browse files

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 #4086
  • Loading branch information...
Shankar Jadhavar authored and jay committed Jul 5, 2019
1 parent 8ad61c6 commit 5feb58ca12d576159b176d810dab0212c940ce00
Showing with 9 additions and 3 deletions.
  1. +9 −3 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

0 comments on commit 5feb58c

Please sign in to comment.
You can’t perform that action at this time.