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

[thorstenb svn gnome org]

Author: thorstenb
Date: Mon Jul 21 20:39:26 2008
New Revision: 13335
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13335&view=rev

Log:
	* patches/dev300/apply:
	* patches/dev300/xmlsecurity-disable-moz.diff: refuse building
	xmlsecurity/source/xmlsec with disabled moz, as later the util
	makefile skips everything anyway.



Added:
   trunk/patches/dev300/xmlsecurity-disable-moz.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul 21 20:39:26 2008
@@ -2620,6 +2620,7 @@
 config_office-msvc-compat.diff, thorsten
 config_office-disable-atl.diff, thorsten
 tools-resmgr-expansion-fix.diff, i#90178, caolan
+xmlsecurity-disable-moz.diff, thorsten
 
 sw-source-filter-ww8-continous-section-break-fix.diff, n#405071, i#91395, fridrich
 

Added: trunk/patches/dev300/xmlsecurity-disable-moz.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/xmlsecurity-disable-moz.diff	Mon Jul 21 20:39:26 2008
@@ -0,0 +1,22 @@
+--- xmlsecurity/source/xmlsec/makefile.mk	11 Apr 2008 00:27:38 -0000	1.11
++++ xmlsecurity/source/xmlsec/makefile.mk	21 Jul 2008 20:26:56 -0000
+@@ -45,14 +45,15 @@
+ CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
+ .ENDIF
+ 
+-.IF "$(CRYPTO_ENGINE)" == "mscrypto"
+-CDEFS += -DXMLSEC_CRYPTO_MSCRYPTO -DXMLSEC_NO_XSLT
+-.ELSE
+-CDEFS += -DXMLSEC_CRYPTO_NSS -DXMLSEC_NO_XSLT
+ .IF "$(WITH_MOZILLA)" == "NO"
+ @all:
+ 	@echo "No mozilla -> no nss -> no libxmlsec -> no xmlsecurity.."
+ .ENDIF
++
++.IF "$(CRYPTO_ENGINE)" == "mscrypto"
++CDEFS += -DXMLSEC_CRYPTO_MSCRYPTO -DXMLSEC_NO_XSLT
++.ELSE
++CDEFS += -DXMLSEC_CRYPTO_NSS -DXMLSEC_NO_XSLT
+ .ENDIF
+ 
+ # --- Files --------------------------------------------------------