summaryrefslogtreecommitdiff
path: root/libxmlsec
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-12-01 10:54:12 +0200
committerTor Lillqvist <tml@iki.fi>2012-12-01 10:56:42 +0200
commit91b8f74987996a7dbc7d9c6b97a4bbdcfe3c2652 (patch)
treed327a62442e30d69940ebd26a404ff927f7884b5 /libxmlsec
parent4cdb960a79aff565f956f618116f3ea4b3836aa4 (diff)
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
Diffstat (limited to 'libxmlsec')
-rw-r--r--libxmlsec/ExternalProject_xmlsec.mk7
1 files changed, 3 insertions, 4 deletions
diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk
index 5b310e620719..5c188b5d3709 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) \