Add suport for READLINE and ARGP

1 files changed, 13 insertions, 9 deletions

diff --git a/mail/Makefile.am b/mail/Makefile.am
index c9384fb3e..4723ef89b 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -1,13 +1,17 @@
-CFLAGS = -Wall -pedantic -g -DTESTING
+AUTOMAKE_OPTIONS = ../lib/ansi2knr no-dependencies
+
+CFLAGS = -Wall -pedantic -g
+
 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib
 
 bin_PROGRAMS = mail
 
-mail_DEPENDENCIES = ../mailbox/libmailbox.la
-mail_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.a -lreadline
-mail_SOURCES = alias.c alt.c cd.c copy.c delete.c discard.c dp.c \
-	echo.c edit.c eq.c exit.c file.c folders.c followup.c from.c \
-	headers.c help.c hold.c if.c list.c mail.c mail.h mbox.c next.c pipe.c \
-	previous.c print.c quit.c reply.c retain.c save.c \
-	send.c set.c shell.c size.c source.c top.c touch.c unalias.c \
-	undelete.c unset.c util.c visual.c write.c z.c table.c
+mail_DEPENDENCIES = @ARGPLIB@ ../mailbox/libmailbox.la
+
+mail_LDADD = @ARGPLIB@ ../mailbox/libmailbox.la ../lib/libmailutils.a
+
+mail_SOURCES = alias.c alt.c cd.c copy.c delete.c discard.c dp.c echo.c \
+  edit.c eq.c exit.c file.c folders.c followup.c from.c headers.c help.c \
+  hold.c if.c list.c mail.c mail.h mbox.c next.c pipe.c previous.c print.c \
+  quit.c reply.c retain.c save.c send.c set.c shell.c size.c source.c table.c \
+  top.c touch.c unalias.c undelete.c unset.c util.c visual.c write.c z.c