Added linking of libcaps library as part of MOZ_JAVA build.

cmd/winfe/mkfiles32/mozilla.mak

@@ -382,6 +382,7 @@ LINK_LIBS= \
 !endif
     $(DIST)\lib\htmldg32.lib \
 !ifdef MOZ_JAVA
+    $(DIST)\lib\libcaps.lib \
     $(DIST)\lib\libnsc32.lib \
 !endif
     $(DIST)\lib\img32.lib \
@@ -2228,6 +2229,7 @@ BUILD_SOURCE: $(OBJ_FILES)
     $(DIST)\lib\nsldap.lib +
 !endif
 !if defined(MOZ_JAVA)
+    $(DIST)\lib\libcaps.lib +
     $(DIST)\lib\jrt16$(VERSION_NUMBER).lib +
     $(DIST)\lib\libapp~1.lib +
     $(DIST)\lib\jsj16$(VERSION_NUMBER).lib +

cmd/xfe/Makefile

@@ -79,6 +79,8 @@ REQUIRES	=\
 			Microline \
 		  addr \
 		  applet \
+		  xpcom \
+		  caps \
 		  img \
 		  edtplug \
 		  jtools \
@@ -318,9 +320,12 @@ ifndef NO_LAYERS
 BASIC_LIBS	+= $(DIST)/lib/liblayer.a
 endif
 
+BASIC_LIBS += $(DIST)/lib/libxpcom.a
+
 ifdef MOZ_JAVA
 
 BASIC_LIBS	+= \
+                  $(DIST)/lib/libcaps.a \
 		  $(DIST)/lib/lib$(LITE_PREFIX)applet.a \
 		  $(DIST)/lib/libjrt.a \
 		  $(DIST)/lib/libjmd.a \
@@ -333,6 +338,8 @@ endif
 BASIC_LIBS	+= \
 		  $(DIST)/lib/libnsn.a \
 		  $(DIST)/lib/libnsc.a \
+		  $(DIST)/lib/libcaps.a \
+		  $(DIST)/lib/libxpcom.a \
 		  $(DIST)/lib/libjpw.a \
 		  $(DIST)/lib/libzpw.a \
 		  $(DIST)/lib/libiawt.a \
@@ -380,8 +387,6 @@ ifdef MOZ_LDAP
 BASIC_LIBS	+= $(DIST)/lib/libldap.a $(DIST)/lib/liblber.a 
 endif
 
-BASIC_LIBS += $(DIST)/lib/libxpcom.a
-
 LOCALES		= $(LOCALE_MAP) $(MAIL_IM_HACK) $(NEWS_IM_HACK)
 
 ALL_EXPORT_LIBS	= $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB)