summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--acinclude.m42
-rw-r--r--modules/ssl/mod_ssl.h18
2 files changed, 10 insertions, 10 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 217db3bdf6..92ecdb7dbe 100644
--- 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 bb3739f474..3e72fc19d8 100644
--- 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 */