Fixed INCLUDES

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @INTLINCS@
+INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @INTLINCS@
 
 bin_PROGRAMS = dotlock
 

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

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu @INTLINCS@
 SUBDIRS = testsuite
 
 bin_PROGRAMS = frm

@@ -18,7 +18,8 @@
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib \
- -I$(top_srcdir)/mailbox -I$(top_srcdir)/include @GUILE_INCLUDES@ @INTLINCS@
+ -I$(top_srcdir)/mailbox -I$(top_srcdir)/include \
+ -I${top_builddir}/include/mailutils/gnu @GUILE_INCLUDES@ @INTLINCS@
 
 SUBDIRS=scm
 

@@ -17,7 +17,8 @@
 ##   Foundation, Inc.
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include @AUTHINCS@ @SERV_AUTHINCS@ @INTLINCS@
+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include \
+ -I${top_builddir}/include/mailutils/gnu @AUTHINCS@ @SERV_AUTHINCS@ @INTLINCS@
 SUBDIRS = testsuite
 
 sbin_PROGRAMS =	imap4d

@@ -17,5 +17,9 @@
 ##   Foundation, Inc.
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+AUTOMAKE_OPTIONS=no-dependencies
+ 
 gnudir = $(pkgincludedir)/gnu
-gnu_HEADERS = argp.h getopt.h
+EXTRA_HEADERS =
+gnu_HEADERS = @GNU_INCLS@
+DISTCLEANFILES = getopt.h argp.h regex.h posix/regex.h

@@ -19,20 +19,18 @@
 
 noinst_LTLIBRARIES = libmailutils.la
 
-SUBDIRS = posix
-
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/include/mailutils/gnu @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_builddir}/include/mailutils/gnu @INTLINCS@
 libmailutils_la_SOURCES = basename.c daemon.c getopt.c getopt1.c md5.c \
                          mu_dbm.c xstrdup.c xmalloc.c 
 
 EXTRA_DIST = alloca.c fnmatch.c fgetpwent.c getpass.c malloc.c obstack.c \
-  realloc.c setenv.c snprintf.c strncasecmp.c \
-  strcasecmp.c strsignal.c xstrtol.c  vasprintf.c vsyslog.c \
-  utmp.c 
+ realloc.c setenv.c snprintf.c strncasecmp.c \
+ strcasecmp.c strsignal.c xstrtol.c  vasprintf.c vsyslog.c \
+ utmp.c 
 
 noinst_HEADERS = error.h fnmatch.h md5.h \
  mu_dbm.h\
- regex.h snprintf.h xalloc.h xstrtol.h obstack.h \
+ snprintf.h xalloc.h xstrtol.h obstack.h \
  mu_asprintf.h
 
 libmailutils_la_LIBADD = @LTLIBOBJS@ @ALLOCA@

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu @INTLINCS@
 YLWRAP = $(SHELL) $(top_srcdir)/scripts/ylwrap
 AM_YFLAGS = -dtv
 AM_CPPFLAGS = -DSIEVE_MODDIR=\"@SIEVE_MODDIR@\"

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/mailbox -I$(top_srcdir)/include @GUILE_INCLUDES@ @INTLINCS@
+INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/mailbox -I$(top_srcdir)/include @GUILE_INCLUDES@ @INTLINCS@
 SUBDIRS = testsuite
 
 libexec_PROGRAMS = mail.local

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @INTLINCS@
+INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/include @INTLINCS@
 
 SUBDIRS = testsuite
 PROGRAMS_SMTP = mail.remote

@@ -18,7 +18,7 @@
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 AM_YFLAGS=-vt
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_srcdir}/mailbox @INTLINCS@ @AUTHINCS@ 
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu -I${top_srcdir}/mailbox @INTLINCS@ @AUTHINCS@ 
 AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\"
 
 bin_PROGRAMS = mail

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_builddir}/include/mailutils/gnu @INTLINCS@
 AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"
 YLWRAP = $(SHELL) $(top_srcdir)/scripts/ylwrap
 AM_YFLAGS=-vt
@@ -33,7 +33,7 @@ DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\"
 EXTRA_DIST = strtok_r.c \
  strndup.c strnlen.c strchrnul.c argp-ba.c argp-eexst.c \
  argp-fmtstream.c argp-fs-xinl.c argp-help.c argp-parse.c argp-pv.c \
- argp-pvh.c argp-xinl.c getline.c getline.h parsedate.y pin.c
+ argp-pvh.c argp-xinl.c getline.c getline.h parsedate.y pin.c regex.c
 
 noinst_HEADERS=argp-fmtstream.h argp-namefrob.h md5.h
 
@@ -68,6 +68,7 @@ mime.c \
 monitor.c \
 mu_argp.c \
 mu_auth.c \
+munre.c \
 mutil.c \
 muerror.c \
 muerrno.c \

@@ -17,7 +17,9 @@
 ##   Foundation, Inc.
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox \
+ -I${top_srcdir}/mailbox/include -I${top_builddir}/include/mailutils/gnu \
+ @INTLINCS@
 
 lib_LTLIBRARIES = libmu_imap.la
 

@@ -17,7 +17,9 @@
 ##   Foundation, Inc.
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox \
+ -I${top_srcdir}/mailbox/include -I${top_builddir}/include/mailutils/gnu \
+ @INTLINCS@
 
 lib_LTLIBRARIES = libmu_maildir.la
 

@@ -17,7 +17,9 @@
 ##   Foundation, Inc.
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox \
+ -I${top_srcdir}/mailbox/include -I${top_builddir}/include/mailutils/gnu \
+ @INTLINCS@
 
 lib_LTLIBRARIES = libmu_mbox.la
 

@@ -17,7 +17,9 @@
 ##   Foundation, Inc.
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox \
+ -I${top_srcdir}/mailbox/include \
+ @INTLINCS@
 
 lib_LTLIBRARIES = libmu_mh.la
 

@@ -17,7 +17,9 @@
 ##   Foundation, Inc.
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox \
+ -I${top_srcdir}/mailbox/include -I${top_builddir}/include/mailutils/gnu \
+ @INTLINCS@
 
 lib_LTLIBRARIES = libmu_pop.la
 

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu @INTLINCS@
 SUBDIRS = testsuite
 
 bin_PROGRAMS = messages

@@ -120,7 +120,7 @@ mailutils-mh.el: mailutils-mh.eli
 .eli.el:
 	sed "s,BINDIR,$(bindir),g;s,MHLIBDIR,$(mhlibdir),g" $< > $@
 
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_srcdir}/mailbox @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu -I${top_srcdir}/mailbox @INTLINCS@
 AM_CPPFLAGS = -DMHLIBDIR=\"$(mhlibdir)\" -DMHBINDIR=\"$(bindir)\"
 mh_LIBS = \
  ./libmh.a\

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @INTLINCS@
+INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/include @INTLINCS@
 
 sbin_PROGRAMS = pop3d
 bin_PROGRAMS = @POPAUTH@

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu @INTLINCS@
 SUBDIRS = testsuite
 
 bin_PROGRAMS = readmsg

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu @INTLINCS@
 SUBDIRS  = testsuite
 
 bin_PROGRAMS = sieve