configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d82a249a6fc8c7c34db5215428b97fede4876461
Author: Michael Stahl <[email protected]>
Date: Tue Mar 3 23:33:48 2015 +0100
configure: properly check for Windows SDK 8.1A
Due to the wildcard checking for it will actually attempt to check for the
SDK 8.0, which fails with Visual Studio 2013 because its SDK 8.0 apparently
lacks a midl.exe, so configure fails.
Change-Id: Ib0e61a3a999d6a2ebe16645225fc9838dab3bdb1
(cherry picked from commit c503d3780fd095cc94103bf0f89b662c446b3b2b)
Reviewed-on: https://gerrit.libreoffice.org/14736
Reviewed-by: Caolán McNamara <[email protected]>
Tested-by: Caolán McNamara <[email protected]>
diff --git a/configure.ac b/configure.ac
index f1acf06..05a2066 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5080,7 +5080,7 @@ find_winsdk_version()
return
fi
;;
- 8.1)
+ 8.1|8.1A)
reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows
Kits/Installed Roots/KitsRoot81"
if test -n "$regvalue"; then
winsdktest=$regvalue
@@ -5088,7 +5088,7 @@ find_winsdk_version()
return
fi
;;
- 8.*)
+ 8.0|8.0A)
reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows
Kits/Installed Roots/KitsRoot"
if test -n "$regvalue"; then
winsdktest=$regvalue
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
