configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 82d5522807a6886147cbf93b7925d0578415ca4c
Author: Christian Lohmaier <[email protected]>
AuthorDate: Tue Sep 16 18:59:15 2025 +0200
Commit: Christian Lohmaier <[email protected]>
CommitDate: Tue Oct 7 15:09:23 2025 +0200
require make >= 4.2 for reading contents with the file builtin function
the prebuilt version for windows is 4.2.1, and lode also defaulted to
newer versions for better interaction with the jobserver mode since 2023
(parallel linking with lto, accepted 4.2 if available, otherwise would
have installed 4.4)
Change-Id: Iebdf9677503901197a548596b011076293a71ed8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191091
Tested-by: Jenkins
Reviewed-by: René Engelhard <[email protected]>
Reviewed-by: Christian Lohmaier <[email protected]>
diff --git a/configure.ac b/configure.ac
index 5831f186b0e7..e68c932f3082 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6906,10 +6906,10 @@ TAB=`printf ' '`
AC_MSG_CHECKING([the GNU Make version])
_make_version=`$GNUMAKE --version | grep GNU | $GREP -v GPL | $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 "040000"; then
+if test "$_make_longver" -ge "040200"; then
AC_MSG_RESULT([$GNUMAKE $_make_version])
else
- AC_MSG_ERROR([failed ($GNUMAKE version >= 4.0 needed)])
+ AC_MSG_ERROR([failed ($GNUMAKE version >= 4.2 needed)])
fi
_make_ver_check=`$GNUMAKE --version | grep "Built for Windows"`
