diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-02-27 10:52:50 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-02-27 17:09:25 +0100 |
| commit | d87bbaf9bccc25b189ff11d8231ca210c69ce738 (patch) | |
| tree | 9c8263c901c866b1826255c1a7c1c6249bb37f80 | |
| parent | a44ee7caef5a1a5965e01ed598706e904dfc2253 (diff) | |
Make redland build on Mac with internal libxml
Signed-off-by: Petr Mladek <pmladek@suse.cz>
(cherry picked from commit bc09b5b62f1eac7a59340d549a5670d732b9a47c)
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
| -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 71bee48d72fa..7a377594d575 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,@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 6113531a83d4..1268cbee0d45 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,@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) |