httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject svn commit: r1091330 - /httpd/httpd/trunk/configure.in
Date Tue, 12 Apr 2011 09:09:52 GMT
Author: jfclere
Date: Tue Apr 12 09:09:52 2011
New Revision: 1091330

URL: http://svn.apache.org/viewvc?rev=1091330&view=rev
Log:
Allow apr and apr-util to be in 2 different location.
Otherwise: apr_version.h is not found when apr-util is tested.

Modified:
    httpd/httpd/trunk/configure.in

Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=1091330&r1=1091329&r2=1091330&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Tue Apr 12 09:09:52 2011
@@ -367,7 +367,15 @@ fi
 
 if test "${apu_found}" = "yes"; then
   # Require at least APR-util 1.3.x otherwise fail
-  APACHE_CHECK_APxVER([apu], 1, 3)
+  if test "${apr_found}" = "yes"; then
+    # we need to add the APR includes to CPPFLAGS
+    apu_ckver_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS `$apr_config --includes`"
+    APACHE_CHECK_APxVER([apu], 1, 3)
+    CPPFLAGS="$apu_ckver_CPPFLAGS"
+  else
+    APACHE_CHECK_APxVER([apu], 1, 3)
+  fi
 fi
 
 dnl Check for what we can generate dependency files with



Mime
View raw message