#i125592# enable NSS modules also on OS/2 port.

4 files changed, 12 insertions, 1 deletions

diff --git a/xmlsecurity/prj/d.lst b/xmlsecurity/prj/d.lst
index 94967c20a2e8..cf49378e46ff 100644
--- a/xmlsecurity/prj/d.lst
+++ b/xmlsecurity/prj/d.lst
@@ -2,7 +2,9 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid
 ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
 ..\%__SRC%\bin\xsec_fw.dll %_DEST%\bin%_EXT%\xsec_fw.dll
 ..\%__SRC%\bin\xsec_xmlsec.dll %_DEST%\bin%_EXT%\xsec_xmlsec.dll
+..\%__SRC%\bin\xsec_xs.dll %_DEST%\bin%_EXT%\xsec_xs.dll
 ..\%__SRC%\bin\xmlsecurity.dll %_DEST%\bin%_EXT%\xmlsecurity.dll
+..\%__SRC%\bin\xmlsecur.dll %_DEST%\bin%_EXT%\xmlsecur.dll
 ..\%__SRC%\lib\libxsec_fw.so %_DEST%\lib%_EXT%\libxsec_fw.so
 ..\%__SRC%\lib\libxsec_xmlsec.so %_DEST%\lib%_EXT%\libxsec_xmlsec.so
 ..\%__SRC%\lib\libxmlsecurity.so %_DEST%\lib%_EXT%\libxmlsecurity.so
diff --git a/xmlsecurity/source/xmlsec/nss/makefile.mk b/xmlsecurity/source/xmlsec/nss/makefile.mk
index b82456057e42..2c298edbceee 100644
--- a/xmlsecurity/source/xmlsec/nss/makefile.mk
+++ b/xmlsecurity/source/xmlsec/nss/makefile.mk
@@ -46,6 +46,9 @@ CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
 MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
 NSS_INC = $(MOZ_INC)$/nss
 NSPR_INC = $(MOZ_INC)$/nspr
+.ELIF "$(GUI)" == "OS2"
+NSS_INC = /@unixroot/usr/include/nss3
+NSPR_INC = /@unixroot/usr/include/nspr4
 .ELSE
 # TODO: better use pkgconfig to find the proper system include path
 NSS_INC = /usr/include/nss3
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index 131d1519ea89..29ebc20a1b57 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -295,7 +295,10 @@ bool nsscrypto_initialize( const css::uno::Reference< css::lang::XMultiServiceFa
 #endif
         deleteRootsModule();
 
-#if defined SYSTEM_MOZILLA
+#if defined OS2
+        // YD the nss system dlls names are ending with 'k'
+        OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "nssckbik" SAL_DLLEXTENSION));
+#elif defined SYSTEM_MOZILLA
         OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "libnssckbi" SAL_DLLEXTENSION));
 #else
         OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "${OOO_BASE_DIR}/program/libnssckbi" SAL_DLLEXTENSION));
diff --git a/xmlsecurity/util/makefile.mk b/xmlsecurity/util/makefile.mk
index 6c503269a07a..09857bd90ceb 100644
--- a/xmlsecurity/util/makefile.mk
+++ b/xmlsecurity/util/makefile.mk
@@ -68,6 +68,9 @@ DEF1EXPORTFILE = xsec_fw.dxp
 #
 
 SHL2NAME=xsec_xmlsec
+.IF "$(GUI)"=="OS2"
+SHL2NAME=xsec_xs
+.ENDIF
 SHL2TARGET= $(SHL2NAME)