ooo-build r11609 - in trunk: . distro-configs patches/src680

[strba svn gnome org]

Author: strba
Date: Mon Feb 18 12:22:10 2008
New Revision: 11609
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11609&view=rev

Log:
reenable build-java-target.diff and add --without-system-libxslt into the GoOoLinux configuration

Modified:
   trunk/ChangeLog
   trunk/distro-configs/GoOoLinux.conf.in
   trunk/patches/src680/apply

Modified: trunk/distro-configs/GoOoLinux.conf.in
==============================================================================
--- trunk/distro-configs/GoOoLinux.conf.in	(original)
+++ trunk/distro-configs/GoOoLinux.conf.in	Mon Feb 18 12:22:10 2008
@@ -22,6 +22,7 @@
 --without-system-freetype
 --without-system-jpeg
 --without-system-libxml
+--without-system-libxslt
 --without-system-python
 --without-system-zlib
 --without-system-jars

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Mon Feb 18 12:22:10 2008
@@ -948,7 +948,7 @@
 [ BuildBits >= ooh680-m4 ]
 # allow to define java target, so the build is usable with the JVM 1.4
 # even when it is built with JDK 1.5
-#build-java-target.diff, pmladek
+build-java-target.diff, pmladek
 
 [ BuildBits < ooh680-m5 ]
 # don't include asm/sigcontext.h, see Debian Bug #442418