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

[pmladek svn gnome org]

Author: pmladek
Date: Thu Mar 27 17:01:09 2008
New Revision: 12022
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12022&view=rev

Log:
2008-03-27  Petr Mladek  <pmladek suse cz>

	* patches/src680/buildfix-enable-reportdesign-check.diff:
	* patches/src680/apply: fix the --enable-reportdesign configure check
	  to work
	* patches/src680/extensions_configure.diff: update the context
	  to follow the change in buildfix-enable-reportdesign-check.diff



Added:
   trunk/patches/src680/buildfix-enable-reportdesign-check.diff
Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/patches/src680/apply
   trunk/patches/src680/extensions_configure.diff

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Thu Mar 27 17:01:09 2008
@@ -1,3 +1,4 @@
+ooo-build-2.4.0.5
 ooo-build-2.4.0.4
 
 	+ features:

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Mar 27 17:01:09 2008
@@ -907,6 +907,8 @@
 # fix build with gcc-4.2.1 and -fvisibility-hidden
 buildfix-xmloff-exportxforms.diff, i#84965
 
+# fix the --enable-reportdesign configure check to work
+buildfix-enable-reportdesign-check.diff, pmladek
 
 [ NovellOnlyWin32 ]
 SectionOwner => tml

Added: trunk/patches/src680/buildfix-enable-reportdesign-check.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/buildfix-enable-reportdesign-check.diff	Thu Mar 27 17:01:09 2008
@@ -0,0 +1,11 @@
+--- config_office/configure.in.old	2008-03-20 21:10:37.000000000 +0100
++++ config_office/configure.in	2008-03-27 17:40:30.000000000 +0100
+@@ -5380,7 +5380,7 @@ else
+ fi
+ 
+ AC_MSG_CHECKING([whether to build the Report Builder extension])
+-if test -z "$enable_reportdesign" -a "$enable_reportdesign" != "no" && test "$WITH_JAVA" != "no"; then
++if test -z "$enable_reportdesign" -o "$enable_reportdesign" != "no" && test "$WITH_JAVA" != "no"; then
+   AC_MSG_RESULT([yes])
+   ENABLE_REPORTDESIGN=YES
+   AC_MSG_CHECKING([which jfreereport libs to use])

Modified: trunk/patches/src680/extensions_configure.diff
==============================================================================
--- trunk/patches/src680/extensions_configure.diff	(original)
+++ trunk/patches/src680/extensions_configure.diff	Thu Mar 27 17:01:09 2008
@@ -14,4 +14,4 @@
 +AC_SUBST(WITH_EXTENSION_SDEXT)
  
  AC_MSG_CHECKING([whether to build the Report Builder extension])
- if test -z "$enable_reportdesign" -a "$enable_reportdesign" != "no" && test "$WITH_JAVA" != "no"; then
+ if test -z "$enable_reportdesign" -o "$enable_reportdesign" != "no" && test "$WITH_JAVA" != "no"; then