From dc519b6dea7653e4b68b45aa664e3c0b5189d682 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sat, 12 Mar 2016 00:07:28 +0100 Subject: [PATCH] Fix .NET detection on 32bit platform Change-Id: I5eaa098d1de6b57245aca7bba2274139e60ba402 Reviewed-on: https://gerrit.libreoffice.org/23159 Tested-by: Jenkins Reviewed-by: David Ostrovsky --- configure.ac | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index cd3d79a17837..23b6fb0a7d3a 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 }