You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by jo...@apache.org on 2009/03/25 09:43:29 UTC

svn commit: r758177 - /httpd/httpd/trunk/configure.in

Author: jorton
Date: Wed Mar 25 08:43:28 2009
New Revision: 758177

URL: http://svn.apache.org/viewvc?rev=758177&view=rev
Log:
* configure.in: Allow configure to be built without find_apu.m4,
  at least temporarily to allow buildconf against apr trunk.

Modified:
    httpd/httpd/trunk/configure.in

Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=758177&r1=758176&r2=758177&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Wed Mar 25 08:43:28 2009
@@ -120,7 +120,12 @@
 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