summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-01-27 22:21:44 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-01-27 22:21:44 (GMT)
commitbfe4dbd83ef09f2871824446ad3a9ab7587e20d8 (patch)
treea71cbd002ff5a5aa2a59e44bcc9acd313df696a5
parent89e1613508dce01185df37998a95fea5fb904c08 (diff)
Backpot #1271 from /trunk:
- Fix testing the automake version /branches/1.3/configure | 4 2 2 0 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 18a01fa..ac87ea4 100755
--- a/configure
+++ b/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