[Libreoffice-commits] .: configure.in

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Fri Mar 30 00:00:31 PDT 2012


 configure.in |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit df72f234c296ae7b3d708a435419f93f817f36c6
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Mar 30 01:59:36 2012 -0500

    don't force dependecy on shasum when it is not needed
    
    shasum is only needed to detect a bug in some version of gnumkae
    do not burden platform with a non-impacted gnu make with
    that requirement

diff --git a/configure.in b/configure.in
index face6c2..e150c89 100644
--- a/configure.in
+++ b/configure.in
@@ -3614,14 +3614,6 @@ AC_MSG_CHECKING([whether to enable pch feature])
 AC_MSG_RESULT([no, obsolete])
 
 dnl ===================================================================
-dnl Search all the common names for sha1sum
-dnl ===================================================================
-AC_PATH_PROGS(SHA1SUM, sha1sum sha1 shasum)
-if test -z "$SHA1SUM"; then
-    AC_MSG_ERROR([install the approproate SHA-1 checksumming program for this OS])
-fi
-
-dnl ===================================================================
 dnl Search all the common names for GNU make
 dnl ===================================================================
 AC_MSG_CHECKING([for GNU make])
@@ -3653,6 +3645,14 @@ if test "$_make_longver" -ge "038200"; then
 
 elif test "$_make_longver" -ge "038100"; then
     AC_MSG_RESULT([$GNUMAKE $_make_version])
+
+    dnl ===================================================================
+    dnl Search all the common names for sha1sum
+    dnl ===================================================================
+    AC_PATH_PROGS(SHA1SUM, sha1sum sha1 shasum)
+    if test -z "$SHA1SUM"; then
+        AC_MSG_ERROR([install the approproate SHA-1 checksumming program for this OS])
+    fi
     AC_MSG_CHECKING([for GNU make bug 20033])
     TESTGMAKEBUG20033=`mktemp -d tmp.XXXXXX`
     cat > $TESTGMAKEBUG20033/Makefile << EOF


More information about the Libreoffice-commits mailing list