configure.ac | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 2087b54aab25ddbab5128af9f777b1686bc0ce5e
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Aug 15 13:25:22 2014 +0200
configure: don't try to use Win32 make on release branch
Change-Id: Icd8c1b45659ca323aef25a55803f5b1ce078b9d3
Reviewed-on: https://gerrit.libreoffice.org/10932
Reviewed-by: Thomas Arnhold <tho...@arnhold.org>
Tested-by: Thomas Arnhold <tho...@arnhold.org>
diff --git a/configure.ac b/configure.ac
index 537f48b..2f19999 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5016,8 +5016,18 @@ for a in "$MAKE" "$GNUMAKE" make gmake gnumake; do
if test -n "$a"; then
$a --version 2> /dev/null | grep GNU 2>&1 > /dev/null
if test $? -eq 0; then
- GNUMAKE=`which $a`
- break
+ if test "$build_os" = "cygwin"; then
+ if test -n "$($a -v | grep 'Built for Windows')" ; then
+ AC_MSG_NOTICE([$a is a native Win32 make, which is not
supported on this old branch.])
+ unset GNUMAKE
+ else
+ GNUMAKE=`which $a`
+ break
+ fi
+ else
+ GNUMAKE=`which $a`
+ break
+ fi
fi
fi
done
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
