(openoffice) 03/03: Adjustment for nss libs on Windows

[ms...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 868749956f8b2d89b5f9f5e3738493c240f582b3
Author: mseidel <ms...@apache.org>
AuthorDate: Sat Mar 9 23:58:02 2024 +0100

    Adjustment for nss libs on Windows
    
    (cherry picked from commit 66131ff522c1f6517d63b9a9d97fd218a05322a4)
---
 main/scp2/source/ooo/file_library_ooo.scp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/main/scp2/source/ooo/file_library_ooo.scp b/main/scp2/source/ooo/file_library_ooo.scp
index 4b9dcdc39d..f3435a8b6a 100644
--- a/main/scp2/source/ooo/file_library_ooo.scp
+++ b/main/scp2/source/ooo/file_library_ooo.scp
@@ -1626,16 +1626,22 @@ STD_LIB_FILE( gid_File_Lib_Freebl3, freebl3)
 #ifdef LINUX
 STD_LIB_FILE( gid_File_Lib_Freeblpriv3, freeblpriv3)
 #endif
-STD_LIB_FILE( gid_File_Lib_Nspr4, libnspr4)
 STD_LIB_FILE( gid_File_Lib_Nss3, nss3)
 STD_LIB_FILE( gid_File_Lib_Nsckbi, nssckbi)
 STD_LIB_FILE( gid_File_Lib_Nssdbm3, nssdbm3)
 STD_LIB_FILE( gid_File_Lib_Nssutil3, nssutil3)
-STD_LIB_FILE( gid_File_Lib_Plc4, libplc4)
-STD_LIB_FILE( gid_File_Lib_Plds4, libplds4)
 STD_LIB_FILE( gid_File_Lib_Smime3, smime3)
 STD_LIB_FILE( gid_File_Lib_Softokn3, softokn3)
 STD_LIB_FILE( gid_File_Lib_Ssl3, ssl3)
+#ifdef WNT
+STD_LIB_FILE( gid_File_Lib_Nspr4, libnspr4)
+STD_LIB_FILE( gid_File_Lib_Plc4, libplc4)
+STD_LIB_FILE( gid_File_Lib_Plds4, libplds4)
+#else
+STD_LIB_FILE( gid_File_Lib_Nspr4, nspr4)
+STD_LIB_FILE( gid_File_Lib_Plc4, plc4)
+STD_LIB_FILE( gid_File_Lib_Plds4, plds4)
+#endif
 
 #ifndef MACOSX // #i108575# use system sqlite3 on MacOSX
 STD_LIB_FILE( gid_File_Lib_Sqlite3, sqlite3)