changing MOZ_MAIL_COMPOSE to MOZ_ENDER_MIME

lib/makefile.win

@@ -46,7 +46,7 @@ DIRS=   libi18n htmldlgs libparse layout libstyle
 DIRS= $(DIRS) libaddr
 !endif
 
-!ifdef MOZ_MAIL_COMPOSE
+!ifdef MOZ_ENDER_MIME
 DIRS= $(DIRS) mailto
 !endif
 

network/main/makefile.win

@@ -36,9 +36,6 @@ LCFLAGS		= $(LCFLAGS)  -DMOZILLA_CLIENT
 !ifdef BUILD_DEBUG_GC
 LCFLAGS		= $(LCFLAGS) -DDEBUG_GC
 !endif
-!ifdef MOZ_MAIL_COMPOSE
-LCFLAGS		= $(LCFLAGS) -DMOZ_MAIL_COMPOSE
-!endif
 LLIBS=  \
 	$(NULL)
 MISCDEP=$(LLIBS)

network/protocol/makefile.win

@@ -34,7 +34,7 @@ DIRS= \
 	gopher \
 	http \
 	remote \
-!if defined(SMART_MAIL) || defined(MOZ_MAIL_COMPOSE)
+!if defined(SMART_MAIL) 
 	pop3 \
 !endif
 !ifndef MODULAR_NETLIB
@@ -42,7 +42,7 @@ DIRS= \
 	js \
 	marimba \
 !endif
-!if defined(MOZ_MAIL_COMPOSE) || defined(MOZ_MAIL_NEWS)
+!if defined(MOZ_MAIL_NEWS)
 	smtp \
 !endif
 !ifdef MOZ_MAIL_NEWS 

network/protocol/smtp/makefile.win

@@ -34,9 +34,6 @@ LCFLAGS		= $(LCFLAGS)  -DMOZILLA_CLIENT
 !ifdef BUILD_DEBUG_GC
 LCFLAGS		= $(LCFLAGS) -DDEBUG_GC
 !endif
-!ifdef MOZ_MAIL_COMPOSE
-LCFLAGS     = $(LCFLAGS) -DMOZ_MAIL_COMPOSE
-!endif
 
 LLIBS=  \
 	$(NULL)

network/util/makefile.win

@@ -42,7 +42,7 @@ MISCDEP=$(LLIBS)
 
 OBJS=   \
 	.\$(OBJDIR)\mkreg.obj	\
-!if defined(SMART_MAIL) || defined(MOZ_MAIL_COMPOSE)
+!if defined(SMART_MAIL) 
 	.\$(OBJDIR)\mkbuf.obj	\
 !endif
 	$(NULL)
@@ -50,7 +50,7 @@ OBJS=   \
 
 CSRCS =	\
 	mkreg.c	\
-!if defined(SMART_MAIL) || defined(MOZ_MAIL_COMPOSE)
+!if defined(SMART_MAIL) 
 	mkbuf.c \
 !endif
 	$(NULL)
@@ -65,7 +65,7 @@ EXTRA_LIBS=
 REQUIRES= network
 EXPORTS= \
 	mkreg.h \
-!if defined(SMART_MAIL) || defined(MOZ_MAIL_COMPOSE)
+!if defined(SMART_MAIL)
 	mkbuf.h \
 !endif
 	$(NULL);
@@ -78,7 +78,7 @@ C_OBJS = \
 #!if "$(MOZ_BITS)" != "16"
 LINCS= \
 	-I$(PUBLIC)\network \
-!if defined(SMART_MAIL) || defined(MOZ_MAIL_COMPOSE)
+!if defined(SMART_MAIL)
 	-I$(DEPTH)\lib\xp \
 !endif
 	$(NULL)