moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 12:05:06 -05:00
Code Issues Releases Wiki Activity

define: remove HAVE_ENGINE_LOAD_BUILTIN_ENGINES, not used anymore

Browse Source 
It is covered by USE_OPENSSL_ENGINE now.

Reported-by: Gisle Vanem
Bug: 87b9337c8f (commitcomment-36447951)

Closes #4725
This commit is contained in:
Daniel Stenberg 2019-12-16 22:53:10 +01:00
parent bdb5b6dd5b
commit 0caf1423e5
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
7 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Makefile.m32
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
# you should have received as part of this distribution. The terms
@ -271,7 +271,7 @@ ifdef SSL
endif
INCLUDES += -I"$(OPENSSL_INCLUDE)"
CFLAGS += -DUSE_OPENSSL -DHAVE_OPENSSL_ENGINE_H -DHAVE_OPENSSL_PKCS12_H \
-DHAVE_ENGINE_LOAD_BUILTIN_ENGINES -DOPENSSL_NO_KRB5
-DOPENSSL_NO_KRB5
DLL_LIBS += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS)
ifdef SRP
ifeq "$(wildcard $(OPENSSL_INCLUDE)/openssl/srp.h)" "$(OPENSSL_INCLUDE)/openssl/srp.h"

1
lib/config-plan9.h
View File

@ -102,7 +102,6 @@
#define HAVE_BASENAME 1
#define HAVE_BOOL_T 1
#define HAVE_CRYPTO_CLEANUP_ALL_EX_DATA 1
#define HAVE_ENGINE_LOAD_BUILTIN_ENGINES 1
#define HAVE_ERRNO_H 1
#define HAVE_FCNTL 1
#define HAVE_FCNTL_H 1

3
lib/config-symbian.h
View File

@ -128,9 +128,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1
/* Define to 1 if you have the `ENGINE_load_builtin_engines' function. */
/*#define HAVE_ENGINE_LOAD_BUILTIN_ENGINES 1*/
/* Define to 1 if you have the <errno.h> header file. */
#define HAVE_ERRNO_H 1

4
lib/config-tpf.h
View File

@ -119,10 +119,6 @@
/* #undef HAVE_DES_H */
#define HAVE_DES_H 1
/* Define to 1 if you have the `ENGINE_load_builtin_engines' function. */
/* #undef HAVE_ENGINE_LOAD_BUILTIN_ENGINES */
#define HAVE_ENGINE_LOAD_BUILTIN_ENGINES 1
/* Define to 1 if you have the <errno.h> header file. */
#define HAVE_ERRNO_H 1

3
lib/config-vxworks.h
View File

@ -143,9 +143,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1
/* Define to 1 if you have the `ENGINE_load_builtin_engines' function. */
#define HAVE_ENGINE_LOAD_BUILTIN_ENGINES 1
/* Define to 1 if you have the <errno.h> header file. */
#define HAVE_ERRNO_H 1

3
lib/curl_config.h.cmake
View File

@ -148,9 +148,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#cmakedefine HAVE_DLFCN_H 1
/* Define to 1 if you have the `ENGINE_load_builtin_engines' function. */
#cmakedefine HAVE_ENGINE_LOAD_BUILTIN_ENGINES 1
/* Define to 1 if you have the <errno.h> header file. */
#cmakedefine HAVE_ERRNO_H 1

22
packages/vms/config_h.com
View File

@ -803,28 +803,6 @@ $ write tf "#endif"
$ goto cfgh_in_loop1
$ endif
$!
$ if key2 .eqs. "HAVE_ENGINE_LOAD_BUILTIN_ENGINES"
$ then
$ if f$search("''ssl_header_dir'engine.h") .nes. ""
$ then
$ search_key = key2 - "HAVE_"
$ define/user sys$output nl:
$ define/user sys$error nl:
$ search/output=nl: 'ssl_header_dir'engine.h 'search_key'
$ if '$severity' .eq. 1
$ then
$ write tf "#ifndef ''key2'"
$ write tf "#define ''key2' 1"
$ write tf "#endif"
$ else
$ write tf "/* #undef ''key2' */"
$ endif
$ else
$ write tf "/* #undef ''key2' */"
$ endif
$ goto cfgh_in_loop1
$ endif
$!
$ if key2b .eqs. "RAND" .and. key2c .nes. "" .and. key2d .eqs. ""
$ then
$ if (key2c .eqs. "EGD") .or. -