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

[thorstenb svn gnome org]

Author: thorstenb
Date: Mon Sep  1 21:53:18 2008
New Revision: 13752
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13752&view=rev

Log:
    * patches/dev300/config_office-msvc-compat.diff: added smallish
    tweak to configure, detecting SDK-included mscoree.lib.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/config_office-msvc-compat.diff

Modified: trunk/patches/dev300/config_office-msvc-compat.diff
==============================================================================
--- trunk/patches/dev300/config_office-msvc-compat.diff	(original)
+++ trunk/patches/dev300/config_office-msvc-compat.diff	Mon Sep  1 21:53:18 2008
@@ -105,3 +105,17 @@
      print cygpath($dir, 'w', $output_format); 
  }
  
+--- config_office/configure.in
++++ config_office/configure.in
+@@ -1877,6 +1877,11 @@ if test "$COMEX" -ge "10"; then
+           frametest=`./oowintool --dotnetsdk-dir`
+           if test -f "$frametest/lib/mscoree.lib"; then
+              FRAME_HOME="$frametest"
++          else
++             frametest=`./oowintool --psdk-home`
++             if test -f "$frametest/lib/mscoree.lib"; then
++                FRAME_HOME="$frametest"
++             fi
+           fi
+ 	    fi
+ 	    if test ! -f "$FRAME_HOME/lib/mscoree.lib"; then