[Libreoffice-commits] .: 2 commits - configure.in

[Tor Lillqvist]

 configure.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit febdb8aeb7dbb07b7380808ce0cecfa7bb2b6101
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Mar 30 09:39:07 2012 +0300

    Use mktemp(1) more portably

diff --git a/configure.in b/configure.in
index dcfb3ec..face6c2 100644
--- a/configure.in
+++ b/configure.in
@@ -3654,7 +3654,7 @@ if test "$_make_longver" -ge "038200"; then
 elif test "$_make_longver" -ge "038100"; then
     AC_MSG_RESULT([$GNUMAKE $_make_version])
     AC_MSG_CHECKING([for GNU make bug 20033])
-    TESTGMAKEBUG20033=`mktemp -d`
+    TESTGMAKEBUG20033=`mktemp -d tmp.XXXXXX`
     cat > $TESTGMAKEBUG20033/Makefile << EOF
 A := \$(wildcard *.a)
 
commit adf0076b56869d804fbdac774318e65ec0b28554
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Mar 30 09:35:09 2012 +0300

    Look for "shasum" (as on Mac OS X) too
    
    Hmm, /usr/bin/shasum is a Perl implementation (!), should we use
    "openssl sha1" instead?

diff --git a/configure.in b/configure.in
index bed0180..dcfb3ec 100644
--- a/configure.in
+++ b/configure.in
@@ -3616,9 +3616,9 @@ AC_MSG_RESULT([no, obsolete])
 dnl ===================================================================
 dnl Search all the common names for sha1sum
 dnl ===================================================================
-AC_PATH_PROGS(SHA1SUM, sha1sum sha1)
+AC_PATH_PROGS(SHA1SUM, sha1sum sha1 shasum)
 if test -z "$SHA1SUM"; then
-    AC_MSG_ERROR([install sha1sum to run this script])
+    AC_MSG_ERROR([install the approproate SHA-1 checksumming program for this OS])
 fi
 
 dnl ===================================================================