diff options
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index e41ead326653..bbea2d116ffa 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -276,18 +276,16 @@ my_components += \ my_components += ldapbe2 .END -.IF "$(ENABLE_NSS_MODULE)" != "NO" +.IF "$(ENABLE_NSS_MODULE)" == "YES" || "$(SYSTEM_MOZILLA)" == "YES" my_components += \ component/xmlsecurity/util/xsec_fw \ pl -.IF "$(SYSTEM_MOZILLA)" == "YES" || "$(ENABLE_NSS_MODULE)" == "YES" .IF "$(OS)" == "WNT" my_components += component/xmlsecurity/util/xsec_xmlsec.windows .ELSE my_components += component/xmlsecurity/util/xsec_xmlsec .END .END -.END .IF "$(OS)" == "MACOSX" my_components += \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index d98f7458fcaa..5d60eb5e11e8 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1432,7 +1432,7 @@ File gid_File_Lib_XSec_XMLSecurity Styles = (PACKED); End -#ifdef ENABLE_NSS_MODULE +#if defined(ENABLE_NSS_MODULE) || defined(SYSTEM_MOZILLA) File gid_File_Lib_XSec_Framework TXT_FILE_BODY; #ifdef UNX |