diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-04-05 23:15:03 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-04-23 16:48:36 +0200 |
| commit | 7482eeb97d1647f0c39ebb0b5351aebc71a2e428 (patch) | |
| tree | 3c0a01ab2e1404aea7772ed42edfcd057bcefb7e /configure.ac | |
| parent | 33f943e14e27319848c925b9d06bf0cba7b5e1b5 (diff) | |
Allow .NET SDK 4.7.1
The relevant error message in configure is:
> checking for al.exe... configure: error: al.exe not found as /al.exe
Change-Id: I24be20fdedf36153e4012dde6d7cc899098f769e
Reviewed-on: https://gerrit.libreoffice.org/52479
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 5bf00019c2bbe2045d3da7d98552c601309142b5)
Reviewed-on: https://gerrit.libreoffice.org/53304
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index f9c74db50a0c..a0dcd888b933 100644 --- a/configure.ac +++ b/configure.ac @@ -4988,7 +4988,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 @@ -5022,7 +5022,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 |