Use header presence status to avoid openssl engine

Include presence of openssl/engine.h as indication engines should not be
used. Skip engine if header is not present.

diff --git a/examples/ldns-signzone.c b/examples/ldns-signzone.c
index 9425833e53b69a0ca3520ee1800b8f905698abd7..509a023d1e24301dd0bc34fd3799c751df50cd44 100644 (file)
--- a/examples/ldns-signzone.c
+++ b/examples/ldns-signzone.c
@@ -22,8 +22,12 @@
 #include <ldns/keys.h>
 
 #include <openssl/conf.h>
-#ifndef OPENSSL_NO_ENGINE
+#if defined(HAVE_OPENSSL_ENGINE_H) && !defined(OPENSSL_NO_ENGINE)
 #include <openssl/engine.h>
+#else
+#  ifndef OPENSSL_NO_ENGINE
+#  define OPENSSL_NO_ENGINE
+#  endif
 #endif
 #include <openssl/err.h>
 

diff --git a/keys.c b/keys.c
index 59de186e66c1c3f89225c56feabde6cabd6e8c66..b0927391eaefe9d6446a48437170d0681ec085f6 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -23,8 +23,12 @@
 #ifdef USE_DSA
 #include <openssl/dsa.h>
 #endif
-#ifndef OPENSSL_NO_ENGINE
+#if defined(HAVE_OPENSSL_ENGINE_H) && !defined(OPENSSL_NO_ENGINE)
 #include <openssl/engine.h>
+#else
+#  ifndef OPENSSL_NO_ENGINE
+#  define OPENSSL_NO_ENGINE
+#  endif
 #endif
 #endif /* HAVE_SSL */