merge from OJI branch

git-svn-id: svn://10.0.0.236/trunk@2980 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jgellman
1998-06-03 00:37:20 +00:00
parent 1ccdb802f9
commit cb4014892b
106 changed files with 4652 additions and 3197 deletions

View File

@@ -36,20 +36,24 @@ ifdef NO_SECURITY
DIRS += security
endif
ifdef MOZ_JAVA
DIRS += libreg softupdt zlib li progress
ifdef JAVA_OR_OJI
DIRS += libreg softupdt
endif # JAVA_OR_OJI
ifdef EDITOR
DIRS += edtplug spellchk
ifdef MOZ_OJI
DIRS += modules/oji
endif
else # MOZ_JAVA
DIRS += zlib li progress
ifdef EDITOR
DIRS += spellchk
endif
endif # MOZ_JAVA
ifdef EDITOR
ifdef JAVA_OR_OJI
DIRS += edtplug
endif # JAVA_OR_OJI
DIRS += spellchk
endif # EDITOR
ifeq ($(subst /,_,$(shell uname -s)),OS2)
DIRS += spellchk