[Libreoffice-commits] .: redland/raptor

[Tor Lillqvist]

 redland/raptor/makefile.mk |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 7a17b2b9d0e9bc0a95ba8bee72c2b24fb529005b
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Nov 3 15:12:26 2011 +0200

    Use xml2-config and xslt-config from our own copies if not using system ones

diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index d437a4d..6ddeef1 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -146,6 +146,15 @@ CONFIGURE_FLAGS=--disable-static
 .ENDIF
 # do not enable grddl parser (#i93768#)
 CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
+
+.IF "$(SYSTEM_LIBXML)" != "YES"
+CONFIGURE_FLAGS+=--with-xml2-config=$(SOLARVER)/$(INPATH)/bin/xml2-config
+.ENDIF
+
+.IF "$(SYSTEM_LIBXSLT)" != "YES"
+CONFIGURE_FLAGS+=--with-xslt-config=$(SOLARVER)/$(INPATH)/bin/xslt-config
+.ENDIF
+
 .IF "$(CROSS_COMPILING)"=="YES"
 CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 .ENDIF