summaryrefslogtreecommitdiffstats
path: root/m4/apache.m4
diff options
context:
space:
mode:
Diffstat (limited to 'm4/apache.m4')
-rw-r--r--m4/apache.m410
1 files changed, 7 insertions, 3 deletions
diff --git a/m4/apache.m4 b/m4/apache.m4
index 8f0d200..1e29ac7 100644
--- a/m4/apache.m4
+++ b/m4/apache.m4
@@ -5,7 +5,7 @@ AC_DEFUN(CHECK_PATH_APACHE,
5[dnl 5[dnl
6AC_ARG_WITH( 6AC_ARG_WITH(
7 apxs, 7 apxs,
8 [AC_HELP_STRING([--with-apxs[=DIR]],[Location to APXS binary])], 8 [AC_HELP_STRING([--with-apxs=PATH],[Location to APXS binary (default: /usr)])],
9 apxs_prefix="$withval", 9 apxs_prefix="$withval",
10 apxs_prefix="/usr" 10 apxs_prefix="/usr"
11 ) 11 )
@@ -17,7 +17,11 @@ AC_ARG_ENABLE(apachetest,
17 17
18 AC_REQUIRE([AC_CANONICAL_TARGET]) 18 AC_REQUIRE([AC_CANONICAL_TARGET])
19 PATH="$apxs_prefix:$apxs_prefix/bin:$apxs_prefix/sbin:$PATH" 19 PATH="$apxs_prefix:$apxs_prefix/bin:$apxs_prefix/sbin:$PATH"
20 AC_PATH_PROG(APXS_BIN, apxs, no, [$PATH]) 20 if test -x $apxs_prefix && test ! -d $apxs_prefix; then
21 APXS_BIN=$apxs_prefix
22 else
23 AC_PATH_PROG(APXS_BIN, apxs, no, [$PATH])
24 fi
21 min_apache_version=ifelse([$1], ,1.3.1,$1) 25 min_apache_version=ifelse([$1], ,1.3.1,$1)
22 AC_MSG_CHECKING(for Apache - version >= $min_apache_version) 26 AC_MSG_CHECKING(for Apache - version >= $min_apache_version)
23 no_apxs="" 27 no_apxs=""
@@ -96,7 +100,7 @@ int main (int argc, char *argv[])
96 ifelse([$2], , :, [$2]) 100 ifelse([$2], , :, [$2])
97 else 101 else
98 AC_MSG_RESULT(no) 102 AC_MSG_RESULT(no)
99 if test "APXS_BIN" = "no" ; then 103 if test "$APXS_BIN" = "no" ; then
100 echo "*** The apxs binary installed by apache could not be found" 104 echo "*** The apxs binary installed by apache could not be found"
101 echo "*** If apache is installed in PREFIX, make sure PREFIX/bin is in" 105 echo "*** If apache is installed in PREFIX, make sure PREFIX/bin is in"
102 echo "*** your path, or use the --with-apxs configure option" 106 echo "*** your path, or use the --with-apxs configure option"