configure.ac | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
New commits:
commit 1457c6d4adae3fa3cbc5c25dafc64de849420f9e
Author: Juergen Funk <juergen.funk...@cib.de>
AuthorDate: Wed Sep 5 15:36:23 2018 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Tue Sep 25 00:12:31 2018 +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.
Reviewed-on: https://gerrit.libreoffice.org/60041
Tested-by: Jenkins
Reviewed-by: Juergen Funk (CIB) <juergen.funk...@cib.de>
(cherry picked from commit dfb18a0557d5a897f443fd1f1d617365f6ae134a)
Change-Id: I6a52fd20751ba139dd5ed6e3802f29c5e8f02975
Reviewed-on: https://gerrit.libreoffice.org/60684
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/configure.ac b/configure.ac
index 00807ded1efe..b7ec09a5f4ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5345,17 +5345,16 @@ find_winsdk_version()
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.15063"; then
- winsdklibsubdir="10.0.15063.0"
- dnl Hack needed at least by tml:
- if test ! -f "${winsdktest}/Include/10.0.15063.0/um/sqlext.h" \
- -a -f "${winsdktest}/Include/10.0.14393.0/um/sqlext.h"
- then
- winsdklibsubdir="10.0.14393.0"
- fi
+ 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
return
fi
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
