libxmlsec/ExternalProject_xmlsec.mk | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 91b8f74987996a7dbc7d9c6b97a4bbdcfe3c2652
Author: Tor Lillqvist <t...@iki.fi>
Date: Sat Dec 1 10:54:12 2012 +0200
Fix OS X build at least with current tool-chain
Pass correct -I flag to acloal in the ACLOCAL environemnt variable,
and set that environment variable for the running of autoreconf for it
it to have any effect.
Change-Id: I64238b6b96539dff28c2ddc16cc17f18ebb22129
diff --git a/libxmlsec/ExternalProject_xmlsec.mk
b/libxmlsec/ExternalProject_xmlsec.mk
index 5b310e6..5c188b5 100644
--- a/libxmlsec/ExternalProject_xmlsec.mk
+++ b/libxmlsec/ExternalProject_xmlsec.mk
@@ -44,10 +44,9 @@ else
$(call gb_ExternalProject_get_state_target,xmlsec,build) :
cd $(EXTERNAL_WORKDIR) \
- && autoreconf \
- && $(if $(filter MACOSX,$(OS)),ACLOCAL="aclocal -I
$(EXTERNAL_WORKDIR)/m4/mac") \
- ./configure \
- --with-pic --disable-shared --disable-crypto-dl --without-libxslt
--without-gnutls \
+ && $(if $(filter MACOSX,$(OS)),ACLOCAL="aclocal -I $(SRCDIR)/m4/mac")
autoreconf \
+ && ./configure \
+ --with-pic --disable-shared --disable-crypto-dl
--without-libxslt --without-gnutls \
$(if $(filter
ANDROID,$(OS)),--with-openssl=$(OUTDIR),--without-openssl) \
$(if $(filter
MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)
\
$(if $(filter NO,$(SYSTEM_NSS))$(filter
MACOSX,$(OS)),--disable-pkgconfig) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
