if the pkcs12.h header exists, include it already in urldata.h to work around

a precedence problem with the zlib header. See CHANGES for details.

diff --git a/lib/ssluse.c b/lib/ssluse.c
index 47ee042ab99ee942c259103f0f78d4b9ef0b97df..433b78158d51a661458fe7e456dfe595fca92f71 100644 (file)
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -90,10 +90,9 @@
 #undef HAVE_ENGINE_LOAD_FOUR_ARGS
 #endif
 
-#if OPENSSL_VERSION_NUMBER >= 0x00903001L
+#if (OPENSSL_VERSION_NUMBER >= 0x00903001L) && defined(HAVE_OPENSSL_PKCS12_H)
 /* OpenSSL has PKCS 12 support */
 #define HAVE_PKCS12_SUPPORT
-#include <openssl/pkcs12.h>
 #else
 /* OpenSSL/SSLEay does not have PKCS12 support */
 #undef HAVE_PKCS12_SUPPORT

diff --git a/lib/urldata.h b/lib/urldata.h
index 407af2aafe060d1b98d13ed63a77d9f140fe28ec..1fdaac994ba13885bcb85f52263ee5ce20679d9e 100644 (file)
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -61,6 +61,9 @@
 #ifdef HAVE_OPENSSL_ENGINE_H
 #include <openssl/engine.h>
 #endif
+#ifdef HAVE_OPENSSL_PKCS12_H
+#include <openssl/pkcs12.h>
+#endif
 #else
 #include "rsa.h"
 #include "crypto.h"