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

[Michael Meeks]

 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8769c3cd23ee1a0bf5db525ddd59bbb9a18dba4b
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Mon Jul 18 12:21:29 2011 +0100

    tweak euid check to use a simpler check instead

diff --git a/configure.in b/configure.in
index a714107..88f09bb 100755
--- a/configure.in
+++ b/configure.in
@@ -1309,10 +1309,7 @@ dnl check for required programs (grep, awk, sed, bash)
 dnl ===================================================================
 cat /dev/null > warn
 
-# $EUID is a bash-ism, so we can't assume its existence.  Unfortunately, some
-# shells (e.g. FreeBSD sh) will _always_ evaluate both sides of "test X -a Y",
-# so we use "test X && test Y" to avoid on-screen spewage about a "bad number".
-if test "z`uname -o 2>/dev/null`" = "zCygwin" && test "$EUID" -eq 0; then
+if test "z$EUID" = "z0" -a "z`uname -o 2>/dev/null`" = "zCygwin"; then
     AC_MSG_ERROR([You must build LibreOffice as a normal user - not using an administrative account])
 fi
 
commit 3038069520868bb65f6d9d1db43a1b932f7a9e19
Author: Mike Eberdt <libreme at comcast.net>
Date:   Fri Jul 15 12:09:31 2011 -0700

    Work around a bash-ism in configure.in

diff --git a/configure.in b/configure.in
index 8289e6e..a714107 100755
--- a/configure.in
+++ b/configure.in
@@ -1309,7 +1309,10 @@ dnl check for required programs (grep, awk, sed, bash)
 dnl ===================================================================
 cat /dev/null > warn
 
-if test "$EUID" -eq "0"  -a "z`uname -o 2>/dev/null`" = "zCygwin" ; then
+# $EUID is a bash-ism, so we can't assume its existence.  Unfortunately, some
+# shells (e.g. FreeBSD sh) will _always_ evaluate both sides of "test X -a Y",
+# so we use "test X && test Y" to avoid on-screen spewage about a "bad number".
+if test "z`uname -o 2>/dev/null`" = "zCygwin" && test "$EUID" -eq 0; then
     AC_MSG_ERROR([You must build LibreOffice as a normal user - not using an administrative account])
 fi