From 3d647b9a981b9573d5495b6943d043b2130aa8fd Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Sun, 19 Dec 2004 09:37:32 +0000
Subject: 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.

---
 lib/ssluse.c  | 3 +--
 lib/urldata.h | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/ssluse.c b/lib/ssluse.c
index 47ee042ab..433b78158 100644
--- 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 407af2aaf..1fdaac994 100644
--- 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"
-- 
cgit v1.2.3