summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorJoe Orton <jorton@apache.org>2009-03-25 08:43:28 +0000
committerJoe Orton <jorton@apache.org>2009-03-25 08:43:28 +0000
commit60b5595e738b8148dee3ccc4e661d412a2fadf81 (patch)
treee4f821c256a87c7303a431ad72b407919bdfb465 /configure.in
parent9db133b4a8dbcf3af10ff5d9e3dda4608d44f378 (diff)
downloadhttpd-60b5595e738b8148dee3ccc4e661d412a2fadf81.tar.gz
* configure.in: Allow configure to be built without find_apu.m4,
at least temporarily to allow buildconf against apr trunk. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758177 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index 39b1dc8fd3..3bfef5106c 100644
--- a/configure.in
+++ b/configure.in
@@ -120,7 +120,12 @@ if test "x${apr_major_version}" = "x2"; then
elif test "x$with_included_apr" = "xyes"; then
apu_found=reconfig
else
- APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", 1, ${apr_major_version})
+ dnl If httpd is buildconf'ed against an apr 2.x tree, then 1.x
+ dnl isn't supported.
+ ifdef([APR_FIND_APU], [
+ APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util",
+ 1, ${apr_major_version})
+ ], [apu_found=no])
fi
if test "$apu_found" = "no"; then