[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply           |    3 +++
 patches/dev300/win32-sdk7.diff |   13 +++++++++++++
 2 files changed, 16 insertions(+)

New commits:
commit 161c30bd29b6c518dfb60fccbecee0aba619c9fd
Author: unknown <tlillqvist at novell.com>
Date:   Tue Sep 22 21:26:54 2009 +0300

    Recognize also Windows SDK 7
    
    * patches/dev300/win32-sdk7.diff: New patch. Teach upstream
      configure.in about Windows SDK 7.
    
    * patches/dev300/apply: Add it to Fixes.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ce55ccb..dd1b5a9 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3031,6 +3031,9 @@ win32-tooltips.diff, tml
 # In Cygwin 1.7 the trailing dot hack from i#59477 is harmful
 win32-cygwin-1.7.diff, i#59477, tml
 
+# Recognize Windows SDK 7
+win32-sdk7.diff, tml
+
 [ Fixes ]
 # fix problem with calling private and protected members in layout code
 sfx2-privateprotectedpublic.diff
diff --git a/patches/dev300/win32-sdk7.diff b/patches/dev300/win32-sdk7.diff
new file mode 100644
index 0000000..118a44b
--- /dev/null
+++ b/patches/dev300/win32-sdk7.diff
@@ -0,0 +1,13 @@
+--- configure.in
++++ configure.in
+@@ -5193,6 +5193,9 @@
+     elif echo $PSDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then
+         AC_MSG_RESULT([Found Windows SDK 6.0 ($PSDK_HOME)])
+         WINDOWS_VISTA_PSDK=TRUE
++    elif echo $PSDK_HOME | grep "v7" >/dev/null 2>/dev/null; then
++        AC_MSG_RESULT([Found Windows SDK 7 ($PSDK_HOME)])
++        WINDOWS_VISTA_PSDK=TRUE
+     else
+         AC_MSG_RESULT([Found Legacy Windows Platform SDK ($PSDK_HOME)])
+     fi
+