diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-02-27 10:52:50 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-03-20 14:43:27 +0100 |
| commit | de01d3c6d3f9a617d0a7d5b95305c7c3b68d39d6 (patch) | |
| tree | 0965141d516052672b835ad39d85fe9e83b42eaf /redland | |
| parent | dae9dd4cff2659abb51d0de14c5bb5a734a20aa1 (diff) | |
Make redland build on Mac with internal libxml
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'redland')
| -rw-r--r-- | redland/rasqal/makefile.mk | 4 | ||||
| -rw-r--r-- | 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 45dbba6f93fe..6f356dbaabba 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -116,6 +116,10 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .ENDIF .ENDIF # "$(SYSBASE)"!="" +.IF "$(OS)"=="MACOSX" && "$(SYSTEM_LIBXML)" != "YES" +LDFLAGS+:=-Wl,-dylib_file,@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 0ce48c43228c..4644611b824f 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -118,6 +118,10 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .IF "$(OS)"=="MACOSX" LDFLAGS+:=-Wl,-dylib_file,@loader_path/libraptor.1.dylib:$(PWD)/$(LB)/libraptor.1.dylib +.IF "$(SYSTEM_LIBXML)" != "YES" +LDFLAGS+:=-Wl,-dylib_file,@loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib +.ENDIF + .ENDIF CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS) |