[PATCH] make libxslt link with the right libxml

Fridrich Štrba fridrich.strba at bluewin.ch
Tue Feb 28 05:54:20 PST 2012


---
 libxslt/makefile.mk |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index cc89185..d21c0e3 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -86,6 +86,11 @@ CONF_ILIB=
 .ELSE
 CONF_ILIB=-L$(ILIB:s/;/ -L/)
 .ENDIF
+
+.IF "$(OS)"=="MACOSX" && "$(SYSTEM_LIBXML)" != "YES"
+LIBXML2LIB=-L$(SOLARLIBDIR) -lxml2
+.ENDIF
+
 CONFIGURE_FLAGS=--without-crypto --without-python --enable-static=no $(BUILD_AND_HOST) CC="$(xslt_CC)" CFLAGS="$(xslt_CFLAGS)" LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 $(CONF_ILIB)" LIBS="$(xslt_LIBS)"  LIBXML2LIB=$(LIBXML2LIB) OBJDUMP=objdump
 BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-- 
1.7.3.1


--------------010004080506000500080003--


More information about the LibreOffice mailing list