merging from SMARTUPDATE_BRANCH

This commit is contained in:
dveditz 1998-06-07 10:30:56 +00:00
parent 00afc9fcd8
commit aaae76e5aa
2 changed files with 13 additions and 0 deletions

View File

@ -452,6 +452,10 @@ DEFINES += -DOJI
JAVA_OR_OJI = 1
endif
ifdef JAVA_OR_OJI
MOZ_SMARTUPDATE = 1
endif
ifndef NO_MOCHA
DEFINES += -DMOCHA
endif

View File

@ -153,6 +153,15 @@ MOZ_COPY_ALL_JARS=1
MOZ_SPELLCHK=1
!endif
!ifdef MOZ_JAVA
MOZ_SMARTUPDATE=1
MOZ_LITENESS_FLAGS=$(MOZ_LITENESS_FLAGS) -DMOZ_SMARTUPDATE
!endif
!ifdef MOZ_OJI
MOZ_SMARTUPDATE=1
MOZ_LITENESS_FLAGS=$(MOZ_LITENESS_FLAGS) -DMOZ_SMARTUPDATE
!endif
### This probably isn't the best place to put this.
!if defined(MOZ_NGLAYOUT)