define: remove HAVE_ENGINE_LOAD_BUILTIN_ENGINES, not used anymore

It is covered by USE_OPENSSL_ENGINE now.

Reported-by: Gisle Vanem
Bug: https://github.com/curl/curl/commit/87b9337c8f76c21c57b204e88b68c6ecf3bd1ac0#commitcomment-36447951

Closes #4725

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index ae88f4dced67e174ce167906cbbc97cb43e315b3..b6ef0a5cbdd9dd01e7d181053f433804a88fc70c 100644 (file)
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -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"

diff --git a/lib/config-plan9.h b/lib/config-plan9.h
index 64bfbdea05a5aa9e856a99f93b71e9f78effab72..4063d4bbd60b5c04e7d25a2754fd495faf1eded2 100644 (file)
--- a/lib/config-plan9.h
+++ b/lib/config-plan9.h
@@ -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

diff --git a/lib/config-symbian.h b/lib/config-symbian.h
index cb2e96d5d1ff6d67ee4341ece2737ace38bd636c..c01e1bfab8c17dc7b2ac09856494ced91b2898fb 100644 (file)
--- a/lib/config-symbian.h
+++ b/lib/config-symbian.h
@@ -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
 

diff --git a/lib/config-tpf.h b/lib/config-tpf.h
index f0c095bb04d92ead5e807552687abdbfedf775af..85b634f9d43523bb5f6bca42ebf8660ea4237df2 100644 (file)
--- a/lib/config-tpf.h
+++ b/lib/config-tpf.h
@@ -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
 

diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h
index d352578e33248c3e12616fda79154a6ead217679..004fd4e8009c6b7ac5542845c9d875462952fc1e 100644 (file)
--- a/lib/config-vxworks.h
+++ b/lib/config-vxworks.h
@@ -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
 

diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index d95fe94fdae7c78e149dde94b3c0c6f34470236a..2c3b6562d43df00bc7fad3ad1e21cdc4b38b3138 100644 (file)
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -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
 

diff --git a/packages/vms/config_h.com b/packages/vms/config_h.com
index 967eb40de14cb105e867f5cb2acfc2e1cae1501f..9bfb40b95fef8c0b70aa744cafe1e2224f3f0c0a 100644 (file)
--- a/packages/vms/config_h.com
+++ b/packages/vms/config_h.com
@@ -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. -