configure.ac | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
New commits:
commit b341657aa04cd3d7910d0765424649e990b03d80
Author: Juergen Funk <juergen.funk...@cib.de>
AuthorDate: Wed Sep 5 15:36:23 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue May 11 12:38:59 2021 +0200
Improve the Windows SDK 10 ProductVersion-Path
At the moment the ProductVersion-Path has always the same format,
with this patch, when the format the same, then no change is need for
the next Version.
Change-Id: I6a52fd20751ba139dd5ed6e3802f29c5e8f02975
Reviewed-on: https://gerrit.libreoffice.org/60041
Tested-by: Jenkins
Reviewed-by: Juergen Funk (CIB) <juergen.funk...@cib.de>
diff --git a/configure.ac b/configure.ac
index 34720ba7e7b9..b1a8fd178d08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5240,16 +5240,17 @@ find_winsdk_version()
reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/v${1}/ProductVersion"
if test -n "$regvalue"; then
winsdkbinsubdir="$regvalue".0
- fi
- winsdklibsubdir=$regvalue
- if test "$regvalue" = "10.0.14393"; then
- winsdklibsubdir="10.0.14393.0"
- elif test "$regvalue" = "10.0.16299"; then
- winsdklibsubdir="10.0.16299.0"
- elif test "$regvalue" = "10.0.15063"; then
- winsdklibsubdir="10.0.15063.0"
- elif test "$regvalue" = "10.0.17134"; then
- winsdklibsubdir="$regvalue.0"
+ winsdklibsubdir=$winsdkbinsubdir
+ tmppath="$winsdktest\\Include\\$winsdklibsubdir"
+ # test exist the SDK path
+ if test -d "$tmppath"; then
+ # when path is convertable to a short path then path is okay
+ if ! cygpath -d "$tmppath"; then
+ AC_MSG_ERROR([Windows SDK doesn't have a 8.3 name, see
NtfsDisable8dot3NameCreation])
+ fi
+ else
+ AC_MSG_ERROR([The Windows SDK not found, check the
installation])
+ fi
fi
return
fi
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
