From 64a8aba7f372354dcba044c640f4f7b2e1557114 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 9 Oct 2024 14:01:19 +0300 Subject: [PATCH] Add apparently missing check on missing both ENABLE_NSS and ENABLE_OPENSSL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Not sure if such a build makes sense, but it was something I tried (and disregarded), and we have similar conditionals elsewhere. Change-Id: Ic9d99e0acb70bdcf769e46a4dcdd27e340a905b7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194556 Reviewed-by: Michael Stahl Tested-by: Jenkins CollaboraOffice Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194912 Reviewed-by: Caolán McNamara Tested-by: Jenkins --- xmlsecurity/Module_xmlsecurity.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk index f2cdbee6ffa8..076602082632 100644 --- a/xmlsecurity/Module_xmlsecurity.mk +++ b/xmlsecurity/Module_xmlsecurity.mk @@ -11,8 +11,10 @@ $(eval $(call gb_Module_Module,xmlsecurity)) $(eval $(call gb_Module_add_targets,xmlsecurity,\ Library_xmlsecurity \ - $(if $(ENABLE_NSS)$(ENABLE_OPENSSL),Library_xsec_xmlsec) \ - UIConfig_xmlsec \ + $(if $(ENABLE_NSS)$(ENABLE_OPENSSL),\ + Library_xsec_xmlsec \ + UIConfig_xmlsec \ + ) \ )) $(eval $(call gb_Library_use_custom_headers,xmlsecurity,\ @@ -35,7 +37,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,xmlsecurity,\ )) $(eval $(call gb_Module_add_l10n_targets,xmlsecurity,\ - AllLangMoTarget_xsc \ + $(if $(ENABLE_NSS)$(ENABLE_OPENSSL),AllLangMoTarget_xsc) \ )) # failing