xmlsec: honor --disable-openssl and use NSS

On --disable-openssl, let's avoid linking the
bundled libxmlsec to OpenSSL by passing down
--without-openssl to its configure script.

Change-Id: I04447683adeba4b7059e94579adf43ef788a4916
Reviewed-on: https://gerrit.libreoffice.org/3329Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

libxmlsec/ExternalPackage_xmlsec.mk

@@ -25,7 +25,9 @@ $(eval $(call gb_ExternalPackage_add_file,xmlsec,bin/libxmlsec.dll,win32/binarie
 endif
 else ifeq ($(OS),ANDROID)
 $(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.a,src/.libs/libxmlsec1.a))
+ifneq ($(DISABLE_OPENSSL),YES)
 $(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-openssl.a,src/openssl/.libs/libxmlsec1-openssl.a))
+endif # DISABLE_OPENSSL
 else
 $(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.a,src/.libs/libxmlsec1.a))
 $(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-nss.a,src/nss/.libs/libxmlsec1-nss.a))

libxmlsec/ExternalProject_xmlsec.mk

@@ -53,7 +53,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
 		$(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 $(and $(filter ANDROID,$(OS)),$(filter-out YES,$(DISABLE_OPENSSL))),--with-openssl=$(OUTDIR),--without-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)) \