diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-04-05 23:15:03 +0100 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-04-06 06:16:31 +0200 |
| commit | 5bf00019c2bbe2045d3da7d98552c601309142b5 (patch) | |
| tree | 7060efb063c8b9ab245cc06499ee03ab9ac8557a | |
| parent | 6c737accd9fa2fed868ca304bb59acc30df55679 (diff) | |
Allow .NET SDK 4.7.1
Change-Id: I24be20fdedf36153e4012dde6d7cc899098f769e
Reviewed-on: https://gerrit.libreoffice.org/52479
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 744b4ee4b2ed..aa44107f8e79 100644 --- a/configure.ac +++ b/configure.ac @@ -5113,7 +5113,7 @@ find_al() done # We need this additional check to detect 4.6.1 or above. - for ver in 4.7 4.6.2 4.6.1; do + for ver in 4.7.1 4.7 4.6.2 4.6.1; do reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/NETFXSDK/$ver/WinSDK-NetFx40Tools/InstallationFolder" if test -n "$regvalue" -a \( -f "$regvalue/al.exe" -o -f "$regvalue/bin/al.exe" \); then altest=$regvalue @@ -5147,7 +5147,7 @@ find_dotnetsdk46() { unset frametest - for ver in 4.7 4.6.2 4.6.1 4.6; do + for ver in 4.7.1 4.7 4.6.2 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 |