(INCLUDES): Remove INTLINCS

27 files changed, 27 insertions, 27 deletions

diff --git a/auth/Makefile.am b/auth/Makefile.am
index 4cd9cf216..8e7fc3ac6 100644
--- a/auth/Makefile.am
+++ b/auth/Makefile.am
@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ 
 AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" \
             -DSITE_CRAM_MD5_PWD=\"@SITE_CRAM_MD5_PWD@\"
 
diff --git a/comsat/Makefile.am b/comsat/Makefile.am
index 70eb4902b..ac2d4435d 100644
--- a/comsat/Makefile.am
+++ b/comsat/Makefile.am
@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ 
 
 sbin_PROGRAMS = comsatd
 
diff --git a/dotlock/Makefile.am b/dotlock/Makefile.am
index 628865c0f..cb91e8b5a 100644
--- a/dotlock/Makefile.am
+++ b/dotlock/Makefile.am
@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ 
 
 bin_PROGRAMS = dotlock
 
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 9e0c14a0d..d8d1fcf4a 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -49,7 +49,7 @@ noinst_PROGRAMS = \
 moddir=@SIEVE_MODDIR@
 mod_LTLIBRARIES = numaddr.la
 
-INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ 
 
 AM_LDFLAGS = \
  ../lib/libmuaux.la\
diff --git a/examples/cpp/Makefile.am b/examples/cpp/Makefile.am
index a2eeac645..994cf3667 100644
--- a/examples/cpp/Makefile.am
+++ b/examples/cpp/Makefile.am
@@ -30,7 +30,7 @@ CXX_EXAMPLES = \
 EXTRA_PROGRAMS=$(CXX_EXAMPLES)
 noinst_PROGRAMS = @MU_BUILT_CXX_EXAMPLES@
 
-INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ 
 
 AM_LDFLAGS = \
  ../../lib/libmuaux.la\
diff --git a/frm/Makefile.am b/frm/Makefile.am
index 6780beba9..f376f183c 100644
--- a/frm/Makefile.am
+++ b/frm/Makefile.am
@@ -18,7 +18,7 @@
 ##   Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ 
 
 SUBDIRS = testsuite
 
diff --git a/guimb/Makefile.am b/guimb/Makefile.am
index f0c7e3d00..aedbf22b6 100644
--- a/guimb/Makefile.am
+++ b/guimb/Makefile.am
@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ @GUILE_INCLUDES@ @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ @GUILE_INCLUDES@ 
 
 SUBDIRS=scm
 
diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am
index 8f4d4c200..eac82126f 100644
--- a/imap4d/Makefile.am
+++ b/imap4d/Makefile.am
@@ -18,7 +18,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ @MU_AUTHINCS@ @SERV_AUTHINCS@ @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ @MU_AUTHINCS@ @SERV_AUTHINCS@ 
 SUBDIRS = testsuite
 
 sbin_PROGRAMS =	imap4d
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0b009870b..22f795f16 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -20,7 +20,7 @@
 
 noinst_LTLIBRARIES = libmuaux.la
 
-INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ 
 
 libmuaux_la_SOURCES = \
  daemon.c\
diff --git a/libmu_cpp/Makefile.am b/libmu_cpp/Makefile.am
index 56086e370..882a55fb9 100644
--- a/libmu_cpp/Makefile.am
+++ b/libmu_cpp/Makefile.am
@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ 
 
 MU_CXX_LIBS = libmu_cpp.la
 lib_LTLIBRARIES = @MU_CXX_LIBS@
diff --git a/libmu_scm/Makefile.am b/libmu_scm/Makefile.am
index f8302ced5..936c346c6 100644
--- a/libmu_scm/Makefile.am
+++ b/libmu_scm/Makefile.am
@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = -I. @MU_COMMON_INCLUDES@ @GUILE_INCLUDES@ @INTLINCS@
+INCLUDES = -I. @MU_COMMON_INCLUDES@ @GUILE_INCLUDES@ 
 
 lib_LTLIBRARIES=@MU_SCM@
 EXTRA_LTLIBRARIES=libmu_scm.la
diff --git a/libproto/imap/Makefile.am b/libproto/imap/Makefile.am
index 33b3a8ce4..687f6c74f 100644
--- a/libproto/imap/Makefile.am
+++ b/libproto/imap/Makefile.am
@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
 
 lib_LTLIBRARIES = libmu_imap.la
 libmu_imap_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libproto/maildir/Makefile.am b/libproto/maildir/Makefile.am
index 85ed0bf6c..d71bc7a41 100644
--- a/libproto/maildir/Makefile.am
+++ b/libproto/maildir/Makefile.am
@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
 
 lib_LTLIBRARIES = libmu_maildir.la
 libmu_maildir_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libproto/mbox/Makefile.am b/libproto/mbox/Makefile.am
index 7c28ad73a..48a7fd2ef 100644
--- a/libproto/mbox/Makefile.am
+++ b/libproto/mbox/Makefile.am
@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
 
 lib_LTLIBRARIES = libmu_mbox.la
 libmu_mbox_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libproto/mh/Makefile.am b/libproto/mh/Makefile.am
index 5c9e713c6..43d77be66 100644
--- a/libproto/mh/Makefile.am
+++ b/libproto/mh/Makefile.am
@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
 
 lib_LTLIBRARIES = libmu_mh.la
 libmu_mh_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libproto/nntp/Makefile.am b/libproto/nntp/Makefile.am
index eb5cc79d3..73ff03761 100644
--- a/libproto/nntp/Makefile.am
+++ b/libproto/nntp/Makefile.am
@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
 
 lib_LTLIBRARIES = libmu_nntp.la
 libmu_nntp_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libproto/pop/Makefile.am b/libproto/pop/Makefile.am
index 319c373a1..a0e3c1921 100644
--- a/libproto/pop/Makefile.am
+++ b/libproto/pop/Makefile.am
@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
 
 lib_LTLIBRARIES = libmu_pop.la
 libmu_pop_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libsieve/Makefile.am b/libsieve/Makefile.am
index 07e1bb8e5..214f2683a 100644
--- a/libsieve/Makefile.am
+++ b/libsieve/Makefile.am
@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ 
 
 YLWRAP = $(SHELL) $(top_srcdir)/scripts/gylwrap
 AM_YFLAGS = -dtv
diff --git a/libsieve/extensions/Makefile.am b/libsieve/extensions/Makefile.am
index e199a51d8..32f2ae5b3 100644
--- a/libsieve/extensions/Makefile.am
+++ b/libsieve/extensions/Makefile.am
@@ -25,7 +25,7 @@ mod_LTLIBRARIES = \
  timestamp.la\
  vacation.la
 
-INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ 
 
 AM_LDFLAGS = ../../lib/libmuaux.la ${MU_LIB_MAILUTILS} 
 
diff --git a/mail.local/Makefile.am b/mail.local/Makefile.am
index ae052ffb9..6399265b5 100644
--- a/mail.local/Makefile.am
+++ b/mail.local/Makefile.am
@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = -I${top_srcdir} @MU_COMMON_INCLUDES@ @GUILE_INCLUDES@ @INTLINCS@
+INCLUDES = -I${top_srcdir} @MU_COMMON_INCLUDES@ @GUILE_INCLUDES@ 
 SUBDIRS = testsuite
 
 libexec_PROGRAMS = mail.local
diff --git a/mail.remote/Makefile.am b/mail.remote/Makefile.am
index c7d5b84ca..1db1220e5 100644
--- a/mail.remote/Makefile.am
+++ b/mail.remote/Makefile.am
@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ 
 
 SUBDIRS = testsuite
 PROGRAMS_SMTP = mail.remote$(EXEEXT)
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 5c1240862..9ebafbf54 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -18,7 +18,7 @@
 ##   02110-1301 USA
 
 AM_YFLAGS=-vt
-INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ @MU_AUTHINCS@ 
+INCLUDES = @MU_COMMON_INCLUDES@ @MU_AUTHINCS@ 
 AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\"
 
 bin_PROGRAMS = mail
diff --git a/mailbox/Makefile.am b/mailbox/Makefile.am
index e22dffd48..aaaceb6a4 100644
--- a/mailbox/Makefile.am
+++ b/mailbox/Makefile.am
@@ -18,7 +18,7 @@
 ##   Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
 
 YLWRAP = $(SHELL) $(top_srcdir)/scripts/gylwrap
 AM_YFLAGS=-vt
diff --git a/messages/Makefile.am b/messages/Makefile.am
index f3e693e58..87625c67e 100644
--- a/messages/Makefile.am
+++ b/messages/Makefile.am
@@ -17,7 +17,7 @@
 ##   Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ 
 
 SUBDIRS = testsuite
 
diff --git a/mh/Makefile.am b/mh/Makefile.am
index fad49e717..fbc4b6cd3 100644
--- a/mh/Makefile.am
+++ b/mh/Makefile.am
@@ -123,7 +123,7 @@ mailutils-mh.el: mailutils-mh.eli
 .eli.el:
 	sed "s,BINDIR,$(bindir),g;s,MHLIBDIR,$(mhlibdir),g" $< > $@
 
-INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ 
 AM_CPPFLAGS = -D_GNU_SOURCE -DMHLIBDIR=\"$(mhlibdir)\" -DMHBINDIR=\"$(bindir)\"
 mh_LIBS = \
  ./libmh.a\
diff --git a/mimeview/Makefile.am b/mimeview/Makefile.am
index ba4a2a5fe..5e970c1a9 100644
--- a/mimeview/Makefile.am
+++ b/mimeview/Makefile.am
@@ -17,7 +17,7 @@
 ##   Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ 
 
 AM_CFLAGS = -DDEFAULT_CUPS_CONFDIR=\"@DEFAULT_CUPS_CONFDIR@\"
 
diff --git a/movemail/Makefile.am b/movemail/Makefile.am
index 81f9743a9..1071ce811 100644
--- a/movemail/Makefile.am
+++ b/movemail/Makefile.am
@@ -18,7 +18,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ @MU_AUTHINCS@
+INCLUDES = @MU_COMMON_INCLUDES@ @MU_AUTHINCS@
 bin_PROGRAMS = movemail
 
 movemail_LDADD = \