configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7482eeb97d1647f0c39ebb0b5351aebc71a2e428
Author: Mike Kaganski <mike.kagan...@collabora.com>
Date: Thu Apr 5 23:15:03 2018 +0100
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 <c...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit 5bf00019c2bbe2045d3da7d98552c601309142b5)
Reviewed-on: https://gerrit.libreoffice.org/53304
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
