From 9d0f6d9824fff3d4e8246edcef220d11431b26e8 Mon Sep 17 00:00:00 2001
From: "mjudge%netscape.com" <mjudge%netscape.com>
Date: Fri, 9 Oct 1998 02:50:41 +0000
Subject: [PATCH] changing MOZ_MAIL_COMPOSE to MOZ_ENDER_MIME

---
 lib/makefile.win                   | 2 +-
 network/main/makefile.win          | 3 ---
 network/protocol/makefile.win      | 4 ++--
 network/protocol/smtp/makefile.win | 3 ---
 network/util/makefile.win          | 8 ++++----
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/lib/makefile.win b/lib/makefile.win
index b1a5dfd542a..2d5250afe87 100755
--- a/lib/makefile.win
+++ b/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
 
diff --git a/network/main/makefile.win b/network/main/makefile.win
index 23bf156575e..2f3874915b5 100644
--- a/network/main/makefile.win
+++ b/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)
diff --git a/network/protocol/makefile.win b/network/protocol/makefile.win
index ca50c53f7e2..f6210c7dd23 100644
--- a/network/protocol/makefile.win
+++ b/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 
diff --git a/network/protocol/smtp/makefile.win b/network/protocol/smtp/makefile.win
index a5fc91d5964..0605105e28c 100644
--- a/network/protocol/smtp/makefile.win
+++ b/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)
diff --git a/network/util/makefile.win b/network/util/makefile.win
index 3cb05b9bc4b..f746909dc46 100644
--- a/network/util/makefile.win
+++ b/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)