From c9e3885ea7c950b4784b01ab0f42e92824a779c0 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Fri, 17 Jun 2011 03:05:26 +0300
Subject: [PATCH] Use LIBXML_CFLAGS if SYSTEM_LIBXML

---
 filter/source/config/fragments/makefile.mk | 10 ++++++++++
 filter/source/xsltfilter/makefile.mk       |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/filter/source/config/fragments/makefile.mk b/filter/source/config/fragments/makefile.mk
index 716c31891da8..6ad90259aa64 100644
--- a/filter/source/config/fragments/makefile.mk
+++ b/filter/source/config/fragments/makefile.mk
@@ -176,6 +176,15 @@ ALLTAR : $(ALL_FLAGS)
 
 $(ALL_FLAGS) : $(INCLUDE_FRAGMENTS)
 
+.IF "$(CROSS_COMPILING)" == "YES"
+
+# Just assume cross-compiling from a sane system with a sane java
+# command... Too bored now to start propagating all the crazy
+# possibilities for Java as FOR_BUILD variants
+
+MERGE    := java -jar $(SOLARBINDIR)$/FCFGMerge.jar
+
+.ELSE
 .IF "$(SOLAR_JAVA)"==""
 #cmc, hack to workaround the java build requirement
 .IF "$(SYSTEM_PYTHON)" == "YES"
@@ -186,6 +195,7 @@ MERGE:=$(AUGMENT_LIBRARY_PATH) PYTHONPATH=$(SOLARLIBDIR)/python $(SOLARBINDIR)/p
 .ELSE
 MERGE    := $(JAVAI) $(JAVAIFLAGS) -jar $(SOLARBINDIR)$/FCFGMerge.jar
 .ENDIF
+.ENDIF
 
 PACKLANG := $(XSLTPROC) --nonet
 PACKLANG_IN :=
diff --git a/filter/source/xsltfilter/makefile.mk b/filter/source/xsltfilter/makefile.mk
index 539469f55fc7..567b37f1bb65 100644
--- a/filter/source/xsltfilter/makefile.mk
+++ b/filter/source/xsltfilter/makefile.mk
@@ -43,6 +43,10 @@ LIBXSLTINCDIR=external$/libxslt
 CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
 .ENDIF
 
+.IF "$(SYSTEM_LIBXML)" == "YES"
+CFLAGS+= $(LIBXML_CFLAGS)
+.ENDIF
+
 SLOFILES=$(SLO)$/XSLTFilter.obj $(SLO)$/LibXSLTTransformer.obj $(SLO)/OleHandler.obj
 LIBNAME=xsltfilter
 SHL1TARGETDEPN=makefile.mk