[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-5-4-7-2' - configure.ac

[Juergen Funk (via logerrit)]

 configure.ac |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 5bd0fe89f87cd3c00da988809ecd0c42f57fb7d0
Author:     Juergen Funk <juergen.funk_ml at cib.de>
AuthorDate: Wed Sep 5 15:36:23 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue May 11 12:41:21 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_ml at cib.de>

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