Added @ARGP.*@ substitutions

 AUTOMAKE_OPTIONS = ../lib/ansi2knr
-INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include
+INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @ARGPINCS@
 
 sbin_PROGRAMS = comsatd
 
 comsatd_SOURCES = action.c cfg.c comsat.c comsat.h
 
-comsatd_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.a
+comsatd_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.a

 AUTOMAKE_OPTIONS = ../lib/ansi2knr
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include @ARGPINCS@
 
 sbin_PROGRAMS =	imap4d
 
-imap4d_LDADD = ../mailbox/libmailbox.la  @AUTHLIBS@ ../lib/libmailutils.a
+imap4d_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la  @AUTHLIBS@ ../lib/libmailutils.a
 imap4d_SOURCES = append.c authenticate.c bye.c capability.c check.c close.c \
  commands.c copy.c create.c delete.c examine.c expunge.c fetch.c imap4d.c \
  imap4d.h list.c logout.c login.c lsub.c namespace.c noop.c rename.c search.c \
  select.c signal.c status.c store.c subscribe.c sync.c uid.c unsubscribe.c \
- util.c
+ util.c 
 

 AUTOMAKE_OPTIONS = ../lib/ansi2knr
-INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm
+INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @ARGPINCS@
 
 libexec_PROGRAMS = mail.local
 mail_local_SOURCES = main.c mailquota.c script.c mail.local.h
 
-mail_local_LDADD = @LIBMU_SCM@ ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.a @GUILE_LIBS@ 
+mail_local_LDADD = @ARGPLIBS@ @LIBMU_SCM@ ../mailbox/libmailbox.la \
+ @AUTHLIBS@ ../lib/libmailutils.a @GUILE_LIBS@ 
  
 
 install-exec-hook:

 AUTOMAKE_OPTIONS = ../lib/ansi2knr
-INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include
+INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @ARGPINCS@
 
 sbin_PROGRAMS = pop3d
 bin_PROGRAMS = @POPAUTH@
@@ -9,7 +9,7 @@ pop3d_SOURCES = apop.c auth.c capa.c dele.c extra.c pop3d.c pop3d.h \
  list.c lock.c noop.c quit.c retr.c rset.c stat.c signal.c top.c uidl.c \
  user.c virtual.c
 
-pop3d_LDADD = ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.a
+pop3d_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.a 
 
 popauth_SOURCES = popauth.c
 popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.a