configure.ac | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 96ad8c2ac54993d7d0e9c6bede7e4aa8f10f9ff1
Author: Christian Lohmaier <[email protected]>
Date: Sun Mar 17 19:45:26 2013 +0100
allow openssl in the check-for-broken-make check als sha1sum variant
Mac OS X 10.5 doesn't come with a dedicated sha1sum, but has make 3.81.
Allow openssl as alternative for the makefile, after all it isn't sha1
that matters. (also XCode's make is not affected by that specific bug)
Change-Id: Id212fca588980f7e151120cdfe281f7b5d8ac5a4
Reviewed-on: https://gerrit.libreoffice.org/2804
Reviewed-by: Fridrich Strba <[email protected]>
Tested-by: Fridrich Strba <[email protected]>
diff --git a/configure.ac b/configure.ac
index 00a47f7..95f548a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4435,9 +4435,11 @@ elif test "$_make_longver" -ge "038100"; then
dnl ===================================================================
dnl Search all the common names for sha1sum
dnl ===================================================================
- AC_PATH_PROGS(SHA1SUM, sha1sum sha1 shasum)
+ AC_CHECK_PROGS(SHA1SUM, sha1sum sha1 shasum openssl)
if test -z "$SHA1SUM"; then
AC_MSG_ERROR([install the approproate SHA-1 checksumming program for
this OS])
+ elif test "$SHA1SUM" = "openssl"; then
+ SHA1SUM="openssl sha1"
fi
AC_MSG_CHECKING([for GNU make bug 20033])
TESTGMAKEBUG20033=`mktemp -d tmp.XXXXXX`
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
