From cca8938bb9337b9f28163fc97d9a87be89cd3655 Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <cls%seawood.org>
Date: Tue, 30 Oct 2001 01:11:04 +0000
Subject: [PATCH] Removing xpcom dependency upon unicharutil. Fixing tinderbox
 bustage. Bug #100214 r=alecf

---
 security/manager/ssl/src/Makefile.in         | 2 ++
 security/manager/ssl/src/makefile.win        | 2 ++
 security/manager/ssl/src/nsKeygenHandler.cpp | 1 +
 3 files changed, 5 insertions(+)

diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
index 6124fe5c522..f6f7c67ba52 100644
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@@ -94,6 +94,7 @@ REQUIRES	= nspr \
 		  pippki \
 		  xpconnect \
 		  jar \
+		  unicharutil \
 		  $(NULL)
 
 EXTRA_LIBS = $(NSS_LIBS)
@@ -115,6 +116,7 @@ EXTRA_DSO_LDOPTS += $(sort $(EXTRA_LIBS))
 endif
 
 EXTRA_DSO_LDOPTS += \
+		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(NULL)
diff --git a/security/manager/ssl/src/makefile.win b/security/manager/ssl/src/makefile.win
index f95b94fa38d..37f24331708 100644
--- a/security/manager/ssl/src/makefile.win
+++ b/security/manager/ssl/src/makefile.win
@@ -67,6 +67,7 @@ REQUIRES	= \
 		jar \
 		layout_xul \
 		gfx \
+		unicharutil \
 		$(NULL)
 
 include <$(DEPTH)/config/config.mak>
@@ -97,6 +98,7 @@ SUB_LIBRARIES   = \
 
 LLIBS   = \
     $(LIBNSPR) \
+    $(DIST)\lib\unicharutil_s.lib \
     $(DIST)\lib\xpcom.lib \
     $(DIST)\lib\js3250.lib \
     $(NULL)
diff --git a/security/manager/ssl/src/nsKeygenHandler.cpp b/security/manager/ssl/src/nsKeygenHandler.cpp
index 04074cc2d76..d70b54b3b58 100644
--- a/security/manager/ssl/src/nsKeygenHandler.cpp
+++ b/security/manager/ssl/src/nsKeygenHandler.cpp
@@ -41,6 +41,7 @@ extern "C" {
 #include "nsINSSDialogs.h"
 #include "nsKeygenThread.h"
 #include "nsReadableUtils.h"
+#include "nsUnicharUtils.h"
 
 //These defines are taken from the PKCS#11 spec
 #define CKM_RSA_PKCS_KEY_PAIR_GEN     0x00000000