Tag 1.1.0 candidate
git-svn-id: https://svn.apache.org/repos/asf/apr/apr-iconv/tags/1.1.0@292322 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES b/CHANGES
index e701385..5ef6290 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
Changes with APR-ICONV 1.1.0
+ *) Correctly resolve to APR-1.0, never APR-0.9 in ./buildconf
+ [William Rowe]
+
*) APR_ICONV1_PATH distinguishes between our apr-iconv 0.9 and 1.x
flavors (the pool arguments to several internal functions changed
in 1.0, so the loadable charset modules are not binary compatible.)
diff --git a/build/apr-iconv.m4 b/build/apr-iconv.m4
index 1d7a1e0..eb7077f 100644
--- a/build/apr-iconv.m4
+++ b/build/apr-iconv.m4
@@ -8,7 +8,7 @@
AC_DEFUN(API_FIND_APR,[
dnl use the find_apr.m4 script to locate APR. sets apr_found and apr_config
- APR_FIND_APR
+ APR_FIND_APR(,,,[1])
if test "$apr_found" = "no"; then
AC_MSG_ERROR(APR could not be located. Please use the --with-apr option.)
fi