Index: configure.in
===================================================================
--- configure.in	(revision 19124)
+++ configure.in	(revision 19125)
@@ -84,14 +84,13 @@
 
 dnl verify apr version and set apr flags
 dnl These regular expressions should not contain "\(" and "\)".
-APR_VER_REGEX=["0\.9\.[5-9]"]
-APR_VER_REGEX_TOO="1\."
-APU_VER_REGEX=["0\.9\.[5-9]"]
-APU_VER_REGEX_TOO="1\."
 
-SVN_LIB_APR($APR_VER_REGEX, $APR_VER_REGEX_TOO)
-SVN_LIB_APRUTIL($APU_VER_REGEX, $APU_VER_REGEX_TOO)
+APR_VER_REGEXES=["0\.9\.[5-9] 0\.9\.1[0-9] 1\."]
+APU_VER_REGEXES=["0\.9\.[5-9] 0\.9\.1[0-9] 1\."]
 
+SVN_LIB_APR($APR_VER_REGEXES)
+SVN_LIB_APRUTIL($APU_VER_REGEXES)
+
 dnl What version of Expat are we using? -----------------
 
 APU_HAVE_OLD_EXPAT="`$apu_config --old-expat`"
Index: build/ac-macros/aprutil.m4
===================================================================
--- build/ac-macros/aprutil.m4	(revision 19124)
+++ build/ac-macros/aprutil.m4	(revision 19125)
@@ -15,8 +15,7 @@
 
 AC_DEFUN(SVN_LIB_APRUTIL,
 [
-  APRUTIL_WANTED_REGEX="$1"
-  APRUTIL_WANTED_REGEX_TOO="$2"
+  APRUTIL_WANTED_REGEXES="$1"
 
   AC_MSG_NOTICE([Apache Portable Runtime Utility (APRUTIL) library configuration])
 
@@ -49,9 +48,16 @@
   fi
   AC_MSG_RESULT([$apu_version])
 
-  if test `expr $apu_version : $APRUTIL_WANTED_REGEX` -eq 0 \
-       -a `expr $apu_version : $APRUTIL_WANTED_REGEX_TOO` -eq 0; then
-    echo "wanted regex is $APRUTIL_WANTED_REGEX or $APRUTIL_WANTED_REGEX_TOO"
+  APU_WANTED_REGEX_MATCH=0
+  for apu_wanted_regex in $APRUTIL_WANTED_REGEXES; do
+    if test `expr $apu_version : $apu_wanted_regex` -ne 0; then
+      APU_WANTED_REGEX_MATCH=1
+      break
+    fi
+  done
+
+  if test $APU_WANTED_REGEX_MATCH -eq 0; then
+    echo "wanted regexes are $APRUTIL_WANTED_REGEXES"
     AC_MSG_ERROR([invalid apr-util version found])
   fi
 
Index: build/ac-macros/apr.m4
===================================================================
--- build/ac-macros/apr.m4	(revision 19124)
+++ build/ac-macros/apr.m4	(revision 19125)
@@ -10,8 +10,7 @@
 
 AC_DEFUN(SVN_LIB_APR,
 [
-  APR_WANTED_REGEX="$1"
-  APR_WANTED_REGEX_TOO="$2"
+  APR_WANTED_REGEXES="$1"
 
   AC_MSG_NOTICE([Apache Portable Runtime (APR) library configuration])
 
@@ -36,9 +35,16 @@
   fi
   AC_MSG_RESULT([$apr_version])
 
-  if test `expr $apr_version : $APR_WANTED_REGEX` -eq 0 \
-       -a `expr $apr_version : $APR_WANTED_REGEX_TOO` -eq 0; then
-    echo "wanted regex is $APR_WANTED_REGEX or $APR_WANTED_REGEX_TOO"
+  APR_WANTED_REGEX_MATCH=0
+  for apr_wanted_regex in $APR_WANTED_REGEXES; do
+    if test `expr $apr_version : $apr_wanted_regex` -ne 0; then
+      APR_WANTED_REGEX_MATCH=1
+      break
+    fi
+  done
+      
+  if test $APR_WANTED_REGEX_MATCH -eq 0; then
+    echo "wanted regexes are $APR_WANTED_REGEXES"
     AC_MSG_ERROR([invalid apr version found])
   fi