[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - external/libxmlsec

[Michael Stahl]

 external/libxmlsec/ExternalProject_xmlsec.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 33e089f8c57a9a945cc77f583c8031c5ea9919d0
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jan 9 22:01:48 2014 +0100

    libxmlsec: openssl conditional was accidentally inverted
    
    ... in commit bf6d1f77420dcc9ece4d9f4eae1e37b427d85c6a.  And it just
    happens to not build with clang here.
    
    Change-Id: Ic467abc894b9c98c81fa64cb57eafaa4cfcaa66e
    (cherry picked from commit e32f828e2b7a136ac255bfe1cc7e4858fa965e8d)
    Reviewed-on: https://gerrit.libreoffice.org/7347
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk
index dc79899..2c4b18a 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)) \