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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/flood/trunk@698391 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES b/CHANGES
index b025745..a274e5b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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]
diff --git a/configure.in b/configure.in
index 80e869a..0d04cb7 100644
--- a/configure.in
+++ b/configure.in
@@ -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.])
