Depend on OPENSSL_NO_STATIC_ENGINE rather than OPENSSL_NO_DYNAMIC_ENGINE.

Make sure to include openssl/opensslconf.h to make sure we get the
definition of those macros.

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index 9b0e0bc92ed8ff6ce6439c783237fcd156b981b2..6bb7e93bb2f9a7b0bd5b984518d444895c67acda 100644 (file)
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -70,7 +70,7 @@ void ENGINE_load_builtin_engines(void)
        ENGINE_load_openssl();
 #endif
        ENGINE_load_dynamic();
        ENGINE_load_openssl();
 #endif
        ENGINE_load_dynamic();

-#ifdef OPENSSL_NO_DYNAMIC_ENGINE
+#ifndef OPENSSL_NO_STATIC_ENGINE

 #ifndef OPENSSL_NO_HW
 #ifndef OPENSSL_NO_HW_CSWIFT
        ENGINE_load_cswift();
 #ifndef OPENSSL_NO_HW
 #ifndef OPENSSL_NO_HW_CSWIFT
        ENGINE_load_cswift();

diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h
index 3b951eb3e2e7165c759ec9cf5b17b69920d46552..8ed684c0ea670447cbe04d3e147d1a225f2c9c12 100644 (file)
--- a/crypto/engine/engine.h
+++ b/crypto/engine/engine.h
@@ -64,6 +64,7 @@
 #ifndef HEADER_ENGINE_H
 #define HEADER_ENGINE_H
 
 #ifndef HEADER_ENGINE_H
 #define HEADER_ENGINE_H
 

+#include <openssl/opensslconf.h>

 #include <openssl/ossl_typ.h>
 #include <openssl/bn.h>
 #ifndef OPENSSL_NO_RSA
 #include <openssl/ossl_typ.h>
 #include <openssl/bn.h>
 #ifndef OPENSSL_NO_RSA