diff options
author | Juergen Funk <juergen.funk_ml@cib.de> | 2018-09-05 15:36:23 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2021-05-11 12:41:21 +0200 |
commit | 5bd0fe89f87cd3c00da988809ecd0c42f57fb7d0 (patch) | |
tree | 9c6b3280a1a4632f863ef715fd1f8cc4a7e1ca1e | |
parent | f95986bf8f1641f1bdd6235fc60c8ab411a56ed9 (diff) |
Improve the Windows SDK 10 ProductVersion-Pathmimo-5.4.7.2.M7
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_ml@cib.de>
-rw-r--r-- | configure.ac | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index bab32d23e6fa..a4dc1c7d2622 100644 --- a/configure.ac +++ b/configure.ac @@ -5193,17 +5193,16 @@ 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.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" + 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 |