Backpot #1271 from /trunk:

- Fix testing the automake version

 /branches/1.3/configure |    4     2     2     0 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

configure

@@ -41,7 +41,7 @@ sed/
 bison/
 flex/
 makeinfo/
-automake/\(GNU automake\) [[:digit:]]+\.[[:digit:]]{2,}
+automake/\(GNU automake\) [[:digit:]]+\.[[:digit:]]{2,}|automake/\(GNU automake\) [2-9][[:digit:]]*\.
 libtool/
 curl/|wget/
 patch/
@@ -87,7 +87,7 @@ has_or_abort() {
                   tool_version=$(${tool} --version 2>&1)
                   str=$(echo "${tool_version}" |grep -E "${regexp}" |head -n 1)
                   if [ -z "${str}" ]; then
-                      echo "wrong version string: expecting regexp '${regexp}'"
+                      echo "${where}: wrong version string: expecting regexp '${regexp}'"
                       where=""
                       continue
                   fi