sslc 1.x does not have an x509v3.h

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94217 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/mod_ssl.h b/mod_ssl.h
index 4d2c20d37abaa8e065636d7c12aeb04223d6fa26..e593a0d32efdf882d16955931a9541d5b93f3786 100644 (file)
--- a/mod_ssl.h
+++ b/mod_ssl.h
@@ -116,7 +116,6 @@
 #include <ssl.h>
 #include <err.h>
 #include <x509.h>
-#include <x509v3.h>
 #include <pem.h>
 #include <crypto.h>
 #include <evp.h>
@@ -127,6 +126,10 @@
 
 #include "ssl_toolkit_compat.h"
 
+#ifdef HAVE_SSL_X509V3_H
+#include <x509v3.h>
+#endif
+
 /* mod_ssl headers */
 #include "ssl_expr.h"
 #include "ssl_util_ssl.h"

diff --git a/ssl_toolkit_compat.h b/ssl_toolkit_compat.h
index 06f95ad3ec56b9870f86c9324485926338f61805..439f8298d0051dcc0d1f8fe38b7902befa0a9b83 100644 (file)
--- a/ssl_toolkit_compat.h
+++ b/ssl_toolkit_compat.h
@@ -101,6 +101,10 @@
 #define modssl_set_verify(ssl, verify, cb) \
     SSL_set_verify(ssl, verify)
 
+#else /* SSLC 1.x */
+
+#define NO_SSL_X509V3_H
+
 #endif
 
 /* BEGIN GENERATED SECTION */
@@ -135,4 +139,8 @@
     SSL_set_verify(ssl, verify, cb)
 #endif
 
+#ifndef NO_SSL_X509V3_H
+#define HAVE_SSL_X509V3_H
+#endif
+
 #endif /* SSL_TOOLKIT_COMPAT_H */