diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-02-27 09:24:42 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-03-20 14:43:27 +0100 |
| commit | dae9dd4cff2659abb51d0de14c5bb5a734a20aa1 (patch) | |
| tree | a12a4bfc3fd95453ad37cc06e4f90535f4cc6f20 /librsvg | |
| parent | baeb77aaaada20b7f9df7153b42f08f5aec57f72 (diff) | |
Make librsvg link with internal libxml
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'librsvg')
| -rwxr-xr-x | librsvg/makefile.mk | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk index 1348a04b7705..2383167c01bd 100755 --- a/librsvg/makefile.mk +++ b/librsvg/makefile.mk @@ -57,14 +57,24 @@ PATCH_FILES=librsvg-2.32.1.patch LIBXML_LIBS=-lxml2 .ENDIF +.IF "$(SYSTEM_LIBXML)" == "YES" +my_libxml2_cflags=$(LIBXML_CFLAGS) +my_libxml2_libs=$(LIBXML_LIBS) +my_dylib_file= +.ELSE +my_libxml2_cflags=-I$(SOLARINCDIR)/external/libxml +my_libxml2_libs=-L$(SOLARLIBDIR) -lxml2 +my_dylib_file="-Wl,-dylib_file,@loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib" +.ENDIF + CONFIGURE_LDFLAGS=-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL)) CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure \ --prefix=/@.__________________________________________________$(EXTRPATH) CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \ --disable-pixbuf-loader --disable-dependency-tracking $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules) \ - LIBRSVG_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo $(LIBXML_CFLAGS)" \ - LIBRSVG_LIBS="-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(LIBXML_LIBS) -lcairo -lintl" \ + LIBRSVG_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo $(my_libxml2_cflags)" \ + LIBRSVG_LIBS="-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(my_libxml2_libs) -lcairo -lintl" \ GDK_PIXBUF_CFLAGS="-I$(SOLARINCDIR)/external/gdk-pixbuf-2.0" \ GDK_PIXBUF_LIBS=-lgdk_pixbuf-2.0 \ GTHREAD_CFLAGS=-I$(SOLARINCDIR)/external/glib-2.0 \ @@ -72,7 +82,7 @@ CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \ LIBCROCO_CFLAGS="-I$(SOLARINCDIR)/external/libcroco-0.6" \ LIBCROCO_LIBS=-lcroco-0.6 \ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo" \ - LDFLAGS="$(CONFIGURE_LDFLAGS)" + LDFLAGS="$(CONFIGURE_LDFLAGS) $(my_dylib_file)" CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)" |