Removed @ARGPINCS@ and @ARGPLIBS@

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

 AUTOMAKE_OPTIONS = ../lib/ansi2knr
-INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @ARGPINCS@
+INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm 
 
 bin_PROGRAMS = dotlock
 #dotlock_SOURCES = dotlock.c
 
-dotlock_LDADD = ../mailbox/libmailbox.la @ARGPLIBS@ ../lib/libmailutils.la
+dotlock_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la 
 
 install-exec-hook:
 	for i in $(bin_PROGRAMS); do\

 AUTOMAKE_OPTIONS = ../lib/ansi2knr
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @ARGPINCS@ 
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib 
 
 bin_PROGRAMS = frm
 
-frm_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la
+frm_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la 

 AUTOMAKE_OPTIONS = ../lib/ansi2knr
 INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include \
- -I$(top_srcdir)/libmu_scm @ARGPINCS@
+ -I$(top_srcdir)/libmu_scm 
 
 SUBDIRS=scm
 
 bin_PROGRAMS=@GUIMB@
 EXTRA_PROGRAMS=guimb
 guimb_SOURCES=main.c collect.c util.c guimb.h 
-guimb_LDADD = @ARGPLIBS@ ../libmu_scm/libmu_scm.a ../mailbox/libmailbox.la \
+guimb_LDADD = ../libmu_scm/libmu_scm.a ../mailbox/libmailbox.la \
  ../lib/libmailutils.la @GUILE_LIBS@ 
 

 AUTOMAKE_OPTIONS = ../lib/ansi2knr
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include @ARGPINCS@ @AUTHINCS@
+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include @AUTHINCS@
 
 sbin_PROGRAMS =	imap4d
 
-imap4d_LDADD = @AUTHOBJS@ @ARGPLIBS@ ../mailbox/libmailbox.la  @AUTHLIBS@ ../lib/libmailutils.la
+imap4d_LDADD = @AUTHOBJS@ ../mailbox/libmailbox.la  @AUTHLIBS@ ../lib/libmailutils.la 
 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 \
@@ -12,6 +12,6 @@ imap4d_SOURCES = append.c authenticate.c bye.c capability.c check.c close.c \
 
 ## This kludge is necessary to correctly establish imap4d -> AUTHOBJS
 ## dependency. Think about better approach         --gray
-imap4d_DEPENDENCIES = @AUTHOBJS@ @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la
+imap4d_DEPENDENCIES = @AUTHOBJS@ ../mailbox/libmailbox.la ../lib/libmailutils.la
 
 EXTRA_DIST=auth_gss.c

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

-AUTOMAKE_OPTIONS = ../lib/ansi2knr no-dependencies
+AUTOMAKE_OPTIONS = ../lib/ansi2knr 
 AM_YFLAGS=-vt
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @ARGPINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib 
 AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\"
 
 bin_PROGRAMS = mail
 
-mail_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la \
-             @READLINE_LIBS@
+mail_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la \
+             @READLINE_LIBS@ 
 
 EXTRA_DIST = msgset.c
 

 AUTOMAKE_OPTIONS = ../lib/ansi2knr
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @ARGPINCS@
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib 
 
 bin_PROGRAMS = messages
 
-messages_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la
+messages_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la 

@@ -10,8 +10,8 @@ libmh_a_SOURCES= \
 noinst_HEADERS = mh.h mh_getopt.h
 scan_SOURCES = scan.c
 inc_SOURCES = inc.c
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @ARGPINCS@
-mh_LIBS = ./libmh.a @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib 
+mh_LIBS = ./libmh.a ../mailbox/libmailbox.la ../lib/libmailutils.la
 scan_LDADD = $(mh_LIBS)  -lcurses -ltermcap
 inc_LDADD = $(mh_LIBS)
 YFLAGS=-vt

 AUTOMAKE_OPTIONS = ../lib/ansi2knr
-INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @ARGPINCS@
+INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include 
 
 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 = @ARGPLIBS@ ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la 
+pop3d_LDADD = ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la 
 
 popauth_SOURCES = popauth.c
 popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la

 #CFLAGS = -Wall -pedantic -g -DTESTING
 AUTOMAKE_OPTIONS = ../lib/ansi2knr
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @ARGPINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib 
 YLWRAP = $(SHELL) $(srcdir)/ylwrap
 YFLAGS = -d
 
@@ -54,7 +54,7 @@ HDR = \
   tree.h \
   util.h
 
-sieve_LDADD = ../mailbox/libmailbox.la @ARGPLIBS@ ../lib/libmailutils.la
+sieve_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la 
 sieve_SOURCES = \
   sieve.c \
   ${SRC} $(HDR)