[Libreoffice-commits] core.git: configure.ac

[Michael Stahl (via logerrit)]

 configure.ac |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 43e917a3912121f046495f9df3b2ca2b21a624db
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Jun 26 11:37:13 2019 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Jun 26 18:11:49 2019 +0200

    configure: reportedly Tempfile.mk fallback doesn't work on WNT
    
    ... hence require $(file) support.
    
    https://lists.freedesktop.org/archives/libreoffice/2019-June/083004.html
    
    Change-Id: Ic7bdb3d47a78e4f620c2efd9ec58042378dbf2f3
    Reviewed-on: https://gerrit.libreoffice.org/74730
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/configure.ac b/configure.ac
index f5da5f5c5231..a7932882354c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12734,7 +12734,8 @@ else
 fi
 
 
-if test "$STALE_MAKE" = "TRUE" -a "$build_os" = "cygwin"; then
+if test \( "$STALE_MAKE" = "TRUE" -o "$HAVE_GNUMAKE_FILE_FUNC" != "TRUE" \) \
+        -a "$build_os" = "cygwin"; then
 
 cat << _EOS
 ****************************************************************************
@@ -12770,7 +12771,11 @@ Note: autogen.sh will try to use /opt/lo/bin/make if the environment variable GN
 Alternatively, you can install the 'new' make where ever you want and make sure that `which make` finds it.
 
 _EOS
+if test "$HAVE_GNUMAKE_FILE_FUNC" != "TRUE"; then
+    AC_MSG_ERROR([no file function found; the build will fail without it; use GNU make 4.0 or later])
 fi
+fi
+
 
 cat << _EOF
 ****************************************************************************