[openoffice] branch AOO42X updated: for the time being, error out if we see gmake 4.3

[ji...@apache.org]

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

jim pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO42X by this push:
     new 33a320a  for the time being, error out if we see gmake 4.3
33a320a is described below

commit 33a320a851227cf86b272c2a3544d337947a96a1
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Mon May 11 17:28:28 2020 -0400

    for the time being, error out if we see gmake 4.3
    
    (cherry picked from commit de6c7c584f4e0bae1adeb4e559c98bb26e9b8c74)
---
 main/configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/configure.ac b/main/configure.ac
index d6e943e..e03a8fa 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -1830,10 +1830,10 @@ fi
 AC_MSG_CHECKING([the GNU make version])
 _make_version=`$GNUMAKE --version | $GREP GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
 _make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-if test "$_make_longver" -ge "038100" ; then
+if test "$_make_longver" -ge "038100" && test "$_make_longver" -lt "040300" ; then
    AC_MSG_RESULT([$GNUMAKE $_make_version])
 else
-   AC_MSG_ERROR([failed ($GNUMAKE version >= 3.81 needed])
+   AC_MSG_ERROR([failed ($GNUMAKE version >= 3.81 but < 4.3 needed])
 fi
 AC_SUBST(GNUMAKE)