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

Christian Lohmaier lohmaier+LibreOffice at googlemail.com
Sat Apr 19 15:13:48 PDT 2014


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

New commits:
commit 7f62b44458fb27f8aca652436aeafb5e033264bd
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sun Apr 20 00:11:22 2014 +0200

    java home for JDK 1.8 can also be found in registry
    
    Change-Id: I0179696962c300792f75bf41171514be3ddaa76e

diff --git a/configure.ac b/configure.ac
index a0a91bd..818c3d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6712,7 +6712,7 @@ if test "$ENABLE_JAVA" != ""; then
         fi
 
         if test -z "$with_jdk_home"; then
-            for ver in 1.7 1.6; do
+            for ver in 1.8 1.7 1.6; do
                reg_get_value_$bitness "HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java Development Kit/$ver/JavaHome"
                if test -n "$regvalue"; then
                    _jdk_home=$regvalue


More information about the Libreoffice-commits mailing list