diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-02-23 16:26:23 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-02-23 16:29:05 +0100 |
| commit | 37f527e9892904f49879635d96670a7e4838ec4c (patch) | |
| tree | 21832fb8be89c54168c8b718a57f68e74ef4943a /libcroco | |
| parent | c31e1bae8e9ba6cc90f4585f5d8aeab29cb5263a (diff) | |
Tentative libcroco fix for Mac OS X --without-system-libxml
Diffstat (limited to 'libcroco')
| -rw-r--r-- | libcroco/makefile.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk index d405f9505118..28c588bbe09b 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) |