Added @INTLINCS@ and @LTLIBINTL@ where appropriate.

@@ -2,7 +2,7 @@
 # Copyright (C) 2000,2001,2002 Free Software Foundation
 # See file COPYING in the distribution root directory for copying conditions.
 
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox/include -I${top_srcdir}/lib
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox/include -I${top_srcdir}/lib @INTLINCS@
 AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"
 
 lib_LTLIBRARIES = libmuauth.la

@@ -2,10 +2,10 @@
 # Copyright (C) 2000,2001,2002 Free Software Foundation
 # See file COPYING in the distribution root directory for copying conditions.
 
-INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include 
+INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @INTLINCS@
 
 sbin_PROGRAMS = comsatd
 
 comsatd_SOURCES = action.c cfg.c comsat.c comsat.h
 
-comsatd_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la 
+comsatd_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@

@@ -2,12 +2,12 @@
 # Copyright (C) 2000,2001,2002 Free Software Foundation
 # See file COPYING in the distribution root directory for copying conditions.
 
-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 @INTLINCS@
 
 bin_PROGRAMS = dotlock
 #dotlock_SOURCES = dotlock.c
 
-dotlock_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la 
+dotlock_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
 
 install-exec-hook:
 	for i in $(bin_PROGRAMS); do\

@@ -16,7 +16,7 @@ noinst_PROGRAMS = \
 moddir=@SIEVE_MODDIR@
 mod_LTLIBRARIES = numaddr.la
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@
 AM_LDFLAGS = ../mailbox/libmailbox.la ../lib/libmailutils.la
 
 numaddr_la_SOURCES = numaddr.c

@@ -2,9 +2,9 @@
 # Copyright (C) 2000,2001,2002 Free Software Foundation
 # See file COPYING in the distribution root directory for copying conditions.
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib 
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@
 SUBDIRS = testsuite
 
 bin_PROGRAMS = frm
 frm_SOURCES = frm.c
-frm_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la 
+frm_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@

@@ -2,9 +2,9 @@
 # Copyright (C) 2000,2001,2002 Free Software Foundation
 # See file COPYING in the distribution root directory for copying conditions.
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@
 SUBDIRS = testsuite
 
 bin_PROGRAMS = from
 
-from_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la
+from_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@

@@ -3,7 +3,7 @@
 # See file COPYING in the distribution root directory for copying conditions.
 
 INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include \
- -I$(top_srcdir)/libmu_scm @GUILE_INCLUDES@
+ -I$(top_srcdir)/libmu_scm @GUILE_INCLUDES@ @INTLINCS@
 
 SUBDIRS=scm
 
@@ -11,5 +11,5 @@ bin_PROGRAMS=@GUIMB@
 EXTRA_PROGRAMS=guimb
 guimb_SOURCES=main.c collect.c util.c guimb.h 
 guimb_LDADD = ../libmu_scm/libmu_scm.la ../mailbox/libmailbox.la \
- ../lib/libmailutils.la @GUILE_LIBS@ 
+ ../lib/libmailutils.la @GUILE_LIBS@ @LTLIBINTL@
 

@@ -2,12 +2,12 @@
 # Copyright (C) 2000,2001,2002 Free Software Foundation
 # See file COPYING in the distribution root directory for copying conditions.
 
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include @AUTHINCS@
+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include @AUTHINCS@ @INTLINCS@
 SUBDIRS = testsuite
 
 sbin_PROGRAMS =	imap4d
 
-imap4d_LDADD = @AUTHOBJS@ ../mailbox/libmailbox.la  @AUTHLIBS@ ../lib/libmailutils.la 
+imap4d_LDADD = @AUTHOBJS@ ../mailbox/libmailbox.la  @AUTHLIBS@ ../lib/libmailutils.la @LTLIBINTL@
 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 \

@@ -2,7 +2,7 @@
 # Copyright (C) 2000,2001,2002 Free Software Foundation
 # See file COPYING in the distribution root directory for copying conditions.
 
-INCLUDES =-I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @GUILE_INCLUDES@
+INCLUDES =-I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @GUILE_INCLUDES@ @INTLINCS@
 
 lib_LTLIBRARIES=@MU_SCM@
 EXTRA_LTLIBRARIES=libmu_scm.la

@@ -2,7 +2,7 @@
 # Copyright (C) 2000,2001,2002 Free Software Foundation
 # See file COPYING in the distribution root directory for copying conditions.
 
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib 
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @INTLINCS@
 YLWRAP = $(SHELL) $(top_srcdir)/scripts/ylwrap
 AM_YFLAGS = -dtv
 AM_CPPFLAGS = -DSIEVE_MODDIR=\"@SIEVE_MODDIR@\"

@@ -2,14 +2,14 @@
 # Copyright (C) 2000,2001,2002 Free Software Foundation
 # See file COPYING in the distribution root directory for copying conditions.
 
-INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/mailbox -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @GUILE_INCLUDES@
+INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/mailbox -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @GUILE_INCLUDES@ @INTLINCS@
 SUBDIRS = testsuite
 
 libexec_PROGRAMS = mail.local
 mail_local_SOURCES = main.c mailquota.c script.c mail.local.h
 
 mail_local_LDADD = @LIBMU_SCM@ @GUILE_LIBS@ ../mailbox/libmailbox.la \
- @AUTHLIBS@ ../libsieve/libsieve.la ../lib/libmailutils.la 
+ @AUTHLIBS@ ../libsieve/libsieve.la ../lib/libmailutils.la @LTLIBINTL@
  
 
 install-exec-hook:

@@ -3,13 +3,13 @@
 # See file COPYING in the distribution root directory for copying conditions.
 
 AM_YFLAGS=-vt
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_srcdir}/mailbox
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_srcdir}/mailbox @INTLINCS@
 AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\"
 
 bin_PROGRAMS = mail
 
 mail_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la \
-             @READLINE_LIBS@ 
+             @READLINE_LIBS@ @LTLIBINTL@
 
 EXTRA_DIST = msgset.c
 

@@ -2,7 +2,7 @@
 # Copyright (C) 2000,2001,2002 Free Software Foundation
 # See file COPYING in the distribution root directory for copying conditions.
 
-INCLUDES = -I${top_srcdir}/include -I$(top_srcdir)/intl -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu
+INCLUDES = -I${top_srcdir}/include -I$(top_srcdir)/intl -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu @INTLINCS@
 AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"
 
 SUBDIRS = include testsuite
@@ -86,9 +86,9 @@ url_smtp.c \
 wicket.c
 
 libmailbox_la_DEPENDENCIES = @MU_LTLIBOBJS@
-libmailbox_la_LIBADD = @MU_LTLIBOBJS@ @LIBINTL@
+libmailbox_la_LIBADD = @MU_LTLIBOBJS@ @LTLIBINTL@
 libmailbox_la_LDFLAGS = -version-info 0:0:0
 
 mailutils_config_SOURCES = mailutils-config.c
-mailutils_config_LDADD = ./libmailbox.la ../lib/libmailutils.la
+mailutils_config_LDADD = ./libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
 mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" -I$(top_srcdir)/intl -DLINK_FLAGS="\"-L$(libdir)\"" -DAUTHLIBS="\"$(MYSQLLIBS)\"" -DGUILE_LIBS="\"$(GUILE_LIBS)\""

@@ -2,9 +2,9 @@
 # Copyright (C) 2000,2001,2002 Free Software Foundation
 # See file COPYING in the distribution root directory for copying conditions.
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib 
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@
 SUBDIRS = testsuite
 
 bin_PROGRAMS = messages
 
-messages_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la 
+messages_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@

@@ -31,8 +31,8 @@ mhpath_SOURCES = mhpath.c
 folder_SOURCES = folder.c
 fmtcheck_SOURCES = fmtcheck.c
 repl_SOURCES = repl.c
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib 
-mh_LIBS = ./libmh.a ../mailbox/libmailbox.la ../lib/libmailutils.la
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @INTLINCS@
+mh_LIBS = ./libmh.a ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
 scan_LDADD = $(mh_LIBS) @CURSES_LIBS@
 inc_LDADD = $(mh_LIBS)
 rmm_LDADD = $(mh_LIBS)

@@ -2,7 +2,7 @@
 # Copyright (C) 2000,2001,2002 Free Software Foundation
 # See file COPYING in the distribution root directory for copying conditions.
 
-INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include 
+INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @INTLINCS@
 
 sbin_PROGRAMS = pop3d
 bin_PROGRAMS = @POPAUTH@
@@ -13,7 +13,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 
 
-pop3d_LDADD = ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la 
+pop3d_LDADD = ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la @LTLIBINTL@
 
 popauth_SOURCES = popauth.c
-popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la
+popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@

@@ -2,10 +2,10 @@
 # Copyright (C) 2000,2001,2002 Free Software Foundation
 # See file COPYING in the distribution root directory for copying conditions.
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@
 SUBDIRS = testsuite
 
 bin_PROGRAMS = readmsg
 
 readmsg_SOURCES = readmsg.c msglist.c readmsg.h
-readmsg_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la
+readmsg_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@

@@ -2,11 +2,11 @@
 # Copyright (C) 2000,2001,2002 Free Software Foundation
 # See file COPYING in the distribution root directory for copying conditions.
 
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib 
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @INTLINCS@
 SUBDIRS  = testsuite
 
 bin_PROGRAMS = sieve
 sieve_SOURCES = sieve.c
-sieve_LDADD = ../libsieve/libsieve.la ../mailbox/libmailbox.la ../lib/libmailutils.la
+sieve_LDADD = ../libsieve/libsieve.la ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
 sieve_LDFLAGS = -export-dynamic