diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-05-28 00:12:11 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-05-28 00:12:11 -0500 |
| commit | 16a8d1be88df94336b3c27c5284b9fcc3f32c052 (patch) | |
| tree | a8a60e23182c1e2153110816d0e686f6e9bbc3cd /libcroco | |
| parent | f576a93109ab0cc75c43e5e90f1f9a665b2514e5 (diff) | |
libcroco: manage libxml2 depemdency properly on MacOS
Diffstat (limited to 'libcroco')
| -rw-r--r-- | libcroco/makefile.mk | 11 | ||||
| -rw-r--r-- | libcroco/prj/build.lst | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk index d5c84d517190..926cbf8b415b 100644 --- a/libcroco/makefile.mk +++ b/libcroco/makefile.mk @@ -51,18 +51,23 @@ PATCH_FILES= CONFIGURE_DIR= .IF "$(OS)"=="MACOSX" +.IF "$(SYSTEM_LIBXML)"=="YES" +LIBXML2_INCLUDE=-I/usr/include/libxml2 +.ELSE +LIBXML2_INCLUDE= +.ENDIF CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ .$/configure \ --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \ - CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \ + CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 $(LIBXML2_INCLUDE)" \ LDFLAGS="-L$(SOLARLIBDIR)" \ 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=" " \ LIBXML2_LIBS="-lxml2" - + CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) - + BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \ $(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) diff --git a/libcroco/prj/build.lst b/libcroco/prj/build.lst index ef0578bfe141..b03d58bba3d4 100644 --- a/libcroco/prj/build.lst +++ b/libcroco/prj/build.lst @@ -1,3 +1,3 @@ -cr libcroco : libxml2 glib soltools NULL +cr libcroco : LIBXML2:libxml2 glib soltools NULL cr libcroco usr1 - all cr_mkout NULL cr libcroco nmake - all cr_libcroco NULL |