[Libreoffice-commits] .: liblangtag/makefile.mk

Tor Lillqvist tml at kemper.freedesktop.org
Wed Aug 8 06:42:34 PDT 2012


 liblangtag/makefile.mk |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit d7478b2ed7aa139eb17354e4d8b8914c67d0dc34
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Aug 8 16:41:11 2012 +0300

    Fix liblangtag MacOSX build when using system libxml2
    
    Change-Id: Iefbce119e682e870283cb698018c99a3378cd157

diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk
index a723d9b..4f7c335 100644
--- a/liblangtag/makefile.mk
+++ b/liblangtag/makefile.mk
@@ -67,6 +67,10 @@ CONFIGURE_FLAGS+= LIBXML2_LIBS='$(SOLARLIBDIR)$/libxml2.lib'
 .ELSE
 CONFIGURE_FLAGS+= LIBXML2_LIBS='-L$(SOLARLIBDIR) -lxml2'
 .ENDIF
+.ELSE
+.IF "$(OS)" == "MACOSX"
+CONFIGURE_FLAGS+= LIBXML2_CFLAGS='$(LIBXML_CFLAGS)' LIBXML2_LIBS='$(LIBXML_LIBS)'
+.ENDIF
 .ENDIF
 
 .IF "$(SYSTEM_GLIB)"!="YES"


More information about the Libreoffice-commits mailing list