Initial fixes to get MOZ_OJI=1 linking.

git-svn-id: svn://10.0.0.236/branches/OJI_19980430_BRANCH@1701 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/cmd/xfe/Makefile

@@ -236,8 +236,8 @@ ifdef MOZ_LOC_INDEP
 BASIC_LIBS	+= $(DIST)/lib/libli.a
 endif
 
-ifdef MOZ_JAVA
-JAVA_JMC = $(DIST)/lib/libjmc.a
+ifdef JAVA_OR_OJI
+JAVA_JMC = $(DIST)/lib/libjmc.a      # XXX To be removed...
 endif
 
 BASIC_LIBS	+= \
@@ -295,8 +295,11 @@ ifndef NO_LAYERS
 BASIC_LIBS	+= $(DIST)/lib/liblayer.a
 endif
 
+ifdef JAVA_OR_OJI
+
 ifdef MOZ_JAVA
 
+# Monolithic Java
 BASIC_LIBS	+= \
 		  $(DIST)/lib/lib$(LITE_PREFIX)applet.a \
 		  $(DIST)/lib/libjrt.a \
@@ -331,6 +334,20 @@ BASIC_LIBS	+= $(DIST)/lib/libjrt.a
 
 else  # MOZ_JAVA
 
+# OJI
+BASIC_LIBS      += $(DIST)/lib/liboji.a
+
+ifdef EDITOR
+BASIC_LIBS	+= $(DIST)/lib/libedtplug.a
+endif
+
+BASIC_LIBS      += $(DIST)/lib/libsoftupdate.a
+
+endif # MOZ_JAVA
+
+else  # JAVA_OR_OJI
+
+# No Monolithic Java, no OJI, just stubs.
 BASIC_LIBS	+= \
 		  $(DIST)/lib/libstubsj.a \
 		  $(DIST)/lib/libstubnj.a \

mozilla/cmd/xfe/icons/Makefile

@@ -126,8 +126,8 @@ ICONLIST	 = $(OBJDIR)/icon.list
 ICONANIMLIST = $(OBJDIR)/iconanim.list
 MKICONS_EXE	 = $(OBJDIR)/mkicons
 
-ifdef MOZ_JAVA
-JAVA_JMC = $(DIST)/lib/libjmc.a
+ifdef JAVA_OR_OJI
+JAVA_JMC = $(DIST)/lib/libjmc.a        # XXX To be removed...
 else
 JAVA_JMC = $(DIST)/lib/libstubsj.a
 endif

mozilla/cmd/xfe/mozilla.c

@@ -2101,7 +2101,10 @@ main
   PR_Init("mozilla", 24, 1, 0);
 #endif                     /* NSRP20 */
 
+#ifdef JAVA
   LJ_SetProgramName(argv[0]);
+#endif
+
   PR_XLock();
   mozilla_thread = PR_CurrentThread();
   fdset_lock = PR_NewNamedMonitor("mozilla-fdset-lock");
@@ -2434,11 +2437,13 @@ main
   PR_StartEvents(0);
 #endif	/* NSPR20 */
 
+#ifdef JAVA
   {
     extern void AwtRegisterXtAppVars(Display *dpy,
 				     XtAppContext ac, char *class);
     AwtRegisterXtAppVars(fe_display, fe_XtAppContext, (char *)fe_progclass);
   }
+#endif
 
  {
  	extern int PR_XGetXtHackFD(void);

mozilla/cmd/xfe/mozjava.h

@@ -32,8 +32,10 @@
 #include "plevent.h"
 #endif /* NSPR20 */
 #include "prlog.h"
+#ifdef JAVA
 #include "java.h"
 #endif
+#endif
 
 #ifdef JAVA
 extern PRMonitor *fdset_lock;