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

[tml svn gnome org]

Author: tml
Date: Thu May  1 18:41:28 2008
New Revision: 12415
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12415&view=rev

Log:
2008-05-01  Tor Lillqvist  <tml novell com>

	* patches/src680/msvs9-temporary-fix.diff: Need a small patch also
	to config_office/configure.in after all so that midl.exe and
	mscoree.lib are found.

	Still need to figure out what to do with the search for
	instmsia.exe and instmsiw.exe. Those files are obsolete installers
	for Windows Installer 2 and not even shipped any more with
	MSVS2008 or Windows SDK 6.1. Probably it is pointless to including
	them with the OOo installer.



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	Thu May  1 18:41:28 2008
@@ -90,3 +90,27 @@
  }
  
  sub msvc_copy_dlls($)
+--- config_office/configure.in
++++ config_office/configure.in
+@@ -1758,6 +1758,12 @@
+ 		  MIDL_PATH="$vstest/Common7/Tools/Bin"
+       fi
+ 	fi
++	if test -z "$MIDL_PATH" ; then
++		psdktest=`./oowintool --psdk-home`
++		if test -x "$psdktest/Bin/midl.exe" ; then
++			MIDL_PATH="$psdktest/Bin"
++		fi
++	fi
+ 	if test ! -x "$MIDL_PATH/midl.exe"; then
+ 		AC_MSG_ERROR([midl.exe not found. Make sure it's in the path or use --with-midl-path])
+ 	fi
+@@ -1809,7 +1809,7 @@
+ 	    fi
+ 	    if test -z "$FRAME_HOME" ; then
+           frametest=`./oowintool --dotnetsdk-dir`
+-          if test -x "$frametest/lib/mscoree.lib"; then
++          if test -f "$frametest/lib/mscoree.lib"; then
+              FRAME_HOME="$frametest"
+           fi
+ 	    fi