Related: fdo#40420 always include xmlsecurity library for macro-security

the xmlsecurity library contains the dialogs and resources for the
macro-security dialog as well as the xml signing UI. So always
build and include this library unconditionally.

postprocess/packcomponents/makefile.mk

@@ -122,6 +122,7 @@ my_components = \
     component/xmloff/source/transform/xof \
     component/xmloff/util/xo \
     component/xmlscript/util/xcr \
+    component/xmlsecurity/util/xmlsecurity \
     configmgr \
     ctl \
     dbase \
@@ -280,7 +281,6 @@ my_components += ldapbe2
 
 .IF "$(WITH_MOZILLA)" != "NO"
 my_components += \
-    component/xmlsecurity/util/xmlsecurity \
     component/xmlsecurity/util/xsec_fw \
     pl
 .IF "$(SYSTEM_MOZILLA)" == "YES" || "$(ENABLE_NSS_MODULE)" == "YES"

scp2/source/ooo/file_library_ooo.scp

@@ -1456,6 +1456,17 @@ SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
 #endif
 #endif
 
+File gid_File_Lib_XSec_XMLSecurity
+    TXT_FILE_BODY;
+	#ifdef UNX
+        Name = STRING(CONCAT2(libxmlsecurity,UNXSUFFIX));
+    #else
+        Name = "xmlsecurity.dll";
+    #endif
+    Dir = SCP2_OOO_BIN_DIR;
+    Styles = (PACKED);
+End
+
 #ifndef WITHOUT_MOZILLA
 File gid_File_Lib_XSec_Framework
     TXT_FILE_BODY;
@@ -1481,17 +1492,6 @@ File gid_File_Lib_XSec_XmlSec
 End
 #endif
 
-File gid_File_Lib_XSec_XMLSecurity
-    TXT_FILE_BODY;
-	#ifdef UNX
-        Name = STRING(CONCAT2(libxmlsecurity,UNXSUFFIX));
-    #else
-        Name = "xmlsecurity.dll";
-    #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
 #ifdef WNT
 File gid_File_Lib_LibXMLSec_xmlseccore
     TXT_FILE_BODY;

scp2/source/ooo/file_resource_ooo.scp

@@ -114,9 +114,7 @@ STD_RES_FILE( gid_File_Res_Xsltdlg, xsltdlg )
 
 STD_RES_FILE( gid_File_Res_AVMedia, avmedia )
 
-#ifndef WITHOUT_MOZILLA
 STD_RES_FILE( gid_File_Res_XMLSecurity, xmlsec )
-#endif
 
 STD_RES_FILE( gid_File_Res_UpdChk, updchk )
 

xmlsecurity/Module_xmlsecurity.mk

@@ -28,8 +28,6 @@
 
 $(eval $(call gb_Module_Module,xmlsecurity))
 
-ifeq ($(WITH_MOZILLA),YES)
-
 $(eval $(call gb_Module_add_targets,xmlsecurity,\
 	AllLangResTarget_xsec \
 	Library_xmlsecurity \
@@ -42,6 +40,4 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\
 	CppunitTest_qa_certext \
 ))
 
-endif # ifeq ($(WITH_MOZILLA),YES)
-
 # vim: set noet sw=4 ts=4: