[Libreoffice-commits] core.git: 3 commits - configure.ac

[Tor Lillqvist]

 configure.ac |   32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

New commits:
commit ffaad89e05fdb889d2b18d5914894acb91e1248e
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Aug 30 09:56:57 2013 +0300

    Untabify
    
    Change-Id: Ib03ac597e920c3d09b56a78f41f10ea0e19e311e

diff --git a/configure.ac b/configure.ac
index 79f8aa1..75ffd04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1705,10 +1705,10 @@ AC_ARG_WITH(help,
          can be used to bundle only the common part, .e.g help-specific icons.
          This is useful when you build the helpcontent separately.])
     [
-                          Usage:     --with-help	build the entire local help
-                        	     --without-help     no local help (default)
-                        	     --with-help=common bundle common files for the local
-                        	                        help but do not build the whole help
+                          Usage:     --with-help    build the entire local help
+                                 --without-help     no local help (default)
+                                 --with-help=common bundle common files for the local
+                                                    help but do not build the whole help
     ],
 ,)
 
@@ -4643,11 +4643,11 @@ if test -n "$with_help" -a "$with_help" != "no" -a $_os != iOS -a $_os != Androi
     BUILD_TYPE="$BUILD_TYPE HELP"
     GIT_NEEDED_SUBMODULES="helpcontent2 $GIT_NEEDED_SUBMODULES"
     if test "$with_help" = "common" ; then
-	HELP_COMMON_ONLY=TRUE
-	AC_MSG_RESULT([common only])
+        HELP_COMMON_ONLY=TRUE
+        AC_MSG_RESULT([common only])
     else
-	SCPDEFS="$SCPDEFS -DWITH_HELP"
-	AC_MSG_RESULT([yes])
+        SCPDEFS="$SCPDEFS -DWITH_HELP"
+        AC_MSG_RESULT([yes])
     fi
 else
     AC_MSG_RESULT([no])
@@ -9142,7 +9142,7 @@ if test "$enable_openssl" = "yes"; then
         AC_MSG_CHECKING([whether openssl supports SHA512])
         AC_LANG_PUSH([C])
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <openssl/sha.h>]],[[
-	SHA512_CTX context;
+            SHA512_CTX context;
 ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([no, openssl too old. Need >= 0.9.8.])])
         AC_LANG_POP(C)
     fi
commit c805a7107198350374420a83f57603d99da493f3
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Aug 30 09:55:30 2013 +0300

    Surely we want only a 1.7 or 1.6 JDK
    
    Change-Id: I3fa71d19789d9cbdc44db172e0a63f5e5ed85f43

diff --git a/configure.ac b/configure.ac
index fe91557..79f8aa1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6528,7 +6528,7 @@ if test "$ENABLE_JAVA" != ""; then
 
         if test -z "$with_jdk_home"; then
             # Currently only auto-detects 32-bit JDK
-            for ver in 1.7 1.6 1.5 1.4 1.3; do
+            for ver in 1.7 1.6; do
                reg_get_value "HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java Development Kit/$ver/JavaHome"
                if test -n "$regvalue"; then
                    _jdk_home=$regvalue
commit ada60644ca7010b7a93688e7c937ac03f891f1d9
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Aug 30 09:53:31 2013 +0300

    Fix weird indentation
    
    Change-Id: I291856b9f37ea967c1f8d44cce05f53b52ed8b75

diff --git a/configure.ac b/configure.ac
index ef10c70..fe91557 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6528,13 +6528,13 @@ if test "$ENABLE_JAVA" != ""; then
 
         if test -z "$with_jdk_home"; then
             # Currently only auto-detects 32-bit JDK
-                        for ver in 1.7 1.6 1.5 1.4 1.3; do
-                        reg_get_value "HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java Development Kit/$ver/JavaHome"
-                        if test -n "$regvalue"; then
-                                _jdk_home=$regvalue
-                                break
-                        fi
-                        done
+            for ver in 1.7 1.6 1.5 1.4 1.3; do
+               reg_get_value "HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java Development Kit/$ver/JavaHome"
+               if test -n "$regvalue"; then
+                   _jdk_home=$regvalue
+                   break
+               fi
+            done
             if test -f "$_jdk_home/lib/jvm.lib" -a -f "$_jdk_home/bin/java.exe"; then
                 with_jdk_home="$_jdk_home"
                 howfound="found automatically"