diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-08-31 18:55:53 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-10-17 03:54:05 +0000 |
| commit | bf6d1f77420dcc9ece4d9f4eae1e37b427d85c6a (patch) | |
| tree | 8147c75b761cc8d0546d34813ef1dc90256aa4f8 /libxmlsec | |
| parent | Revert "no need to double the conditional, once is enough" (diff) | |
| download | core-bf6d1f77420dcc9ece4d9f4eae1e37b427d85c6a.tar.gz core-bf6d1f77420dcc9ece4d9f4eae1e37b427d85c6a.zip | |
Normalize DISABLE_OPENSSL to USE TRUE/<nothing>
Change-Id: I84dd99f42e032315fbf31332dfb62eb3ef4aa4c0
Reviewed-on: https://gerrit.libreoffice.org/5724
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'libxmlsec')
| -rw-r--r-- | libxmlsec/ExternalProject_xmlsec.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk index 2d48faf8927e..93a1b072d5d4 100644 --- a/libxmlsec/ExternalProject_xmlsec.mk +++ b/libxmlsec/ExternalProject_xmlsec.mk @@ -54,7 +54,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : autoreconf \ && ./configure \ --with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls \ - $(if $(and $(filter ANDROID,$(OS)),$(filter-out YES,$(DISABLE_OPENSSL))),--with-openssl=$(OUTDIR),--without-openssl) \ + $(if $(filter ANDROID,$(OS)),$(if $(DISABLE_OPENSSL),--without-openssl,--with-openssl=$(OUTDIR))) \ $(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)) \ |