[PATCH 3/3] Make redland build on Mac with internal libxml
Fridrich Štrba
fridrich.strba at bluewin.ch
Mon Feb 27 01:52:50 PST 2012
---
redland/rasqal/makefile.mk | 4 ++++
redland/redland/makefile.mk | 4 ++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 71bee48..7a37759 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -113,6 +113,10 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
.ENDIF
.ENDIF # "$(SYSBASE)"!=""
+.IF "$(OS)"=="MACOSX" && "$(SYSTEM_LIBXML)" != "YES"
+LDFLAGS+:=-Wl,-dylib_file, at loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib
+.ENDIF
+
CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS)
LDFLAGS+:=$(EXTRA_LINKFLAGS)
XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 6113531..1268cbe 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -115,6 +115,10 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
.IF "$(OS)"=="MACOSX"
LDFLAGS+:=-Wl,-dylib_file, at loader_path/libraptor.1.dylib:$(PWD)/$(LB)/libraptor.1.dylib
+.IF "$(SYSTEM_LIBXML)" != "YES"
+LDFLAGS+:=-Wl,-dylib_file, at loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib
+.ENDIF
+
.ENDIF
CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS)
--
1.7.3.1
--------------010204010002090002070309--
More information about the LibreOffice
mailing list