svn commit: r698391 - in /httpd/flood/trunk: CHANGES configure.in

[je...@apache.org]

Author: jerenkrantz
Date: Tue Sep 23 16:00:22 2008
New Revision: 698391

URL: http://svn.apache.org/viewvc?rev=698391&view=rev
Log:
Support building against installed Ubuntu APR packages.

* configure.in: Permit usage of installed APR/APR-util if no 
  --with-apr(-util) arguments specified; override the compiler name
  per $apr_config to avoid tag mismatches with APR's bundled GNU
  libtool.
* CHANGES: Update.

Modified:
    httpd/flood/trunk/CHANGES
    httpd/flood/trunk/configure.in

Modified: httpd/flood/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/flood/trunk/CHANGES?rev=698391&r1=698390&r2=698391&view=diff
==============================================================================
--- httpd/flood/trunk/CHANGES (original)
+++ httpd/flood/trunk/CHANGES Tue Sep 23 16:00:22 2008
@@ -1,5 +1,8 @@
 Changes since 1.0:
 
+* Support building against installed Ubuntu APR packages.
+  [Justin Erenkrantz]
+
 * Update relative times report to use appropriate APR format string.
   [Justin Erenkrantz]
 

Modified: httpd/flood/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/flood/trunk/configure.in?rev=698391&r1=698390&r2=698391&view=diff
==============================================================================
--- httpd/flood/trunk/configure.in (original)
+++ httpd/flood/trunk/configure.in Tue Sep 23 16:00:22 2008
@@ -109,7 +109,7 @@
     ])
 fi
 
-APR_FIND_APR(./apr,,,[1 0])
+APR_FIND_APR(./apr,,1,[1 0])
 
 if test "$apr_found" = "no"; then
   AC_MSG_ERROR([APR not found.  Please read the documentation.])
@@ -120,6 +120,7 @@
   FLOOD_SUBDIRS="$FLOOD_SUBDIRS apr"   
 fi
 
+CC="`$apr_config --cc`"
 CFLAGS="$CFLAGS `$apr_config --cflags`"
 CPPFLAGS="$CPPFLAGS `$apr_config --cppflags --includes`"
 LDFLAGS="$LDFLAGS `$apr_config --ldflags`"
@@ -127,7 +128,7 @@
 LIBTOOL_LIBS="$LIBTOOL_LIBS `$apr_config --link-libtool --libs`"
 APR_CONFIG="$apr_config"
 
-APR_FIND_APU(./apr-util,,,[1 0])
+APR_FIND_APU(./apr-util,,1,[1 0])
 
 if test "$apu_found" = "no"; then
   AC_MSG_ERROR([APR-util not found.  Please read the documentation.])