summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-12-19 19:04:43 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-12-19 19:04:43 (GMT)
commit54ef20b0f8dcbb0130c86bdf6d4bec6fb2cb8048 (patch)
tree2a374c55f4e1acf30fa41bb8472ff9eee5883c9f /configure
parent65bb3ac67c741c46aa27ccd98cb7930a2b731306 (diff)
Fix testing the automake version:
- previously, only version with a more-than-two-digits minor would match - make versions starting with major in [2-9] also match /trunk/configure | 4 2 2 0 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 27a6205..7f38a33 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