configure.ac | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 15966e0721af1d16243a032ec2832a66a069de93
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Date: Fri Sep 15 14:02:07 2017 +0200
al.exe not found on Windows 10 with VS 2017
Change-Id: I091c0cb9a33d5b52dfb34e54515d6c283d6efb96
Reviewed-on: https://gerrit.libreoffice.org/42323
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 00fc1aee1b0d..5f72318268ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5015,13 +5015,19 @@ find_al()
fi
done
- # We need this additional check to detect 4.6.2 or above.
- for ver in 4.7 4.6.2; do
+ # We need this additional check to detect 4.6.1 or above.
+ for ver in 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
return
fi
+
+ reg_get_value_32
"HKEY_LOCAL_MACHINE/SOFTWARE/WOW6432Node/Microsoft/Microsoft
SDKs/NETFXSDK/$ver/WinSDK-NetFx40Tools"
+ if test -n "$regvalue" -a \( -f "$regvalue/al.exe" -o -f
"$regvalue/bin/al.exe" \); then
+ altest=$regvalue
+ return
+ fi
done
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
