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

[rengelhard svn gnome org]

Author: rengelhard
Date: Fri Dec 26 11:09:10 2008
New Revision: 14942
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14942&view=rev

Log:
make cws-graphite01-20081226.diff apply

Modified:
   trunk/ChangeLog
   trunk/patches/dev300/cws-graphite01-20081226.diff

Modified: trunk/patches/dev300/cws-graphite01-20081226.diff
==============================================================================
--- trunk/patches/dev300/cws-graphite01-20081226.diff	(original)
+++ trunk/patches/dev300/cws-graphite01-20081226.diff	Fri Dec 26 11:09:10 2008
@@ -4335,6 +4335,7 @@
  	//	Groesse
 
  
+
 Index: config_office/configure.in
 ===================================================================
 --- config_office/configure.in	(.../tags/DEV300_m35)	(Revision 265804)
@@ -4349,9 +4350,9 @@
 +AC_ARG_WITH(system-graphite,
 +[  --with-system-graphite    use graphite library already installed on system
 +],,)
- AC_ARG_ENABLE(ldap,
- [  --disable-ldap          Disables the use of LDAP backend via Netscape/Mozilla
-                           or OpenLDAP LDAP SDK
+ AC_ARG_ENABLE(mono,
+ [  --enable-mono           Enables the compilation of the Mono bindings
+ ],,)
 @@ -4234,6 +4240,39 @@
  AC_SUBST(SYSTEM_GENCMN)
  
@@ -5523,8 +5524,8 @@
  
  SHL1TARGET= 	$(TARGET)$(DLLPOSTFIX)
  SHL1IMPLIB= 	i$(TARGET)
--SHL1STDLIBS=	$(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(CPPUHELPERLIB) $(BASEGFXLIB)
-+SHL1STDLIBS=	$(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(I18NISOLANGLIB)
+-SHL1STDLIBS=	$(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(BASEGFXLIB)
++SHL1STDLIBS=	$(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(BASEGFXLIB) $(I18NISOLANGLIB)
  
  SHL1LIBS=		$(SLB)$/$(TARGET).lib