[Libreoffice-commits] .: libcroco/makefile.mk libcroco/prj

[Norbert Thiebaud]

 libcroco/makefile.mk   |   11 ++++++++---
 libcroco/prj/build.lst |    2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 05713f9c868908f8819074a1474d282f50dbd729
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat May 28 00:12:11 2011 -0500

    libcroco: manage libxml2 depemdency properly on MacOS

diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk
index d5c84d5..926cbf8 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 ef0578b..b03d58b 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