mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: Fix Windows SDK 10 retrieval

Browse Source 
Change-Id: I800bd502c3ecd4ec1cdaa6cb3cbe1c4432d8358f
Reviewed-on: https://gerrit.libreoffice.org/22451
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
This commit is contained in:
David Ostrovsky
2016-02-18 00:30:16 +01:00
parent f8f6ea8a68
commit 9218ca6495
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
configure.ac
View File

@@ -3381,10 +3381,11 @@ find_msvs()
find_ucrt() find_ucrt()
{ {
reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows Kits/Installed Roots/KitsRoot10" reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/v10.0/InstallationFolder"
if test -n "$regvalue"; then if test -n "$regvalue"; then
ucrttest=$regvalue ucrttest=$regvalue
ucrtdir=10.0.10240.0 reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/v10.0/ProductVersion"
ucrtdir=$regvalue
fi fi
} }
@@ -3438,7 +3439,6 @@ if test "$_os" = "WINNT"; then
AC_MSG_CHECKING([Visual C++]) AC_MSG_CHECKING([Visual C++])
find_msvc "$with_visual_studio" find_msvc "$with_visual_studio"
if test -z "$vctest"; then if test -z "$vctest"; then
if test -n "$with_visual_studio"; then if test -n "$with_visual_studio"; then
AC_MSG_ERROR([No Visual Studio $with_visual_studio installation found]) AC_MSG_ERROR([No Visual Studio $with_visual_studio installation found])
@@ -3605,7 +3605,7 @@ if test "$_os" = "WINNT"; then
;; ;;
140) 140)
COMEX=19 COMEX=19
WINDOWS_SDK_ACCEPTABLE_VERSIONS="10.0A 8.1A 8.1 8.0 7.1A" WINDOWS_SDK_ACCEPTABLE_VERSIONS="10.0A 10.0 8.1A 8.1 8.0 7.1A"
;; ;;
esac esac
@@ -5309,11 +5309,12 @@ find_winsdk_version()
return return
fi fi
;; ;;
10) 10.0)
reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows Kits/Installed Roots/KitsRoot10" reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/v${1}/InstallationFolder"
if test -n "$regvalue"; then if test -n "$regvalue"; then
winsdktest=$regvalue winsdktest=$regvalue
winsdklibsubdir=10.0.10056.0 reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/v${1}/ProductVersion"
winsdklibsubdir=$regvalue
return return
fi fi
;; ;;
@@ -8837,7 +8838,7 @@ if test "$with_system_odbc" = "yes" -o '(' "$with_system_headers" = "yes" -a "$w
save_CPPFLAGS=$CPPFLAGS save_CPPFLAGS=$CPPFLAGS
find_winsdk find_winsdk
PathFormat "$winsdktest" PathFormat "$winsdktest"
CPPFLAGS="$CPPFLAGS -I$formatted_path/include/um -I$formatted_path/Include/$winsdklibsubdir/um -I$formatted_path/include -I$formatted_path/include/shared" CPPFLAGS="$CPPFLAGS -I$formatted_path/include/um -I$formatted_path/Include/$winsdklibsubdir/um -I$formatted_path/include -I$formatted_path/include/shared -I$formatted_path/include/$winsdklibsubdir/shared"
AC_CHECK_HEADER(sqlext.h, [], AC_CHECK_HEADER(sqlext.h, [],
[AC_MSG_ERROR(odbc not found. install odbc)], [AC_MSG_ERROR(odbc not found. install odbc)],
[#include <windows.h>]) [#include <windows.h>])