(MOVE_FLAGS, MOVE_LIBS): New variables.

(pop.o, movemail.o): New targets.
(movemail): Link in pop.o and movemail.o.  Use MOVE_LIBS, MOVE_FLAGS.

1 files changed, 32 insertions, 2 deletions

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index d25a7a4161f..0d4d13dd829 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -103,6 +103,30 @@ EXECUTABLES= ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
 SOURCES = COPYING ChangeLog Makefile.in README aixcc.lex emacs.csh \
 	makedoc.com *.[chy] rcs2log vcdiff
 
+# Additional -D flags for movemail (add to MOVE_FLAGS if desired):
+# MAIL_USE_POP		Support mail retrieval from a POP mailbox.
+# MAIL_USE_MMDF		Support MMDF mailboxes.
+# MAIL_USE_FLOCK	Use flock for file locking (see the comments
+#			about locking in movemail.c)
+# MAIL_UNLINK_SPOOL	Unlink the user's spool mailbox after reading
+#			it (instead of just emptying it).
+# KERBEROS		Support Kerberized POP.
+# KRB5			Support Kerberos Version 5 pop instead of
+#			Version 4 (define this in addition to
+#			KERBEROS).
+# HESIOD		Support Hesiod lookups of user mailboxes.
+# MAILHOST		A string, the host name of the default POP
+#			mail host for the site.
+MOVE_FLAGS=
+
+# Additional libraries for movemail:
+# For KERBEROS
+# MOVE_LIBS= -lkrb -ldes -lcom_err
+# For KERBEROS + KRB5
+# MOVE_LIBS= -lkrb5 -lcrypto -lisode -lcom_err
+# Add "-lhesiod" if HESIOD is defined.
+MOVE_LIBS=
+
 # ========================== start of cpp stuff =======================
 /* From here on, comments must be done in C syntax.  */
 
@@ -299,8 +323,14 @@ sorted-doc: ${srcdir}/sorted-doc.c ${ALLOCA}
 b2m: ${srcdir}/b2m.c ../src/config.h
 	$(CC) ${ALL_CFLAGS} ${srcdir}/b2m.c $(LOADLIBES) -o b2m 
 
-movemail: ${srcdir}/movemail.c ../src/config.h
-	$(CC) ${ALL_CFLAGS} ${srcdir}/movemail.c $(LOADLIBES) -o movemail
+movemail: movemail.o pop.o
+	$(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o $(LOADLIBES) $(MOVE_LIBS) -o movemail
+
+movemail.o: ${srcdir}/movemail.c ../src/config.h
+	$(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/movemail.c
+
+pop.o: ${srcdir}/pop.c
+	$(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c
 
 cvtmail: ${srcdir}/cvtmail.c
 	$(CC) ${ALL_CFLAGS} ${srcdir}/cvtmail.c $(LOADLIBES) -o cvtmail