summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-01-09 22:01:48 +0100
committerMichael Stahl <mstahl@redhat.com>2014-01-10 00:21:52 +0100
commite32f828e2b7a136ac255bfe1cc7e4858fa965e8d (patch)
tree932d109982be584d540a4b988e21dd1008bb1533 /external
parent1366a41c320a9bb173dc5e066ab532d679d89bcc (diff)
libxmlsec: openssl conditional was accidentally inverted
... in commit bf6d1f77420dcc9ece4d9f4eae1e37b427d85c6a. And it just happens to not build with clang here. Change-Id: Ic467abc894b9c98c81fa64cb57eafaa4cfcaa66e
Diffstat (limited to 'external')
-rw-r--r--external/libxmlsec/ExternalProject_xmlsec.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk
index dc7989918c1b..2c4b18ab51ab 100644
--- a/external/libxmlsec/ExternalProject_xmlsec.mk
+++ b/external/libxmlsec/ExternalProject_xmlsec.mk
@@ -55,7 +55,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
autoreconf \
&& ./configure \
--with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls \
- $(if $(filter ANDROID,$(OS)),$(if $(DISABLE_OPENSSL),--without-openssl,--with-openssl=$(call gb_UnpackedTarball_get_dir,openssl))) \
+ $(if $(or $(filter-out ANDROID,$(OS)),$(DISABLE_OPENSSL)),--without-openssl,--with-openssl=$(call gb_UnpackedTarball_get_dir,openssl)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter NO,$(SYSTEM_NSS))$(filter MACOSX,$(OS)),--disable-pkgconfig) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \