[thrift] branch master updated: THRIFT-4605: bootstrap.sh fails if automake=1.16.1 (#1574)

[jk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jking pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git


The following commit(s) were added to refs/heads/master by this push:
     new e8bec23  THRIFT-4605: bootstrap.sh fails if automake=1.16.1 (#1574)
e8bec23 is described below

commit e8bec2359899bbc92220cd08398cffee9a6dd1d7
Author: Jaume Marhuenda <ja...@gmail.com>
AuthorDate: Tue Jul 31 07:21:42 2018 -0700

    THRIFT-4605: bootstrap.sh fails if automake=1.16.1 (#1574)
---
 bootstrap.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index c7e000c..2452eea 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -38,10 +38,14 @@ else
   exit 1
 fi
 
+format_version () {
+    printf "%03d%03d%03d%03d" $(echo $1 | tr '.' ' ');
+}
+
 # we require automake 1.13 or later
 # check must happen externally due to use of newer macro
 AUTOMAKE_VERSION=`automake --version | grep automake | egrep -o '([0-9]{1,}\.)+[0-9]{1,}'`
-if [ "$AUTOMAKE_VERSION" \< "1.13" ]; then
+if  [ $(format_version $AUTOMAKE_VERSION) -lt $(format_version 1.13) ]; then
   echo >&2 "automake version $AUTOMAKE_VERSION is too old (need 1.13 or later)"
   exit 1
 fi