summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2018-05-10 14:43:10 +0300
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2019-11-29 07:51:50 +0100
commit9475fda898c9750b1daff19a87ae5de192ae8c06 (patch)
tree9c22d318e82d4880f1b8292ed1cb54f38f454d2a
parentfc7786c5cbcc38d55ac85c81895fd907b90ff38e (diff)
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)
-rw-r--r--configure.ac8
1 files changed, 2 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index cce6cbb5f024..19487e019ff5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5201,12 +5201,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