libcroco/makefile.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
New commits: commit 37f527e9892904f49879635d96670a7e4838ec4c Author: Stephan Bergmann <sberg...@redhat.com> Date: Thu Feb 23 16:26:23 2012 +0100 Tentative libcroco fix for Mac OS X --without-system-libxml diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk index d405f95..28c588b 100644 --- a/libcroco/makefile.mk +++ b/libcroco/makefile.mk @@ -51,14 +51,21 @@ PATCH_FILES= CONFIGURE_DIR= .IF "$(OS)"=="MACOSX" +.IF "$(SYSTEM_LIBXML)" == "YES" +my_libxml2_cflags=$(LIBXML_CFLAGS) +my_libxml2_libs=$(LIBXML_LIBS) +.ELSE +my_libxml2_cflags=-I$(SOLARINCDIR)/external/libxml +my_libxml2_libs=-L$(SOLARLIBDIR) -lxml2 +.ENDIF CONFIGURE_ACTION=./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \ CPPFLAGS="$(EXTRA_CDEFS)" \ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \ LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS) -Wl,-dylib_file,@loader_path/libgmodule-2.0.0.dylib:$(SOLARLIBDIR)/libgmodule-2.0.0.dylib" \ GLIB2_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \ GLIB2_LIBS="-lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \ - LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \ - LIBXML2_LIBS="$(LIBXML_LIBS)" + LIBXML2_CFLAGS='$(my_libxml2_cflags)' \ + LIBXML2_LIBS='$(my_libxml2_libs)' .IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits