You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@apache.org on 2001/08/21 00:30:17 UTC
cvs commit: httpd-2.0/modules/ssl mod_ssl.h
rbb 01/08/20 15:30:17
Modified: . acinclude.m4
modules/ssl mod_ssl.h
Log:
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.
Revision Changes Path
1.95 +1 -1 httpd-2.0/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- acinclude.m4 2001/08/20 18:35:21 1.94
+++ acinclude.m4 2001/08/20 22:30:17 1.95
@@ -468,7 +468,7 @@
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])
1.24 +9 -9 httpd-2.0/modules/ssl/mod_ssl.h
Index: mod_ssl.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mod_ssl.h 2001/07/31 07:21:59 1.23
+++ mod_ssl.h 2001/08/20 22:30:17 1.24
@@ -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 */