Kaydet (Commit) 91b8f749 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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
üst 4cdb960a
...@@ -44,10 +44,9 @@ else ...@@ -44,10 +44,9 @@ else
$(call gb_ExternalProject_get_state_target,xmlsec,build) : $(call gb_ExternalProject_get_state_target,xmlsec,build) :
cd $(EXTERNAL_WORKDIR) \ cd $(EXTERNAL_WORKDIR) \
&& autoreconf \ && $(if $(filter MACOSX,$(OS)),ACLOCAL="aclocal -I $(SRCDIR)/m4/mac") autoreconf \
&& $(if $(filter MACOSX,$(OS)),ACLOCAL="aclocal -I $(EXTERNAL_WORKDIR)/m4/mac") \ && ./configure \
./configure \ --with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls \
--with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls \
$(if $(filter ANDROID,$(OS)),--with-openssl=$(OUTDIR),--without-openssl) \ $(if $(filter ANDROID,$(OS)),--with-openssl=$(OUTDIR),--without-openssl) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter NO,$(SYSTEM_NSS))$(filter MACOSX,$(OS)),--disable-pkgconfig) \ $(if $(filter NO,$(SYSTEM_NSS))$(filter MACOSX,$(OS)),--disable-pkgconfig) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment