diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2016-03-12 00:07:28 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2016-03-12 00:05:08 +0000 |
| commit | dc519b6dea7653e4b68b45aa664e3c0b5189d682 (patch) | |
| tree | 15be04d21f13a227522299818b8376744b38bc24 /configure.ac | |
| parent | 5da0983a7ce4bc28bff495ae09a218d26281a150 (diff) | |
Fix .NET detection on 32bit platform
Change-Id: I5eaa098d1de6b57245aca7bba2274139e60ba402
Reviewed-on: https://gerrit.libreoffice.org/23159
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files 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 } |