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

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Feb  5 08:29:00 2008
New Revision: 11499
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11499&view=rev

Log:
2008-02-05  Rene Engelhard  <rene debian org>

        * patches/src680/apply,
          patches/src680/config_office-liblayout-libfonts.diff: fix
          --with-libfonts-jar, add missing --with-libloader-jar


Added:
   trunk/patches/src680/config_office-liblayout-libfonts.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Tue Feb  5 08:29:00 2008
@@ -1062,6 +1062,8 @@
 # Use -Bdirect linking - this is a really marginal win.
 speed-bdirect.diff, i#58119, brosenk
 
+# fix configure.in
+config_office-liblayout-libfonts.diff
 
 [ MandrivaOnly ]
 SectionOwner => gghibo

Added: trunk/patches/src680/config_office-liblayout-libfonts.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/config_office-liblayout-libfonts.diff	Tue Feb  5 08:29:00 2008
@@ -0,0 +1,22 @@
+--- config_office/configure.in-old	2008-02-05 09:22:27.000000000 +0100
++++ config_office/configure.in	2008-02-05 09:23:17.000000000 +0100
+@@ -383,6 +383,10 @@
+ [  --with-liblayout-jar=JARFILE   Specify path to jarfile manually ],
+ [ LIBLAYOUT_JAR="$withval"
+ ])
++AC_ARG_WITH(libloader-jar,
++[  --with-libloader-jar=JARFILE   Specify path to jarfile manually ],
++[ LIBLOADER_JAR="$withval"
++])
+ AC_ARG_WITH(libformula-jar,
+ [  --with-libformula-jar=JARFILE   Specify path to jarfile manually ],
+ [ LIBFORMULA_JAR="$withval"
+@@ -391,7 +395,7 @@
+ [  --with-librepository-jar=JARFILE   Specify path to jarfile manually ],
+ [ LIBREPOSITORY_JAR="$withval"
+ ])
+-AC_ARG_WITH(libfonts-java-jar,
++AC_ARG_WITH(libfonts-jar,
+ [  --with-libfonts-jar=JARFILE   Specify path to jarfile manually ],
+ [ LIBFONTS_JAR="$withval"
+ ])