summaryrefslogtreecommitdiffstats
path: root/m4/apache.m4
diff options
context:
space:
mode:
authorGravatar Edward Rudd 2004-01-04 03:23:22 +0000
committerGravatar Edward Rudd 2004-01-04 03:23:22 +0000
commite2dfccb52240fd943ec6f1f2b8260f86d24d4cd2 (patch)
treee9576f43acacc69993ab369c0f608cefcedf8ae2 /m4/apache.m4
parent5b0927ae5d90380ac043f66787e253b03d218319 (diff)
update apache.m4 to use -with-apxs instead of --with-apache
got SSL support to compile. added Documentation subdirectory.
Diffstat (limited to 'm4/apache.m4')
-rw-r--r--m4/apache.m420
1 files changed, 11 insertions, 9 deletions
diff --git a/m4/apache.m4 b/m4/apache.m4
index b74f335..8f0d200 100644
--- a/m4/apache.m4
+++ b/m4/apache.m4
@@ -4,17 +4,19 @@ dnl
4AC_DEFUN(CHECK_PATH_APACHE, 4AC_DEFUN(CHECK_PATH_APACHE,
5[dnl 5[dnl
6AC_ARG_WITH( 6AC_ARG_WITH(
7 apache, 7 apxs,
8 [ --with-apache[=DIR] Apache install root], 8 [AC_HELP_STRING([--with-apxs[=DIR]],[Location to APXS binary])],
9 apache_prefix="$withval", 9 apxs_prefix="$withval",
10 apache_prefix="/usr" 10 apxs_prefix="/usr"
11 ) 11 )
12AC_ARG_ENABLE(apachetest, [ --disable-apachetest Do not try to compile and run apache version test program], 12AC_ARG_ENABLE(apachetest,
13 , enable_apachetest=yes) 13 [AC_HELP_STRING([--disable-apachetest],[Do not try to compile and run apache version test program])],
14 ,
15 enable_apachetest=yes)
14 16
15 17
16 AC_REQUIRE([AC_CANONICAL_TARGET]) 18 AC_REQUIRE([AC_CANONICAL_TARGET])
17 PATH="$apache_prefix:$apache_prefix/bin:$apache_prefix/sbin:$PATH" 19 PATH="$apxs_prefix:$apxs_prefix/bin:$apxs_prefix/sbin:$PATH"
18 AC_PATH_PROG(APXS_BIN, apxs, no, [$PATH]) 20 AC_PATH_PROG(APXS_BIN, apxs, no, [$PATH])
19 min_apache_version=ifelse([$1], ,1.3.1,$1) 21 min_apache_version=ifelse([$1], ,1.3.1,$1)
20 AC_MSG_CHECKING(for Apache - version >= $min_apache_version) 22 AC_MSG_CHECKING(for Apache - version >= $min_apache_version)
@@ -80,7 +82,7 @@ int main (int argc, char *argv[])
80 major1, minor1, micro1); 82 major1, minor1, micro1);
81 printf("*** I found version %d.%d.%d. Please verify the installation directory\n", 83 printf("*** I found version %d.%d.%d. Please verify the installation directory\n",
82 major2, minor2, micro2); 84 major2, minor2, micro2);
83 printf("*** of apache with the --with-apache configure option.\n"); 85 printf("*** of apache with the --with-apxs configure option.\n");
84 return 1; 86 return 1;
85 } 87 }
86} 88}
@@ -97,7 +99,7 @@ int main (int argc, char *argv[])
97 if test "APXS_BIN" = "no" ; then 99 if test "APXS_BIN" = "no" ; then
98 echo "*** The apxs binary installed by apache could not be found" 100 echo "*** The apxs binary installed by apache could not be found"
99 echo "*** If apache is installed in PREFIX, make sure PREFIX/bin is in" 101 echo "*** If apache is installed in PREFIX, make sure PREFIX/bin is in"
100 echo "*** your path, or use the --with-apache configure option" 102 echo "*** your path, or use the --with-apxs configure option"
101 else 103 else
102 if test -f conf.apachetest ; then 104 if test -f conf.apachetest ; then
103 : 105 :