[Libreoffice-commits] .: libxslt/makefile.mk

[Tor Lillqvist]

 libxslt/makefile.mk |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 4abf8729b8344a4d2084ba299b570ec7badc5a10
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Nov 3 14:42:17 2011 +0200

    Use the xml2-config from our own libxml2 copy if not using a system libxml2

diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index fe808dd..f884c35 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -134,6 +134,9 @@ CONFIGURE_ACTION=.$/configure
 # and we want it to find our dummy one that prints the LIBXML_CFLAGS and LIBXML_LIBS that
 # the configure script found out.
 CONFIGURE_FLAGS=--disable-shared --with-libxml-prefix=$(SRC_ROOT)/$(PRJNAME)/dummy
+.ELIF "$(SYSTEM_LIBXML)"!="YES"
+# Use the xml2-config from our own libxml2 copy
+CONFIGURE_FLAGS=--disable-static --with-libxml-prefix=$(SOLARVER)/$(INPATH)
 .ELSE
 CONFIGURE_FLAGS=--disable-static
 .ENDIF