From b2e264c1b72b3e152a843a3c4c1e7335b205d49b Mon Sep 17 00:00:00 2001
From: raman <raman@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 5 Jun 1998 19:34:23 +0000
Subject: [PATCH] include libcaps library for OJI also. Fix to make OJI to
 build.

git-svn-id: svn://10.0.0.236/trunk@3361 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/cmd/winfe/mkfiles32/mozilla.mak | 8 ++++++--
 mozilla/cmd/xfe/Makefile                | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/mozilla/cmd/winfe/mkfiles32/mozilla.mak b/mozilla/cmd/winfe/mkfiles32/mozilla.mak
index b8bb5a60ab1..6e91da65370 100644
--- a/mozilla/cmd/winfe/mkfiles32/mozilla.mak
+++ b/mozilla/cmd/winfe/mkfiles32/mozilla.mak
@@ -387,8 +387,10 @@ LINK_LIBS= \
     $(DIST)\lib\secfreenav32.lib \
 !endif
     $(DIST)\lib\htmldg32.lib \
-!ifdef MOZ_JAVA
+!ifdef JAVA_OR_OJI      
     $(DIST)\lib\libcaps.lib \
+!endif
+!ifdef MOZ_JAVA
     $(DIST)\lib\libnsc32.lib \
 !endif
     $(DIST)\lib\img32.lib \
@@ -2406,8 +2408,10 @@ BUILD_SOURCE: $(OBJ_FILES)
 !ifdef MOZ_LDAP
     $(DIST)\lib\nsldap.lib +
 !endif
-!if defined(MOZ_JAVA)
+!ifdef JAVA_OR_OJI
     $(DIST)\lib\libcaps.lib +
+!endif
+!if defined(MOZ_JAVA)
     $(DIST)\lib\jrt16$(VERSION_NUMBER).lib +
     $(DIST)\lib\libapp~1.lib +
     $(DIST)\lib\jsj16$(VERSION_NUMBER).lib +
diff --git a/mozilla/cmd/xfe/Makefile b/mozilla/cmd/xfe/Makefile
index 2cd4f812c09..54540ddd196 100644
--- a/mozilla/cmd/xfe/Makefile
+++ b/mozilla/cmd/xfe/Makefile
@@ -325,11 +325,12 @@ BASIC_LIBS += $(DIST)/lib/libxpcom.a
 
 ifdef JAVA_OR_OJI
 
+BASIC_LIBS	+= $(DIST)/lib/libcaps.a
+
 ifdef MOZ_JAVA
 
 # Monolithic Java
 BASIC_LIBS	+= \
-                  $(DIST)/lib/libcaps.a \
 		  $(DIST)/lib/lib$(LITE_PREFIX)applet.a \
 		  $(DIST)/lib/libjrt.a \
 		  $(DIST)/lib/libjmd.a \