Patch contributed by Michal Ceresna and verified by John Marmion.

This patch makes the webclient trunk work with the MOZILLA_0_9_9_BRANCH
on linux.


git-svn-id: svn://10.0.0.236/trunk@122500 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/java/webclient/Makefile.in

@@ -25,7 +25,8 @@ include $(DEPTH)/config/autoconf.mk
 #// DIRS          - There are subdirectories to process
 #//
 #//------------------------------------------------------------------------
-DIRS= import classes_spec src_share src_moz
+DIRS= classes_spec src_share src_moz
+
 
 #//------------------------------------------------------------------------
 #//

mozilla/java/webclient/src_moz/Makefile.in

@@ -61,6 +61,34 @@ else
 LIBRARY_NAME	= webclient
 endif
 
+REQUIRES	= xpcom \
+ 		  layout \
+ 		  shistory \
+ 		  appcomps \
+ 		  appshell \
+ 		  pref \
+ 		  locale \
+ 		  intl \
+ 		  rdf \
+ 		  bookmarks \
+ 		  content \
+ 		  editor \
+ 		  string \
+ 		  embed_base \
+ 		  webBrowser_core \
+ 		  webbrwsr \
+ 		  webshell \
+ 		  windowwatcher \
+ 		  profile \
+ 		  necko \
+ 		  docshell \
+ 		  dom \
+ 		  widget \
+ 		  uriloader \
+ 		  webbrowserpersist \
+ 		  gfx \
+ 		  $(NULL)
+ 
 CPPSRCS = \
 	ns_util.cpp \
 	ns_util_export.cpp \

mozilla/java/webclient/src_moz/Makefile.win

@@ -158,7 +158,9 @@ include <$(DEPTH)\config\rules.mak>
 buildRunems:
 	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin
 	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
+!ifdef MOZ_DEBUG
 	copy $(DIST)\bin\windbgdlg.exe $(JDKHOME)\bin
+!endif
 !ifdef BAL_INTERFACE
 !else
 !ifndef PACKAGE_BUILD

mozilla/java/webclient/test/automated/src/run/autorun.pl

@@ -74,7 +74,7 @@ sub init() {
         $file_separator = "\/"; 
         $JAVA="java";
     }
-    $javahome=$ENV{"JAVAHOME"};
+    $javahome=$ENV{"JDKHOME"} . $file_separator . "bin";
     unless(-f "$javahome$file_separator$JAVA") {
         die "Can't find java executable $javahome$file_separator$JAVA";
     }