[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - configure.ac

[Tor Lillqvist]

 configure.ac |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 54767afcb7179afe733152dcf93802cc2f99e7b6
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu May 10 14:43:10 2018 +0300

    Also for SDK 10.0.17134 the winsdklibsubdir needs to have a .0 tacked on
    
    Also remove questionable old "Hack needed at least by tml".
    
    Change-Id: I478358ea114cee2f8a181b98cb3433447b3ed560
    Reviewed-on: https://gerrit.libreoffice.org/54081
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    (cherry picked from commit fc00041df85fd508d1fc34658d4c9ceeb10084b1)

diff --git a/configure.ac b/configure.ac
index 6a7e539ab8e5..bdfe52a494d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5083,12 +5083,8 @@ find_winsdk_version()
                 winsdklibsubdir="10.0.16299.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
+            elif test "$regvalue" = "10.0.17134"; then
+                winsdklibsubdir="$regvalue.0"
             fi
             return
         fi