[ooo-build-commit] .: 2 commits - configure.in solenv/bin

[Fridrich Strba]

 configure.in                            |    3 +++
 solenv/bin/modules/installer/control.pm |    7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit de2eecc338d75faa973b6ceaa9bbb7b1e34f3402
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Sep 14 12:03:43 2010 +0200

    win32-cygwin-1.7.diff: Fix windows build using cygwin 1.7
    
    i#59477

diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 4d3ff0b..5f7c2ca 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -87,9 +87,14 @@ sub check_system_path
     
     if( $^O =~ /cygwin/i )
     {	# When using cygwin's perl the PATH variable is POSIX style and ...
-        $pathvariable = qx{cygpath -mp "$pathvariable"} ;
+        my $temparrayref = installer::converter::convert_stringlist_into_array_without_newline(\$pathvariable, $local_pathseparator);
+        foreach $i (0..$#$temparrayref) {
+            $$temparrayref[$i] = qx{cygpath -m "$$temparrayref[$i]"};
+            chomp($$temparrayref[$i]);
+        }
         # has to be converted to DOS style for further use.
         $local_pathseparator = ';';
+        $pathvariable = join($local_pathseparator, @$temparrayref);
     }
     my $patharrayref = installer::converter::convert_stringlist_into_array(\$pathvariable, $local_pathseparator);
     
commit 66d80a6e5cfedc62f93ba3e8b9ad741599512c1f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Sep 14 12:00:20 2010 +0200

    win32-sdk7.diff: Recognize Windows SDK 7

diff --git a/configure.in b/configure.in
index f0e170e..04636fb 100644
--- a/configure.in
+++ b/configure.in
@@ -5373,6 +5373,9 @@ dnl Check if this is the right SDK.
     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