diff options
| author | Tor Lillqvist <tml@collabora.com> | 2018-05-10 14:43:10 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-05-31 18:05:48 +0300 |
| commit | 54767afcb7179afe733152dcf93802cc2f99e7b6 (patch) | |
| tree | 8dcc1a5d5bfe3ab0b4dc16c921bfe0bd7f3f8187 /configure.ac | |
| parent | tdf#38225: update API name when renaming using a base class ref (diff) | |
| download | core-54767afcb7179afe733152dcf93802cc2f99e7b6.tar.gz core-54767afcb7179afe733152dcf93802cc2f99e7b6.zip | |
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@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
(cherry picked from commit fc00041df85fd508d1fc34658d4c9ceeb10084b1)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 2 insertions, 6 deletions
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 |