mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix .NET detection on 32bit platform

Browse Source 
Change-Id: I5eaa098d1de6b57245aca7bba2274139e60ba402
Reviewed-on: https://gerrit.libreoffice.org/23159
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
This commit is contained in:
David Ostrovsky
2016-03-12 00:07:28 +01:00
parent 5da0983a7c
commit dc519b6dea
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@@ -5279,13 +5279,17 @@ find_dotnetsdk46()
{ {
unset frametest unset frametest
for ver in 4.6; do for ver in 4.6.1 4.6; do
# TODO(davido): Do we need to take care about 32bit?
reg_get_value_64 "HKEY_LOCAL_MACHINE/SOFTWARE/Wow6432Node/Microsoft/Microsoft SDKs/NETFXSDK/$ver/KitsInstallationFolder" reg_get_value_64 "HKEY_LOCAL_MACHINE/SOFTWARE/Wow6432Node/Microsoft/Microsoft SDKs/NETFXSDK/$ver/KitsInstallationFolder"
if test -n "$regvalue"; then if test -n "$regvalue"; then
frametest=$regvalue frametest=$regvalue
return return
fi 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 done
} }