diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-08-24 15:52:09 -0400 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-10-07 02:03:06 +0000 |
| commit | ffbcd1c8b4ff839a16ddd93cdf6eec82bccf8eb4 (patch) | |
| tree | 203749d0232088176dfafd3b065713ad1490ee8f /configure.in | |
| parent | fix lcms2 build with VC2012 (diff) | |
| download | core-ffbcd1c8b4ff839a16ddd93cdf6eec82bccf8eb4.tar.gz core-ffbcd1c8b4ff839a16ddd93cdf6eec82bccf8eb4.zip | |
fix canvas build with Win8 SDK
Change-Id: I17bd44ba8f5a6484d10bb64201ace8e030cf334d
Reviewed-on: https://gerrit.libreoffice.org/789
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.in b/configure.in index e3c73beaa44c..1655e2d32a44 100644 --- a/configure.in +++ b/configure.in @@ -9057,12 +9057,16 @@ the Windows SDK are installed.]) if test -z "$WINDOWS_SDK_HOME"; then AC_MSG_RESULT([no, hoping the necessary headers and libraries will be found anyway]) elif echo $WINDOWS_SDK_HOME | grep "v6.1" >/dev/null 2>/dev/null; then + WINDOWS_SDK_VERSION=61 AC_MSG_RESULT([found Windows SDK 6.1 ($WINDOWS_SDK_HOME)]) elif echo $WINDOWS_SDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then + WINDOWS_SDK_VERSION=60 AC_MSG_RESULT([found Windows SDK 6.0 ($WINDOWS_SDK_HOME)]) elif echo $WINDOWS_SDK_HOME | grep "v7" >/dev/null 2>/dev/null; then + WINDOWS_SDK_VERSION=70 AC_MSG_RESULT([found Windows SDK 7 ($WINDOWS_SDK_HOME)]) elif echo $WINDOWS_SDK_HOME | grep "8.0" >/dev/null 2>/dev/null; then + WINDOWS_SDK_VERSION=80 AC_MSG_RESULT([found Windows SDK 8.0 ($WINDOWS_SDK_HOME)]) else AC_MSG_ERROR([Found legacy Windows Platform SDK ($WINDOWS_SDK_HOME)]) @@ -9077,6 +9081,7 @@ the Windows SDK are installed.]) fi fi AC_SUBST(WINDOWS_SDK_HOME) +AC_SUBST(WINDOWS_SDK_VERSION) dnl ========================================= dnl Check for uuidgen |