get the right inclusion rules for nss libs

Change-Id: I119a012f1b0e9fe06d15b7e41fe7ac140bb83629

1 files changed, 34 insertions, 31 deletions

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index b1c38c3ce9bc..4b9ecb6b6603 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1326,6 +1326,40 @@ SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
  #endif
 #endif
 
+//we need the nss libs of libxmlsec is enabled, or if the internal mozilla is enabled
+#if defined(ENABLE_XMLSEC) || !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA)
+#ifndef SYSTEM_NSS
+SPECIAL_LIB_FILE(gid_File_Lib_Freebl3,freebl3)
+SPECIAL_LIB_FILE(gid_File_Lib_Nss3,nss3)
+SPECIAL_LIB_FILE(gid_File_Lib_Nspr,nspr4)
+SPECIAL_LIB_FILE(gid_File_Lib_Nssdbm3,nssdbm3)
+SPECIAL_LIB_FILE(gid_File_Lib_Nssutil3,nssutil3)
+SPECIAL_LIB_FILE(gid_File_Lib_Nssckbi,nssckbi)
+SPECIAL_LIB_FILE(gid_File_Lib_Plc4,plc4)
+SPECIAL_LIB_FILE(gid_File_Lib_Plds4,plds4)
+SPECIAL_LIB_FILE(gid_File_Lib_Softokn3,softokn3)
+SPECIAL_LIB_FILE(gid_File_Lib_Smime3,smime3)
+#ifdef WNT
+SPECIAL_LIB_FILE(gid_File_Lib_Sqlite3,sqlite3)
+#else
+/*
+ For MacOSX >= 10.6 we can apparently use the system sqlite.
+
+ For MacOSX 10.4 we've delivered sqlite into a sqlite subdir for the duration
+ of the build to avoid #i106132#. Now we need to put it into the program dir of
+ the install.
+*/
+#if !defined(MACOS) || (MAC_OS_X_VERSION_MIN_REQUIRED < 1060)
+File gid_File_Lib_Sqlite3
+    Name = "sqlite/" SPECIAL_NAME(sqlite3);
+    PACKED_LIB_FILE_BODY;
+End
+#endif //!defined(MACOS) || (MAC_OS_X_VERSION_MIN_REQUIRED < 1060)
+#endif //WNT
+SPECIAL_LIB_FILE(gid_File_Lib_Ssl3,ssl3)
+#endif //SYSTEM_NSS
+#endif //defined(ENABLE_XMLSEC) || !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA)
+
 SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
 
 SPECIAL_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1)
@@ -1466,37 +1500,6 @@ File gid_File_Lib_XSec_XmlSec
     Styles = (PACKED);
 End
 
-#ifndef SYSTEM_NSS
-SPECIAL_LIB_FILE(gid_File_Lib_Freebl3,freebl3)
-SPECIAL_LIB_FILE(gid_File_Lib_Nss3,nss3)
-SPECIAL_LIB_FILE(gid_File_Lib_Nspr,nspr4)
-SPECIAL_LIB_FILE(gid_File_Lib_Nssdbm3,nssdbm3)
-SPECIAL_LIB_FILE(gid_File_Lib_Nssutil3,nssutil3)
-SPECIAL_LIB_FILE(gid_File_Lib_Nssckbi,nssckbi)
-SPECIAL_LIB_FILE(gid_File_Lib_Plc4,plc4)
-SPECIAL_LIB_FILE(gid_File_Lib_Plds4,plds4)
-SPECIAL_LIB_FILE(gid_File_Lib_Softokn3,softokn3)
-SPECIAL_LIB_FILE(gid_File_Lib_Smime3,smime3)
-#ifdef WNT
-SPECIAL_LIB_FILE(gid_File_Lib_Sqlite3,sqlite3)
-#else
-/*
- For MacOSX >= 10.6 we can apparently use the system sqlite.
-
- For MacOSX 10.4 we've delivered sqlite into a sqlite subdir for the duration
- of the build to avoid #i106132#. Now we need to put it into the program dir of
- the install.
-*/
-#if !defined(MACOS) || (MAC_OS_X_VERSION_MIN_REQUIRED < 1060)
-File gid_File_Lib_Sqlite3
-    Name = "sqlite/" SPECIAL_NAME(sqlite3);
-    PACKED_LIB_FILE_BODY;
-End
-#endif
-#endif
-SPECIAL_LIB_FILE(gid_File_Lib_Ssl3,ssl3)
-#endif
-
 #ifdef WNT
 File gid_File_Lib_LibXMLSec_xmlseccore
     LIB_FILE_BODY;