build and link against libmime (on Unix only, until I find some victims to

test things out on the other platforms.)

cmd/xfe/Makefile

@@ -326,6 +326,17 @@ BASIC_LIBS_2	= \
 		  $(DIST)/lib/lib$(LITE_PREFIX)rdf.a \
 		  $(NULL)
 
+
+# jwz: link in libmime all the time.
+# but it needs to be before libnetutil, and I don't know how to do that,
+# so just link against libnetutil twice.
+
+BASIC_LIBS	+= \
+		  $(DIST)/lib/libmime.a		\
+		  $(DIST)/lib/libnetutil.a      \
+		  $(NULL)
+
+
 ifdef MOZ_MAIL_NEWS
 ifdef MOZ_SECURITY
 BASIC_LIBS	+= \
@@ -358,8 +369,7 @@ ifdef MOZ_SECURITY
 BASIC_LIBS	+= $(DIST)/lib/libmsg.a \
 		$(NULL)
 endif
-BASIC_LIBS	+= $(DIST)/lib/libmime.a \
-		  $(DIST)/lib/libaddr.a \
+BASIC_LIBS	+= $(DIST)/lib/libaddr.a \
 		  $(DIST)/lib/libneo.a \
 		  $(DIST)/lib/libaddr.a \
 		  $(NULL)

lib/Makefile

@@ -37,8 +37,10 @@ endif
 
 DIRS	+= libparse xlate xp
 
+DIRS	+= libmime
+
 ifdef MOZ_MAIL_NEWS
-DIRS	+= libaddr libmime
+DIRS	+= libaddr
 endif
 
 DIRS	+= htmldlgs

lib/libmime/Makefile

@@ -55,7 +55,7 @@ CSRCS		= \
 #		  mimevcrd.c \
 
 
-REQUIRES	= mime nspr dbm img util layer security pref js julian nls
+REQUIRES = mime nspr dbm img util layer security pref js julian nls xp network
 
 include $(DEPTH)/config/rules.mk
 
@@ -74,7 +74,8 @@ DEFINES += -DMOZILLA_30
 # Building the "mimefilt" executable, which reads a message from stdin and
 # writes HTML to stdout
 
-FILT_LIBS=-L$(DIST)/lib -L$(DIST)/bin -li18n -lnetwork -lxp -lnspr21 -lplc21
+FILT_LIBS=-L$(DIST)/lib -L$(DIST)/bin -li18n -lnetwork -lxp \
+	-lnspr21 -lplc21 -lplds21
 
 $(OBJDIR)/mimefilt: $(FILT_OBJS) $(LIBRARY)
 	@$(MAKE_OBJDIR)

network/cnvts/cvmime.c

@@ -796,6 +796,12 @@ NET_RegisterMIMEDecoders (void)
 									(void *) 1, IL_ViewStream);
 #endif
 
+#ifdef XP_UNIX  /* #### do this on other platforms too, once those platforms
+                    are linking against libmime. */
+  /* Decoders for libmime/mimemoz.c */
+  MIME_RegisterConverters();
+#endif
+
 #ifdef MOZ_MAIL_NEWS
   /* Decoders for libmsg/compose.c */
   MSG_RegisterConverters ();