[PATCH] allow openssl in the check-for-broken-make check als sha1sum...

[Christian Lohmaier (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2804

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/2804/1

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
---
M configure.ac
1 file changed, 3 insertions(+), 1 deletion(-)



diff --git a/configure.ac b/configure.ac
index 00a47f7..95f548a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4435,9 +4435,11 @@
     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`

-- 
To view, visit https://gerrit.libreoffice.org/2804
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id212fca588980f7e151120cdfe281f7b5d8ac5a4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>