ooo-build r12342 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Fri Apr 25 17:11:26 2008
New Revision: 12342
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12342&view=rev

Log:
2008-04-25  Tor Lillqvist  <tml novell com>

	* patches/dev300/msvs9-temporary-fix.diff
	(config_office/set_soenv.in): Backport one more snippet.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/msvs9-temporary-fix.diff

Modified: trunk/patches/dev300/msvs9-temporary-fix.diff
==============================================================================
--- trunk/patches/dev300/msvs9-temporary-fix.diff	(original)
+++ trunk/patches/dev300/msvs9-temporary-fix.diff	Fri Apr 25 17:11:26 2008
@@ -164,7 +164,7 @@
  
  sub msvc_copy_dlls($)
 --- config_office/set_soenv.in.BAK	2008-04-25 17:32:53.859375000 +0300
-+++ config_office/set_soenv.in	2008-04-25 17:33:36.328125000 +0300
++++ config_office/set_soenv.in	2008-04-25 20:06:49.687500000 +0300
 @@ -664,8 +664,14 @@
            $ATL_INCLUDE = $COMPATH.$ds."atlmfc".$ds."include";
            $MFC_LIB     = "";
@@ -182,3 +182,12 @@
            if ( "@DISABLE_ACTIVEX@" ) {
                $ATL_LIB     = $PSDK_HOME.$ds."lib"; # Doesn't exist for VSE
                $ATL_INCLUDE = $PSDK_HOME.$ds."include".$ds."atl";
+@@ -1225,7 +1231,7 @@
+ 	   if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
+ 		   $PATH .= $ps.$tmppath;
+ 	   }
+-	   if ( ( $COMEX eq "10" ) || ( $COMEX eq "11" ) ) {
++	   if ( ( $COMEX ge "10" ) ) {
+ 		   # .NET needs midl.exe
+                $tmppath = CygFormat($MIDL_PATH);
+ 		   if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {