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:23:02 +0200
commit968b99af2fcaba6f3e7bb8f3b8c64cb409ca50ed (patch)
treed47eb7b4339c716b36811383d587e12ebc4ad020
parentbc2f9d7fe53a2bc40d7f8fb479aa0ef9bb4cd7b3 (diff)
downloadadmin-968b99af2fcaba6f3e7bb8f3b8c64cb409ca50ed.tar.gz
admin-968b99af2fcaba6f3e7bb8f3b8c64cb409ca50ed.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 67d18de..46bd62e 100644
--- a/cvs.sh
+++ b/cvs.sh
@@ -63,7 +63,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
;;