[Libreoffice-commits] .: postprocess/packcomponents scp2/source

[Caolán McNamara]

 postprocess/packcomponents/makefile.mk |   11 +++++++----
 scp2/source/ooo/file_library_ooo.scp   |    6 +-----
 scp2/source/ooo/makefile.mk            |    4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 65270c4e9318036100401ec1fb09443c1bdb239a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 4 11:20:09 2011 +0000

    fix encrypting odf documents
    
    xsec_fw is always built, so always register and install
    xsec_xmlsec is built when ENABLE_XMLSEC is true, match
        register and install
    plugin is built when WITH_MOZILLA is not NO, match
        register

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 9d36059..eb10ee9 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -277,10 +277,13 @@ my_components += \
 my_components += ldapbe2
 .END
 
-.IF "$(ENABLE_NSS_MODULE)" == "YES" || "$(SYSTEM_MOZILLA)" == "YES"
-my_components += \
-    component/xmlsecurity/util/xsec_fw \
-    pl
+.IF "$(WITH_MOZILLA)" != "NO"
+my_components += pl
+.END
+
+my_components += component/xmlsecurity/util/xsec_fw
+
+.IF "$(ENABLE_XMLSEC)" == "YES"
 .IF "$(OS)" == "WNT"
 my_components += component/xmlsecurity/util/xsec_xmlsec.windows
 .ELSE
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index d83d6cf..56592cf 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1406,7 +1406,6 @@ File gid_File_Lib_XSec_XMLSecurity
     Styles = (PACKED);
 End
 
-#if defined(ENABLE_NSS_MODULE) || defined(SYSTEM_MOZILLA)
 File gid_File_Lib_XSec_Framework
     TXT_FILE_BODY;
 	#ifdef UNX
@@ -1418,7 +1417,7 @@ File gid_File_Lib_XSec_Framework
     Styles = (PACKED);
 End
 
-#if defined(ENABLE_NSS_MODULE) || defined(SYSTEM_MOZILLA)
+#if defined(ENABLE_XMLSEC)
 File gid_File_Lib_XSec_XmlSec
     TXT_FILE_BODY;
     #ifdef UNX
@@ -1429,7 +1428,6 @@ File gid_File_Lib_XSec_XmlSec
     Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
 End
-#endif
 
 #ifdef WNT
 File gid_File_Lib_LibXMLSec_xmlseccore
@@ -1454,8 +1452,6 @@ File gid_File_Lib_LibXMLSec_xmlsecmscrypto
     Styles = (PACKED);
 End
 #endif
-
-//i20156 - end
 #endif
 
 File gid_File_Lib_Migrationoo2
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index bf17b84..2a89eca 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -92,8 +92,8 @@ SCPDEFS+=-DENABLE_EVOAB2
 SCPDEFS+=-DENABLE_DIRECTX
 .ENDIF
 
-.IF "$(ENABLE_NSS_MODULE)"=="YES"
-SCPDEFS+=-DENABLE_NSS_MODULE
+.IF "$(ENABLE_XMLSEC)"=="YES"
+SCPDEFS+=-DENABLE_XMLSEC
 .ENDIF
 
 .IF "$(GUI)"=="UNX"