You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2020/05/24 16:18:27 UTC
[openoffice] branch trunk updated: Removed check for GNU make 4.3
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new cc6648e Removed check for GNU make 4.3
cc6648e is described below
commit cc6648e8b0b7b3b5d3b501531fab06dfe8218847
Author: mseidel <ms...@apache.org>
AuthorDate: Sun May 24 18:18:00 2020 +0200
Removed check for GNU make 4.3
---
main/configure.ac | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/main/configure.ac b/main/configure.ac
index c65822d..9d7461c 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" && test "$_make_longver" -lt "040300" ; then
+if test "$_make_longver" -ge "038100" ; then
AC_MSG_RESULT([$GNUMAKE $_make_version])
else
- AC_MSG_ERROR([failed ($GNUMAKE version >= 3.81 but < 4.3 needed)])
+ AC_MSG_ERROR([failed ($GNUMAKE version >= 3.81 needed])
fi
AC_SUBST(GNUMAKE)
@@ -7517,3 +7517,4 @@ else
echo
fi
+