]> granicus.if.org Git - apache/commitdiff
* configure.in: Allow configure to be built without find_apu.m4,
authorJoe Orton <jorton@apache.org>
Wed, 25 Mar 2009 08:43:28 +0000 (08:43 +0000)
committerJoe Orton <jorton@apache.org>
Wed, 25 Mar 2009 08:43:28 +0000 (08:43 +0000)
  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

configure.in

index 39b1dc8fd3dfaf7dc4b86354fa1d22c849a8246a..3bfef5106c193bd1ee48ef58cdd1abcbf8221ff9 100644 (file)
@@ -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