From aa584559a8ada4e31331ab8a23f2c09eb11c609b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Thu, 8 Sep 2011 09:25:28 +0100
Subject: [PATCH] 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 |  2 +-
 scp2/source/ooo/file_library_ooo.scp   | 22 +++++++++++-----------
 scp2/source/ooo/file_resource_ooo.scp  |  2 --
 xmlsecurity/Module_xmlsecurity.mk      |  4 ----
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 33f0f01e1c46..fdb34f26bd25 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/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"
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 04026ae95b76..82dc5f36cf05 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/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;
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index b86f86a702b3..40aaa6fb29d9 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/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 )
 
diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
index 6fd29cc16408..b32ff3b8fbbe 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/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: