Use AM_CPPFLAGS instead of INCLUDES; upgrade gint

@@ -15,12 +15,13 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
-INCLUDES = @MU_APP_COMMON_INCLUDES@ 
 SUBDIRS = . tests
 sbin_PROGRAMS = comsatd
 
 comsatd_SOURCES = action.c comsat.c comsat.h biff.rc.h
-AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\"
+AM_CPPFLAGS = \
+ @MU_APP_COMMON_INCLUDES@\
+ -DSYSCONFDIR=\"$(sysconfdir)\"
 
 BUILT_SOURCES=biff.rc.h
 EXTRA_DIST=biffrc.sed biff.rc

@@ -308,6 +308,8 @@ MU_CHECK_GNUTLS([1.2.1],[
   AC_DEFINE(WITH_GNUTLS,1,[Define if mailutils is using GNU TLS])
   AC_DEFINE(WITH_TLS,1,[Define if mailutils is using TLS])
   status_gnutls=yes
+],[
+  status_gnutls=no
 ])
 
 AC_SUBST(SITE_MAIL_RC)

@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
-INCLUDES = @MU_APP_COMMON_INCLUDES@ 
+AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@ 
 
 bin_PROGRAMS = dotlock
 

@@ -55,7 +55,7 @@ EXTRA_PROGRAMS = nntpclient
 moddir=@MU_SIEVE_MODDIR@
 mod_LTLIBRARIES = numaddr.la
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ 
 
 LDADD = \
  ../lib/libmuaux.a\
@@ -72,7 +72,7 @@ msg_send_LDADD =\
  @MU_AUTHLIBS@\
  ${MU_LIB_MAILUTILS}
 
-mta_CPPFLAGS=-I${top_srcdir}/lib -I${top_builddir}/lib
+mta_CPPFLAGS=@MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/lib -I${top_builddir}/lib
 mta_LDADD =\
  ../lib/libmuaux.a\
  ${MU_LIB_MBOX}\

@@ -31,7 +31,7 @@ MU_CXX_EXAMPLES_LIST = \
 EXTRA_PROGRAMS=$(MU_CXX_EXAMPLES_LIST)
 noinst_PROGRAMS = @MU_CXX_EXAMPLES_BUILD@
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ 
 
 AM_LDFLAGS = \
  ../../lib/libmuaux.a\

@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
-INCLUDES = @MU_APP_COMMON_INCLUDES@ 
+AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@ 
 
 SUBDIRS = . tests
 

-Subproject commit a5774356a1c12d1bcb55b6322710e347e1604fc9
+Subproject commit fd86bf7d44b0c970771830692ae7491447ebe8b1

@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
-INCLUDES = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@ @SERV_AUTHINCS@ 
+AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@ @SERV_AUTHINCS@ 
 SUBDIRS = tests
 
 sbin_PROGRAMS =	imap4d

@@ -17,7 +17,7 @@
 
 include gnulib.mk
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
+AM_CPPFLAGS += @MU_LIB_COMMON_INCLUDES@ 
 
 libmuaux_a_SOURCES += \
  argp_base.c\

@@ -22,4 +22,4 @@ libaddress_la_SOURCES = \
  addrstream.c\
  parse822.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils

@@ -22,4 +22,4 @@ libauth_la_SOURCES = \
  mu_auth.c\
  system.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils

@@ -71,11 +71,11 @@ libbase_la_SOURCES = \
 
 localedir = $(datadir)/locale
 AM_CPPFLAGS = \
+  @MU_LIB_COMMON_INCLUDES@ -I/libmailutils\
  -DSYSCONFDIR=\"$(sysconfdir)\"\
  -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"\
  -DLOCALEDIR=\"$(localedir)\"
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
 
 YLWRAP = $(SHELL) $(mu_aux_dir)/gylwrap
 AM_YFLAGS=-vt

@@ -26,10 +26,10 @@ libcfg_la_SOURCES = \
 
 localedir = $(datadir)/locale
 AM_CPPFLAGS = \
+ @MU_LIB_COMMON_INCLUDES@ -I/libmailutils\
  -DSYSCONFDIR=\"$(sysconfdir)\"\
  -DLOCALEDIR=\"$(localedir)\"
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
 
 EXTRA_DIST = \
  lexer.l\

@@ -24,4 +24,4 @@ libcidr_la_SOURCES = \
  tosa.c\
  tostr.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils

@@ -30,4 +30,4 @@ libdatetime_la_SOURCES = \
  utcoff.c\
  yd.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils

@@ -26,7 +26,7 @@ libdiag_la_SOURCES = \
  syslog.c\
  wd.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
 
 EXTRA_DIST = \
  debcat\

@@ -35,5 +35,5 @@ libfilter_la_SOURCES =\
  linelenflt.c\
  qpflt.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libmailutils
 

@@ -40,4 +40,5 @@ libimapio_la_SOURCES = \
  words.c\
  xscript.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+

@@ -52,5 +52,5 @@ liblist_la_SOURCES = \
  sort.c\
  tail.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
 

@@ -56,4 +56,4 @@ libmailbox_la_SOURCES =  \
  msguid.c\
  msguidl.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils

@@ -21,4 +21,4 @@ libmailer_la_SOURCES = \
  mailer.c\
  progmailer.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils

@@ -22,4 +22,4 @@ libmime_la_SOURCES = \
  mime.c\
  mimehdr.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils

@@ -41,5 +41,5 @@ libmsgset_la_SOURCES = \
  subset.c\
  trans.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
 

@@ -27,4 +27,4 @@ libproperty_la_SOURCES = \
  propinv.c\
  propset.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils

@@ -23,4 +23,4 @@ libserver_la_SOURCES = \
  msrv.c\
  ipsrv.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils

@@ -28,4 +28,4 @@ libsockaddr_la_SOURCES = \
  unlink.c\
  url.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils

@@ -22,4 +22,4 @@ libstdstream_la_SOURCES = \
  dbgstream.c\
  strerr.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils

@@ -40,4 +40,4 @@ libstream_la_SOURCES = \
  temp_file_stream.c\
  xscript-stream.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils

@@ -40,4 +40,4 @@ libstring_la_SOURCES = \
  wordsplit.c\
  xdecode.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils

@@ -55,5 +55,5 @@ liburl_la_SOURCES = \
  urlinv.c\
  urlstr.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
 

@@ -16,8 +16,8 @@
 
 # This library uses gnulib calls and is always linked with gnulib, therefore
 # we use application includes here.
-INCLUDES = @MU_APP_COMMON_INCLUDES@ 
 AM_CPPFLAGS = \
+ @MU_APP_COMMON_INCLUDES@\
  -DSYSCONFDIR=\"$(sysconfdir)\"\
  -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"\
  -DSITE_CRAM_MD5_PWD=\"@SITE_CRAM_MD5_PWD@\"

@@ -35,7 +35,7 @@ const char version_etc_copyright[] =
   /* Do *not* mark this string for translation.  %s is a copyright
      symbol suitable for this locale, and %d is the copyright
      year.  */
-  "Copyright %s 2010 Free Software Foundation, inc.";
+  "Copyright %s 2007-2014 Free Software Foundation, inc.";
 
 void
 mu_program_version_hook (FILE *stream, struct argp_state *state)

@@ -15,8 +15,9 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
-AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" \
+AM_CPPFLAGS = \
+ @MU_LIB_COMMON_INCLUDES@\
+ -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" \
  -DSITE_CRAM_MD5_PWD=\"@SITE_CRAM_MD5_PWD@\"
 
 lib_LTLIBRARIES = libmu_auth.la

@@ -14,8 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
-AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" \
+AM_CPPFLAGS = \
+ @MU_LIB_COMMON_INCLUDES@\
+ -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" \
  -DSITE_CRAM_MD5_PWD=\"@SITE_CRAM_MD5_PWD@\"
 
 lib_LTLIBRARIES = libmu_cfg.la

@@ -22,5 +22,5 @@ libmu_compat_la_SOURCES = \
  filter_iconv.c\
  vartab.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
 

@@ -38,7 +38,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
 ## Non-installable programs
 ## -------------------------- ##
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ 
 noinst_PROGRAMS = argcv
 
 LDADD = ../libmu_compat.la ${MU_LIB_MAILUTILS}

@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ 
 
 lib_LTLIBRARIES = libmu_cpp.la
 

@@ -14,7 +14,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ @DBMINCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ @DBMINCLUDES@
 
 lib_LTLIBRARIES = libmu_dbm.la
 

@@ -17,7 +17,7 @@
 
 SUBDIRS = . mailutils
 
-INCLUDES = -I. @MU_LIB_COMMON_INCLUDES@ @GUILE_INCLUDES@
+AM_CPPFLAGS = -I. @MU_LIB_COMMON_INCLUDES@ @GUILE_INCLUDES@
 
 lib_LTLIBRARIES=libmu_scm.la
 
@@ -93,4 +93,5 @@ sitedir   = @GUILE_SITE@/$(PACKAGE)
 site_DATA =
 SUFFIXES=
 BUILT_SOURCES=
+MAINTAINERCLEANFILES=
 include ../gint/gint.mk

@@ -15,11 +15,11 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. 
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
-
 YLWRAP = $(SHELL) $(mu_aux_dir)/gylwrap
 AM_YFLAGS = -dtv
-AM_CPPFLAGS = -DMU_SIEVE_MODDIR=\"@MU_SIEVE_MODDIR@\"
+AM_CPPFLAGS =\
+ @MU_LIB_COMMON_INCLUDES@\
+ -DMU_SIEVE_MODDIR=\"@MU_SIEVE_MODDIR@\"
 
 SUBDIRS = . extensions
 

@@ -25,7 +25,7 @@ mod_LTLIBRARIES = \
  timestamp.la\
  vacation.la
 
-INCLUDES = @MU_APP_COMMON_INCLUDES@ 
+AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@ 
 
 AM_LDFLAGS = -module -avoid-version -no-undefined -rpath '$(moddir)' 
 

@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ 
 
 lib_LTLIBRARIES = libmu_imap.la
 libmu_imap_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@

@@ -18,7 +18,7 @@
 noinst_PROGRAMS = \
  imapfolder
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ 
 LDADD = \
  @MU_LIB_IMAP@\
  @MU_LIB_AUTH@\

@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils  If not, see <http://www.gnu.org/licenses/>. 
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ 
 
 lib_LTLIBRARIES = libmu_maildir.la
 libmu_maildir_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@

@@ -14,7 +14,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. 
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
 
 lib_LTLIBRARIES = libmu_mailer.la
 libmu_mailer_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@

@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. 
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ 
 
 lib_LTLIBRARIES = libmu_mbox.la
 libmu_mbox_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@

@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. 
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
 
 lib_LTLIBRARIES = libmu_mh.la
 libmu_mh_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@

@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. 
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
 
 lib_LTLIBRARIES = libmu_nntp.la
 libmu_nntp_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@

@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
 
 lib_LTLIBRARIES = libmu_pop.la
 libmu_pop_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@

@@ -54,7 +54,7 @@ maidag_LDADD = \
  @DBMLIBS@\
  @TCPWRAP_LIBRARIES@
 
-INCLUDES = -I${top_srcdir} @MU_APP_COMMON_INCLUDES@ @GUILE_INCLUDES@ \
+AM_CPPFLAGS = -I${top_srcdir} @MU_APP_COMMON_INCLUDES@ @GUILE_INCLUDES@ \
  @PYTHON_INCLUDES@
 
 install-exec-hook:

@@ -16,8 +16,9 @@
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. 
 
 AM_YFLAGS=-vt
-INCLUDES = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@ 
-AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\"
+AM_CPPFLAGS = \
+ @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@\
+ -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\"
 
 mailbindir=@MAILBINDIR@
 

@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. 
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
 
 SUBDIRS = include
 

@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. 
 
-INCLUDES = @MU_APP_COMMON_INCLUDES@ 
+AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@ 
 
 SUBDIRS = . tests
 

@@ -99,8 +99,11 @@ EXTRA_DIST = mh_fmtgram.y pick.y mh_alias.y mh_alias.l
 
 mhlibdir = $(pkgdatadir)/mh
 
-INCLUDES = @MU_APP_COMMON_INCLUDES@ 
-AM_CPPFLAGS = -D_GNU_SOURCE -DMHLIBDIR=\"$(mhlibdir)\" -DMHBINDIR=\"$(bindir)\"
+AM_CPPFLAGS =\
+ @MU_APP_COMMON_INCLUDES@\
+ -D_GNU_SOURCE -DMHLIBDIR=\"$(mhlibdir)\"\
+ -DMHBINDIR=\"$(bindir)\"
+
 mh_LIBS = \
  ./libmh.a\
  ../lib/libmuaux.a\

@@ -38,7 +38,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
 ## Non-installable programs   ##
 ## -------------------------- ##
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
 noinst_PROGRAMS = lu
 
 ## ------------ ##

@@ -15,9 +15,10 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. 
 
-INCLUDES = @MU_APP_COMMON_INCLUDES@ 
-
-AM_CFLAGS = -DDEFAULT_CUPS_CONFDIR=\"@DEFAULT_CUPS_CONFDIR@\"
+AM_CPPFLAGS = \
+ @MU_APP_COMMON_INCLUDES@\
+ -D_GNU_SOURCE=1\
+ -DDEFAULT_CUPS_CONFDIR=\"@DEFAULT_CUPS_CONFDIR@\"
 
 bin_PROGRAMS = mimeview
 mimeview_SOURCES = \
@@ -30,7 +31,6 @@ mimeview_SOURCES = \
 YLWRAP = $(SHELL) $(mu_aux_dir)/gylwrap
 AM_YFLAGS=-vt
 AM_LEXFLAGS=-d
-AM_CPPFLAGS=-D_GNU_SOURCE=1
 EXTRA_DIST = mimetypes.y mimetypes.l
 
 mimetypes-gram.c mimetypes-decl.h: $(srcdir)/mimetypes.y

@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. 
 
-INCLUDES = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@
+AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@
 bin_PROGRAMS = movemail
 
 movemail_LDADD = \

@@ -98,8 +98,8 @@ mu_LDADD = \
  ${LIBMU_DBM} @DBMLIBS@\
  @READLINE_LIBS@ @MU_COMMON_LIBRARIES@
 
-INCLUDES = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@
 AM_CPPFLAGS = \
+  @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@\
   -DCOMPILE_FLAGS="\"-I$(includedir)\"" \
   -DLINK_FLAGS="\"-L$(libdir)\"" \
   -DLINK_POSTFLAGS="\"$(MU_LINK_POSTFLAGS)\"" \

@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. 
 
-INCLUDES = @MU_APP_COMMON_INCLUDES@ 
+AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@ 
 
 sbin_PROGRAMS = pop3d
 bin_PROGRAMS = @POPAUTH@

@@ -14,7 +14,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. 
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ $(PYTHON_INCLUDES)
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ $(PYTHON_INCLUDES)
 
 lib_LTLIBRARIES=libmu_py.la
 libmu_py_la_SOURCES = \

@@ -45,5 +45,5 @@ c_api_la_LDFLAGS = -avoid-version -module -rpath $(pythonexecdir)
 c_api_la_LIBADD = $(PYTHON_LIBS) ${MU_LIB_PY}
 c_api_la_SOURCES = c_api.c
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ @PYTHON_INCLUDES@\
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ @PYTHON_INCLUDES@\
  -I$(top_srcdir)/python/libmu_py

@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
-INCLUDES = @MU_APP_COMMON_INCLUDES@ 
+AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@ 
 
 SUBDIRS = . tests
 

@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
-INCLUDES = @MU_APP_COMMON_INCLUDES@ 
+AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@ 
 SUBDIRS  = . tests
 EXTRA_DIST = examples
 

@@ -23,7 +23,7 @@ EXTRA_DIST=\
  postgres.c
 DISTCLEANFILES = modlist.h
 
-INCLUDES= @MU_LIB_COMMON_INCLUDES@ 
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ 
 libsql_la_SOURCES=sql.c
 libsql_la_LIBADD=@SQL_LTLIBOBJS@
 

@@ -48,7 +48,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
 ## Non-installable programs
 ## -------------------------- ##
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ 
 noinst_PROGRAMS = \
  bs\
  fldel\