diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-26 15:31:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-26 15:32:35 +0100 |
| commit | 771def6aec5bbb1966f65e81cdf68afd94aa4b70 (patch) | |
| tree | c0241845f6c636f772cae82a1ebb768706b4cea4 | |
| parent | d82431543fe03a7e817fe329aca0ec11c7669c48 (diff) | |
mirror postprocess logic in here
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index b210026f84d4..b1ef33b565f4 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1488,9 +1488,10 @@ File gid_File_Lib_XSec_Framework Styles = (PACKED); End +#if defined(ENABLE_NSS_MODULE) || defined(SYSTEM_MOZILLA) File gid_File_Lib_XSec_XmlSec TXT_FILE_BODY; - #ifdef UNX + #ifdef UNX Name = STRING(CONCAT2(libxsec_xmlsec,UNXSUFFIX)); #else Name = "xsec_xmlsec.dll"; @@ -1498,6 +1499,7 @@ File gid_File_Lib_XSec_XmlSec Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); End +#endif File gid_File_Lib_XSec_XMLSecurity TXT_FILE_BODY; diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 7d6aba50c4cd..a3fcd6aa64ce 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -96,6 +96,10 @@ SCPDEFS+=-DENABLE_EVOAB2 SCPDEFS+=-DENABLE_DIRECTX .ENDIF +.IF "$(ENABLE_NSS_MODULE)"=="YES" +SCPDEFS+=-DENABLE_NSS_MODULE +.ENDIF + .IF "$(GUI)"=="UNX" #X11 MacOSX has no cairo-canvas .IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua" |