Build SmartUpdate when MOZ_SMARTUPDATE is defined

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

mozilla/cmd/winfe/mkfiles32/mozilla.mak

@@ -476,10 +476,10 @@ LINK_LIBS= \
     $(DIST)\lib\nsldap32v30.lib \
 !endif
     $(DIST)\lib\unicvt32.lib \
-!ifdef JAVA_OR_NSJVM
 !ifdef MOZ_SMARTUPDATE
     $(DIST)\lib\softup32.lib \
 !endif
+!ifdef JAVA_OR_NSJVM
 !ifndef NO_SECURITY
     $(DIST)\lib\jsl32.lib \
 !endif
@@ -650,11 +650,11 @@ CDISTINCLUDES1= \
     /I$(XPDIST)\public\plugin \
     /I$(XPDIST)\public\plugimpl \
     /I$(XPDIST)\public\caps \
+    /I$(XPDIST)\public\softupdt \
 !if defined(MOZ_OJI)
     /I$(XPDIST)\public\oji \
     /I$(XPDIST)\public\ojiimpl \
     /I$(XPDIST)\public\npj \
-    /I$(XPDIST)\public\softupdt \
 !elseif defined(MOZ_JAVA)
     /I$(XPDIST)\public\applet \
     /I$(XPDIST)\public\softupdt \

mozilla/cmd/xfe/mozilla.c

@@ -2918,12 +2918,10 @@ main
 #endif
 
 
-#ifdef JAVA
   /* Startup softupdate */
 #if defined(MOZ_SMARTUPDATE)
   SU_Startup();
 #endif /* MOZ_SMARTUPDATE */
-#endif /* MOZ_MAIL_NEWS */
 
   NR_StartupRegistry();
   fe_RegisterConverters ();  /* this must be before InstallPreferences(),

mozilla/config/liteness.mak

@@ -183,3 +183,8 @@ MOZ_LITENESS_FLAGS=$(MOZ_LITENESS_FLAGS) -DMOZ_SMARTUPDATE
 !if defined(MOZ_NGLAYOUT)
 MOZ_LITENESS_FLAGS=$(MOZ_LITENESS_FLAGS) -DMOZ_NGLAYOUT
 !endif
+
+!ifdef MOZ_SMARTUPDATE
+MOZ_LITENESS_FLAGS=$(MOZ_LITENESS_FLAGS) -DMOZ_SMARTUPDATE
+!endif
+

mozilla/modules/makefile.win

@@ -54,11 +54,11 @@ DIRS=                   \
 !ifdef JAVA_OR_NSJVM
 !ifdef EDITOR
 	edtplug         \
+!endif
+	zlib            \
 !endif
 !ifdef MOZ_SMARTUPDATE
 	softupdt        \
-!endif
-	zlib            \
 !endif
 	progress	\
 !if ("$(MOZ_BITS)" == "16")