ooo-build r11606 - in trunk: . patches/src680

[tml svn gnome org]

Author: tml
Date: Mon Feb 18 10:55:00 2008
New Revision: 11606
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11606&view=rev

Log:
2008-02-18  Tor Lillqvist  <tml novell com>

	* patches/src680/win32-activex-disable.diff
	(config_office/configure.in): Clean up fuzziness. Use three
	context lines for the first chunk of this diff, too.



Modified:
   trunk/ChangeLog
   trunk/patches/src680/win32-activex-disable.diff

Modified: trunk/patches/src680/win32-activex-disable.diff
==============================================================================
--- trunk/patches/src680/win32-activex-disable.diff	(original)
+++ trunk/patches/src680/win32-activex-disable.diff	Mon Feb 18 10:55:00 2008
@@ -1,13 +1,15 @@
 --- config_office/configure.in	Wed May  3 15:15:00 2006
 +++ /mnt/pippi/src/2.0.2/build/OOO_2_0_2/config_office/configure.in	Wed May  3 14:38:03 2006
-@@ -74,4 +74,7 @@
-                                 set.
- ],,with_agfa_monotype_fonts="yes")
+@@ -74,6 +74,9 @@
+                           distributions where AFM files or TrueType Fonts
+                           are known to be available.
+ ],,)
 +AC_ARG_ENABLE(activex_component,
 +[  --disable-activex-component Remove support for ActiveX embedding of OOo
 +],,enable_activex_component=yes)
  AC_ARG_ENABLE(epm,
  [  --disable-epm           OO.o includes self-packaging code, that requires
+                           epm, however epm is useless for large scale
 @@ -4268,6 +4272,20 @@
  AC_SUBST(WITH_WRITER2LATEX)