summaryrefslogtreecommitdiffstatsabout
path: root/m4/apache.m4
diff options
context:
space:
mode:
authorEdward Rudd <urkle@outoforder.cc>2004-01-22 05:26:56 (GMT)
committer Edward Rudd <urkle@outoforder.cc>2004-01-22 05:26:56 (GMT)
commitf230d2468cdc8ee3d290d34a36593b154f51aee1 (patch)
treed823f819136bd34dfa5bb0cba94c6c8c03e852d6 /m4/apache.m4
parentb19a5851171395e196ed686977482d79d7140cfd (diff)
SSL support working under 1.3 and 2.0 as a separate module
preparsing of logformat completed. updated configure scripts to detect mod_ssl.h for 1.3 (mostly)
Diffstat (limited to 'm4/apache.m4')
-rw-r--r--m4/apache.m45
1 files changed, 4 insertions, 1 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)