Depend on OPENSSL_NO_STATIC_ENGINE rather than OPENSSL_NO_DYNAMIC_ENGINE.
authorRichard Levitte <levitte@openssl.org>
Fri, 1 Nov 2002 12:37:22 +0000 (12:37 +0000)
committerRichard Levitte <levitte@openssl.org>
Fri, 1 Nov 2002 12:37:22 +0000 (12:37 +0000)
Make sure to include openssl/opensslconf.h to make sure we get the
definition of those macros.

crypto/engine/eng_all.c
crypto/engine/engine.h

index 9b0e0bc..6bb7e93 100644 (file)
@@ -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();
index 3b951eb..8ed684c 100644 (file)
@@ -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