[Libreoffice-commits] .: configure.in

Thomas Klausner tklausner at kemper.freedesktop.org
Wed May 18 06:39:48 PDT 2011


 configure.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 990bae90ee785138dfc700b28b42330dcf4f2d9b
Author: Thomas Klausner <wiz at NetBSD.org>
Date:   Wed May 18 15:39:19 2011 +0200

    Use = in test(1).
    
    == is not portable, not even GNU coreutils test(1) supports it.

diff --git a/configure.in b/configure.in
index 844b463..89f6858 100755
--- a/configure.in
+++ b/configure.in
@@ -3287,10 +3287,10 @@ if test "$SOLAR_JAVA" != ""; then
    if test "$build_os" = "cygwin" -a "$_os" = "WINNT"; then
       # Check that the JDK found is correct architecture
       shortjdkhome=`cygpath -d "$with_jdk_home"`
-      if test "$CL_X64" != "" -a -f "$with_jdk_home/bin/java.exe" -a "`$shortjdkhome/bin/java.exe -version 2>&1 | grep -i 64-bit`" == "" >/dev/null; then
+      if test "$CL_X64" != "" -a -f "$with_jdk_home/bin/java.exe" -a "`$shortjdkhome/bin/java.exe -version 2>&1 | grep -i 64-bit`" = "" >/dev/null; then
 	 AC_MSG_WARN([You are building 64-bit binaries but the JDK $howfound is 32-bit])
 	 AC_MSG_ERROR([You should pass the --with-jdk-home option pointing to a 64-bit JDK])
-      elif test "$CL_X64" == "" -a -f "$_jdk_home/bin/java.exe" -a "`$shortjdkhome/bin/java.exe -version 2>&1 | grep -i 64-bit`" != ""  >/dev/null; then
+      elif test "$CL_X64" = "" -a -f "$_jdk_home/bin/java.exe" -a "`$shortjdkhome/bin/java.exe -version 2>&1 | grep -i 64-bit`" != ""  >/dev/null; then
 	 AC_MSG_WARN([You are building 32-bit binaries but the JDK $howfound is 64-bit])
 	 AC_MSG_ERROR([You should pass the --with-jdk-home option pointing to a (32-bit) JDK])
       fi


More information about the Libreoffice-commits mailing list