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

[Libreoffice Gerrit user]

 libxmlsec/makefile.mk |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 7df30efe8130d9dc583c077d7ec9793ba26b7cbf
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Aug 29 17:00:22 2012 +0300

    Fix libxmlsec build on MacOSX, no idea if it works at run-time
    
    Change-Id: I1c8c978d62072cdb08bd64e6f38fe11983091375

diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 38ce013..459a84d 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -166,6 +166,14 @@ LDFLAGS:=$(xmlsec_LDFLAGS)
 .ENDIF
 CONFIGURE_DIR=
 CONFIGURE_ACTION=autoreconf ; .$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
+
+.IF "$(OS)" == "MACOSX"
+.IF "$(ACLOCAL)" == ""
+ACLOCAL=aclocal
+.ENDIF
+CONFIGURE_ACTION:=ACLOCAL="$(ACLOCAL) -I$(SRCDIR)/m4/mac" $(CONFIGURE_ACTION)
+.ENDIF
+
 CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
 
 .IF "$(CROSS_COMPILING)"=="YES"
@@ -192,7 +200,7 @@ CONFIGURE_FLAGS += \
 # --with-nss or parse -pkg-config --libs / cflags mozilla-nss since
 # the lib may a) be in /usr/lib (Debian) and be not in $with_nss/include
 # $with_nss/lib.
-.IF "$(SYSTEM_NSS)" != "YES"
+.IF "$(SYSTEM_NSS)" != "YES" || "$(OS)" == "MACOSX"
 CONFIGURE_FLAGS+=--enable-pkgconfig=no
 .ENDIF
 BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)