summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-05-08 01:22:48 +0200
committerSlávek Banko <slavek.banko@axis.cz>2018-05-08 01:22:57 +0200
commita1cd2ba6b0f1baa6f2edf9cc940e23abe6d23f19 (patch)
tree2ccec74a76246c0bd4ae047aee04487da606dd72
parent5200a0cc9da98d7798aa80a7c35e29e70d4c2927 (diff)
downloadadmin-a1cd2ba6b0f1baa6f2edf9cc940e23abe6d23f19.tar.gz
admin-a1cd2ba6b0f1baa6f2edf9cc940e23abe6d23f19.zip
Add support for all versions of automake 1.x >= 1.6.1
Thanks to Ray Vine for the original patch This resolves bug 2891 Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 065b9015b2ba1a02939e28fca1759f2a7867c17c)
-rw-r--r--cvs.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/cvs.sh b/cvs.sh
index 9b0e3c5..0f8ce8d 100644
--- a/cvs.sh
+++ b/cvs.sh
@@ -56,7 +56,7 @@ esac
AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
required_automake_version="1.6.1 or newer"
case $AUTOMAKE_STRING in
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12* | automake*1.13* | automake*1.14* | automake*1.15* )
+ automake*1.6.* | automake*1.[7-9]* | automake*1.[1-9][0-9]* )
echo "*** $AUTOMAKE_STRING found."
UNSERMAKE=no
;;