Add the openssl/include/openssl directory to the INCLUDES variable.

This allows us to remove the openssl from the #include lines in the
mod_ssl files.  This makes it easier to use a different SSL library,
with fewer changes to the mod_ssl files.

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

diff --git a/acinclude.m4 b/acinclude.m4
index 217db3bdf68b7c9ffb985e1694f3ed2d4218a688..92ecdb7dbe5a748c650422875586813181fa7a70 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -468,7 +468,7 @@ if test "x$ap_ssltk_base" = "x"; then
 
   dnl #  annotate the Apache build environment with determined information
   if test "x$ap_ssltk_incdir" != "x/usr/include"; then
-    APR_ADDTO(INCLUDES, [-I$ap_ssltk_incdir])
+    APR_ADDTO(INCLUDES, [-I$ap_ssltk_incdir -I$ap_ssltk_incdir/openssl])
   fi
   if test "x$ap_ssltk_libdir" != "x/usr/lib"; then
     APR_ADDTO(LIBS, [-L$ap_ssltk_libdir])

diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h
index bb3739f474a2755fd6dee5d1bb6ea7551209fde7..3e72fc19d81d2bc8424b61f5531ae0097d0a8928 100644 (file)
--- a/modules/ssl/mod_ssl.h
+++ b/modules/ssl/mod_ssl.h
@@ -104,16 +104,16 @@
 #include <assert.h>
 
 /* OpenSSL headers */
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
-#include <openssl/pem.h>
-#include <openssl/crypto.h>
-#include <openssl/evp.h>
-#include <openssl/rand.h>
+#include <ssl.h>
+#include <err.h>
+#include <x509.h>
+#include <x509v3.h>
+#include <pem.h>
+#include <crypto.h>
+#include <evp.h>
+#include <rand.h>
 #ifdef SSL_EXPERIMENTAL_ENGINE
-#include <openssl/engine.h>
+#include <engine.h>
 #endif
 
 /* Apache headers */