diff options
Diffstat (limited to 'm4')
-rw-r--r-- | m4/apache.m4 | 5 | ||||
-rw-r--r-- | m4/mod_ssl.m4 | 13 |
2 files changed, 14 insertions, 4 deletions
diff --git a/m4/apache.m4 b/m4/apache.m4 index a72343c..3d76b72 100644 --- a/m4/apache.m4 +++ b/m4/apache.m4 | |||
@@ -129,7 +129,8 @@ AC_ARG_ENABLE( | |||
129 | AC_MSG_ERROR([*** your path, or use the --with-apxs configure option]) | 129 | AC_MSG_ERROR([*** your path, or use the --with-apxs configure option]) |
130 | else | 130 | else |
131 | APACHE_INCDIR=`$APXS_BIN -q INCLUDEDIR` | 131 | APACHE_INCDIR=`$APXS_BIN -q INCLUDEDIR` |
132 | APACHE_CFLAGS=-I$APACHE_INCDIR | 132 | APACHE_CPPFLAGS=`$APXS_BIN -q CFLAGS` |
133 | APACHE_CFLAGS="-I$APACHE_INCDIR" | ||
133 | APACHE_MODDIR=`$APXS_BIN -q LIBEXECDIR` | 134 | APACHE_MODDIR=`$APXS_BIN -q LIBEXECDIR` |
134 | 135 | ||
135 | if test "x$enable_apachetest" = "xyes" ; then | 136 | if test "x$enable_apachetest" = "xyes" ; then |
@@ -155,6 +156,7 @@ AC_ARG_ENABLE( | |||
155 | AC_DEFINE(WITH_APACHE13,1,[Define to 1 if we are compiling with Apache 1.3.x]) | 156 | AC_DEFINE(WITH_APACHE13,1,[Define to 1 if we are compiling with Apache 1.3.x]) |
156 | APACHE_VERSION="13" | 157 | APACHE_VERSION="13" |
157 | APXS_EXTENSION=.so | 158 | APXS_EXTENSION=.so |
159 | APACHE_CFLAGS="-g $APACHE_CFLAGS" | ||
158 | APACHE_DEFS="-DWITH_APACHE13" | 160 | APACHE_DEFS="-DWITH_APACHE13" |
159 | ifelse([$3], , , $3), | 161 | ifelse([$3], , , $3), |
160 | AC_MSG_RESULT(no) | 162 | AC_MSG_RESULT(no) |
@@ -164,6 +166,7 @@ AC_ARG_ENABLE( | |||
164 | fi | 166 | fi |
165 | AC_SUBST(APACHE_DEFS) | 167 | AC_SUBST(APACHE_DEFS) |
166 | AC_SUBST(APACHE_CFLAGS) | 168 | AC_SUBST(APACHE_CFLAGS) |
169 | AC_SUBST(APACHE_CPPFLAGS) | ||
167 | AC_SUBST(APACHE_INCDIR) | 170 | AC_SUBST(APACHE_INCDIR) |
168 | AC_SUBST(APACHE_MODDIR) | 171 | AC_SUBST(APACHE_MODDIR) |
169 | AC_SUBST(APACHE_VERSION) | 172 | AC_SUBST(APACHE_VERSION) |
diff --git a/m4/mod_ssl.m4 b/m4/mod_ssl.m4 index 6a852b9..a8c6103 100644 --- a/m4/mod_ssl.m4 +++ b/m4/mod_ssl.m4 | |||
@@ -14,6 +14,11 @@ AC_ARG_WITH( | |||
14 | [AC_HELP_STRING([--with-ssl-inc=DIR],[Location of SSL header files])], | 14 | [AC_HELP_STRING([--with-ssl-inc=DIR],[Location of SSL header files])], |
15 | ssl_incdir="$withval", | 15 | ssl_incdir="$withval", |
16 | ) | 16 | ) |
17 | AC_ARG_WITH( | ||
18 | db-inc, | ||
19 | [AC_HELP_STRING([--with-db-inc=DIR],[Location of DB header files])], | ||
20 | db_incdir="$withval", | ||
21 | ) | ||
17 | 22 | ||
18 | if test "x$ssl_val" = "xyes"; then | 23 | if test "x$ssl_val" = "xyes"; then |
19 | ac_save_CFLAGS=$CFLAGS | 24 | ac_save_CFLAGS=$CFLAGS |
@@ -22,9 +27,11 @@ AC_ARG_WITH( | |||
22 | if test "x$ssl_incdir" != "x"; then | 27 | if test "x$ssl_incdir" != "x"; then |
23 | MOD_SSL_CFLAGS="-I$ssl_incdir -I$ssl_incdir/openssl $MOD_SSL_CFLAGS" | 28 | MOD_SSL_CFLAGS="-I$ssl_incdir -I$ssl_incdir/openssl $MOD_SSL_CFLAGS" |
24 | fi | 29 | fi |
25 | 30 | if test "x$db_incdir" != "x"; then | |
26 | CFLAGS="-I$APACHE_INCDIR $MOD_SSL_CFLAGS $CFLAGS" | 31 | MOD_SSL_CFLAGS="-I$db_incdir $MOD_SSL_CFLAGS" |
27 | CPPFLAGS="-I$APACHE_INCDIR $MOD_SSL_CFLAGS $CPPFLAGS" | 32 | fi |
33 | CFLAGS="$APACHE_CFLAGS $APACHE_CPPFLAGS $MOD_SSL_CFLAGS $CFLAGS" | ||
34 | CPPFLAGS="$APACHE_CFLAGS $APACHE_CPPFLAGS $MOD_SSL_CFLAGS $CPPFLAGS" | ||
28 | AC_CHECK_HEADERS([mod_ssl.h], | 35 | AC_CHECK_HEADERS([mod_ssl.h], |
29 | mod_ssl_h=yes | 36 | mod_ssl_h=yes |
30 | ) | 37 | ) |