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

[David Ostrovsky]

 configure.ac |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit dc519b6dea7653e4b68b45aa664e3c0b5189d682
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Sat Mar 12 00:07:28 2016 +0100

    Fix .NET detection on 32bit platform
    
    Change-Id: I5eaa098d1de6b57245aca7bba2274139e60ba402
    Reviewed-on: https://gerrit.libreoffice.org/23159
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>

diff --git a/configure.ac b/configure.ac
index cd3d79a..23b6fb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5279,13 +5279,17 @@ find_dotnetsdk46()
 {
     unset frametest
 
-    for ver in 4.6; do
-        # TODO(davido): Do we need to take care about 32bit?
+    for ver in 4.6.1 4.6; do
         reg_get_value_64 "HKEY_LOCAL_MACHINE/SOFTWARE/Wow6432Node/Microsoft/Microsoft SDKs/NETFXSDK/$ver/KitsInstallationFolder"
         if test -n "$regvalue"; then
             frametest=$regvalue
             return
         fi
+        reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/NETFXSDK/$ver/KitsInstallationFolder"
+        if test -n "$regvalue"; then
+            frametest=$regvalue
+            return
+        fi
     done
 }