Make libmailutils independent from gnulib. Remove generated files

from the repository. Bootstrap directly from the gnulib CVS.

* configure.ac: Update.
* lib/Makefile.am: Update.
* mailbox/Makefile.am: Update.
* include/mailutils/Makefile.am (SUBDIRS): Remove gnu
* include/mailutils/gnu/Makefile.am: Remove
* examples/argcv.c, examples/mta.c, guimb/guimb.h,
imap4d/imap4d.h, libargp/mu_argp.c, libargp/tls.c,
maidag/maidag.h, mail/mail.h, mail/send.c,
mail.local/mail.local.h, mh/mh.h: Remove getline.h
* libproto/nntp/mbox.c: Include mailutils/md5.h
* libargp/cmdline.h: Include strings.h
* m4/debug.m4, m4/enable.m4, m4/gsasl.m4, m4/guile.m4,
m4/mu_libobj.m4: Minor fix
* m4/intmax.m4,m4/inttypes-pri.m4,m4/inttypes_h.m4: Update
* mailbox/alloca.h: Remove
* mailbox/mailbox.c: Include string.h
* mailbox/nls.c: Include locale.h
* po/Makevars: Remove.

* absolute-header.m4, alloca.m4, allocsa.m4, argp.m4, codeset.m4,
d-type.m4, eealloc.m4, eoverflow.m4, error.m4, exitfail.m4,
extensions.m4, fnmatch.m4, full-header-path.m4, getdelim.m4,
getline.m4, getlogin_r.m4, getndelim2.m4, getopt.m4, getpass.m4,
gettext.m4, glibc2.m4, glibc21.m4, glob.m4, gnulib.m4, iconv.m4,
intdiv0.m4, isc-posix.m4, lcmessage.m4, lib-ld.m4, lib-link.m4,
lib-prefix.m4, lock.m4, longdouble.m4, longlong.m4,
mailbox-link.m4, mbchar.m4, mbiter.m4, mbrtowc.m4, mbstate_t.m4,
mbswidth.m4, memchr.m4, mempcpy.m4, minmax.m4, obstack.m4,
onceonly.m4, po.m4, printf-posix.m4, progtest.m4, regex.m4,
restrict.m4, setenv.m4, signed.m4, size_max.m4, snprintf.m4,
ssize_t.m4, stat-macros.m4, stdbool.m4, stdint.m4, stdint_h.m4,
strcase.m4, strchrnul.m4, strdup.m4, strerror_r.m4, strndup.m4,
strnlen.m4, strtok_r.m4, sysexits.m4, uint32_t.m4, uintmax_t.m4,
ulonglong.m4, unistd_h.m4, unlocked-io.m4, vasnprintf.m4,
vasprintf.m4, visibility.m4, vsnprintf.m4, wchar_t.m4, wcwidth.m4,
wint_t.m4, xalloc.m4, xsize.m4: Remove.

* alloca.c, allocsa.c, allocsa.h, asprintf.c, basename.c, error.c,
error.h, exit.h, exitfail.c, exitfail.h, fnmatch.c, fnmatch_.h,
fnmatch_loop.c, getpass.c, getpass.h, intprops.h, malloc.c,
mbswidth.c, mbswidth.h, md5.c, md5.h, obstack.c, obstack.h,
realloc.c, setenv.c, setenv.h, snprintf.c, snprintf.h, stdbool.h,
stdbool_.h, strcasecmp.c, strncasecmp.c, strsignal.c, strtok_r.c,
unsetenv.c, utmp.c, vasprintf.c, vasprintf.h, vsyslog.c,
xalloc-die.c, xalloc.h, xalloc_die.c, xmalloc.c, xsize.h,
xstrdup.c: Remove.

* alloca.c, alloca_.h, argp-ba.c, argp-eexst.c, argp-fmtstream.c,
argp-fmtstream.h, argp-fs-xinl.c, argp-help.c, argp-namefrob.h,
argp-parse.c, argp-pin.c, argp-pv.c, argp-pvh.c, argp-xinl.c,
argp.h, asnprintf.c, fnmatch.c, fnmatch_.h, fnmatch_loop.c,
getdelim.c, getdelim.h, getline.c, getline.h, getlogin_r.c,
getlogin_r.h, getndelim2.c, getndelim2.h, getopt.c, getopt.h,
getopt1.c, getopt_.h, getopt_int.h, gettext.h, glob-libc.h,
glob.c, glob_.h, malloc.c, mbchar.c, mbchar.h, mbuiter.h,
memchr.c, mempcpy.c, mempcpy.h, minmax.h, pin.c, printf-args.c,
printf-args.h, printf-parse.c, printf-parse.h, regcomp.c, regex.c,
regex.h, regex_internal.c, regex_internal.h, regexec.c,
stat-macros.h, stdbool_.h, stdint_.h, strcase.h, strcasecmp.c,
strchrnul.c, strchrnul.h, strdup.c, strdup.h, strncasecmp.c,
strndup.c, strndup.h, strnlen.c, strnlen.h, strnlen1.c,
strnlen1.h, strtok_r.c, strtok_r.h, sysexit_.h, unlocked-io.h,
vasnprintf.c, vasnprintf.h, vsnprintf.c, vsnprintf.h, wcwidth.h,
xsize.h: Remove.

@@ -5,12 +5,12 @@ Makefile
 Makefile.in
 _*
 aclocal.m4
+autom4te.cache
 config.h
 config.h.in
 config.log
 config.status
 configure
-autom4te.cache
 intl
 libtool
 stamp-h1

@@ -20,10 +20,8 @@ dnl Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 AC_INIT([GNU Mailutils], [1.2.90], [bug-mailutils@gnu.org], [mailutils])
 AC_CONFIG_SRCDIR([mailbox/mailbox.c])
 AC_CONFIG_AUX_DIR([scripts])
-AC_CANONICAL_TARGET([])
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])
-gl_USE_SYSTEM_EXTENSIONS
 
 AC_PREREQ(2.60)
 
@@ -54,11 +52,12 @@ AC_SUBST(SIEVE_MODDIR,'$(libdir)/$(PACKAGE)')
 AC_SUBST(MU_COMMON_LIBRARIES,'$(LTLIBINTL) $(LTLIBICONV)')
 AC_SUBST(MU_APP_LIBRARIES,'../lib/libmuaux.la ../libargp/libargp.a -L${top_builddir}/libcfg -lmucfg')
 
-AC_SUBST(MU_COMMON_INCLUDES,'-I${srcdir} -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir} -I${top_builddir}/include -I${top_builddir}/include/mailutils/gnu -I${top_srcdir}/mailbox -I${top_srcdir}/libargp -I${top_srcdir}/libcfg')
+AC_SUBST(MU_COMMON_INCLUDES,'-I${srcdir} -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/lib -I${top_builddir} -I${top_builddir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/libargp -I${top_srcdir}/libcfg')
 
 dnl Check for programs
 AC_PROG_CC
 AM_PROG_CC_C_O
+gl_EARLY
 AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -92,6 +91,18 @@ AC_CHECK_TYPE(iconv_t,:,
 AC_SUBST(MU_LINK_POSTFLAGS,[`for opt in $LTLIBICONV; do case $opt in -[[lL]]*) echo $opt;; esac; done|tr '\n' ' '`])
 
 
+dnl Escape defuns that force automake to add their arguments
+dnl to LIBOBJS.
+dnl All dependencies has been handled by gnulib-sync.
+
+AC_DEFINE([GNULIB_ARGP_EXTERN_BASENAME],1,
+          [Define to use our own version of __argp_base_name])
+
+# Check for large file support
+AC_SYS_LARGEFILE
+
+gl_INIT
+
 dnl Check for libraries
 USE_LOADABLE_MODULES=no
 AC_CHECK_LIB(resolv, res_query)
@@ -368,32 +379,6 @@ AC_CHECK_MEMBERS([struct tm.tm_zone, struct tm.tm_gmtoff, struct tm.tm_isdst],
 
 dnl Check for working functions
 
-dnl Escape defuns that force automake to add their arguments
-dnl to LIBOBJS.
-dnl All dependencies has been handled by gnulib-sync.
-
-m4_copy([AC_REPLACE_FUNCS],[MU_SAVE_AC_REPLACE_FUNCS])
-m4_copy([AC_LIBOBJ],[MU_SAVE_AC_LIBOBJ])
-
-m4_copy([MU_LIBOBJ],[AC_LIBOBJ])
-AC_DEFUN([AC_REPLACE_FUNCS],
-[AC_CHECK_FUNCS([$1], , [MU_LIBOBJ($ac_func)])
-])
-
-libmailutils_GNULIB
-
-AC_DEFINE([GNULIB_ARGP_EXTERN_BASENAME],1,
-          [Define to use our own version of __argp_base_name])
-
-dnl Restore overridden defuns
-m4_copy([MU_SAVE_AC_REPLACE_FUNCS],[AC_REPLACE_FUNCS])
-m4_copy([MU_SAVE_AC_LIBOBJ],[AC_LIBOBJ])
-
-libmuaux_GNULIB
-
-# Check for large file support
-AC_SYS_LARGEFILE
-
 #####
 # Determine the size of off_t and define an equivalent mu_off_t type.
 # We cannot use off_t in the library since its size depends on whether
@@ -411,7 +396,6 @@ elif test $ac_cv_sizeof_off_t -eq $ac_cv_sizeof_long_long; then
 else
   AC_MSG_ERROR([Cannot find ${ac_cv_sizeof_off_t}-byte type, suitable for mu_off_t])
 fi
-
 AC_FUNC_MMAP
 
 AC_CHECK_DECLS([strtok_r, strchrnul, strndup, asprintf, vasprintf, strsignal],
@@ -452,29 +436,18 @@ AH_BOTTOM([
 #endif
 ])
 
-MU_CHECK_FUNC(fgetpwent)
+AC_CHECK_FUNC(fgetpwent)
 
 ## Check for presence of utmp.h and utmp-related functions
 MU_CHECK_UTMP
 
 dnl Check for libraries
 
-# FIXME: We used to allow to link against libc copy of argp (if any)
-# The gnulib version fixes a number of bugs and provides new features,
-# so currently we force to use it. This may change when gnulib and glibc
-# are synchronized.
-MU_HEADER(getopt.h,getopt_.h)
-MU_HEADER(argp.h)
-
 AH_BOTTOM([
 /* program_name is used by lib/error.c */
 #define program_name program_invocation_name
 ])
 
-if test "$ac_use_included_regex" = yes; then
-       MU_HEADER(regex.h)
-fi
-
 
 ## FriBidi support
 
@@ -514,7 +487,6 @@ if test "$use_fribidi" = "yes"; then
 fi
 
 
-
 ## SQL support
 
 AH_TEMPLATE(USE_SQL,[Enables SQL support])
@@ -1061,18 +1033,6 @@ dnl get sysconfdir expanded.
 
 CPPFLAGS="$CPPFLAGS -DSYSCONFDIR=\\\"\$(sysconfdir)\\\""
 
-S=`echo "$MU_LIBOBJS" |
-	          tr ' ' '\n' | sort | uniq |
-                  sed 's,\.[[^.]]* ,$U&,g;s,\.[[^.]]*$,$U&,' |
-                  tr '\n' ' '`
-MU_LTLIBOBJS=`echo "$S" |
-                sed 's,\.[[^.]]* ,.lo ,g;s,\.[[^.]]*$,.lo,'`
-AC_SUBST(MU_LTLIBOBJS)
-
-MU_FINISH
-
-### Display the status
-
 AC_CONFIG_COMMANDS([status],[
 cat <<EOF
 

@@ -24,7 +24,6 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
-#include <getline.h>
 #include <mailutils/argcv.h>
 #include <mailutils/errno.h>
 

@@ -61,7 +61,6 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <mu_asprintf.h>
-#include <getline.h>
 #include <mailutils/argcv.h>
 #include <mailutils/mailutils.h>
 

@@ -27,7 +27,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>  /* strerror(3), strdup(3) */
-#include <getline.h>
 
 #include <mailutils/errno.h>
 #include <mailutils/mailbox.h>

@@ -97,7 +97,6 @@
 
 #include <mu_asprintf.h>
 #include <mu_umaxtostr.h>
-#include <getline.h>
 
 #ifdef __cplusplus
 extern "C" {

@@ -82,5 +82,5 @@ pkginclude_HEADERS = \
 nobase_pkginclude_HEADERS = \
   sys/nntp.h\
   sys/pop3.h
-SUBDIRS = gnu sys
+SUBDIRS = sys
 

-## Process this file with GNU Automake to create Makefile.in
-
-##   Copyright (C) 2002, 2005, 2007 Free Software Foundation, Inc.
-##
-##   GNU Mailutils is free software; you can redistribute it and/or
-##   modify it under the terms of the GNU General Public License as
-##   published by the Free Software Foundation; either version 3, or (at
-##   your option) any later version.
-##
-##   This program is distributed in the hope that it will be useful, but
-##   WITHOUT ANY WARRANTY; without even the implied warranty of
-##   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-##   General Public License for more details.
-##
-##   You should have received a copy of the GNU General Public License
-##   along with this program; if not, write to the Free Software
-##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
-##   02110-1301 USA
-
-AUTOMAKE_OPTIONS=no-dependencies
- 
-gnudir = $(pkgincludedir)/gnu
-EXTRA_HEADERS =
-gnu_HEADERS = @GNU_INCLS@
-DISTCLEANFILES = getopt.h argp.h regex.h 

-Makefile.in
-Makefile
+*.lo
 .deps
 .libs
-*.lo
-libmuaux.la
+Makefile
+Makefile.in
+alloca.c
+alloca.h
+alloca.in.h
+argp-ba.c
+argp-eexst.c
+argp-fmtstream.c
+argp-fmtstream.h
+argp-fs-xinl.c
+argp-help.c
+argp-namefrob.h
+argp-parse.c
+argp-pin.c
+argp-pv.c
+argp-pvh.c
+argp-xinl.c
+argp.h
+asnprintf.c
+asprintf.c
+at-func.c
+basename.c
+canonicalize-lgpl.c
+canonicalize.h
+chdir-long.c
+chdir-long.h
+chown.c
+config.charset
+creat-safer.c
+dirent.h
+dirent.in.h
+dirfd.c
+dirfd.h
+dirname.c
+dirname.h
+dup-safer.c
+dup2.c
+error.c
+error.h
+exitfail.c
+exitfail.h
+fchdir.c
+fchmodat.c
+fchown-stub.c
+fchownat.c
+fcntl--.h
+fcntl-safer.h
+fcntl.h
+fcntl.in.h
+fd-safer.c
+float+.h
+float.h
+float.in.h
+fnmatch.c
+fnmatch.h
+fnmatch.in.h
+fnmatch_loop.c
+fstatat.c
+getcwd.c
+getdelim.c
+getline.c
+getlogin_r.c
+getopt.c
+getopt.h
+getopt.in.h
+getopt1.c
+getopt_int.h
+getpass.c
+getpass.h
+gettext.h
+glob-libc.h
+glob.c
+glob.h
+glob.in.h
+gnulib.mk
+intprops.h
+lchown.c
 libmailutils.la
+libmuaux.la
+localcharset.c
+localcharset.h
+lstat.c
+lstat.h
+malloc.c
+malloca.c
+malloca.h
+malloca.valgrind
+mbswidth.c
+mbswidth.h
+mempcpy.c
+memrchr.c
+mkdirat.c
+obstack.c
+obstack.h
+open-safer.c
+openat-die.c
+openat-priv.h
+openat-proc.c
+openat.c
+openat.h
+pathmax.h
+pipe-safer.c
+printf-args.c
+printf-args.h
+printf-parse.c
+printf-parse.h
+readlink.c
+realloc.c
+ref-add.sed
+ref-add.sin
+ref-del.sed
+ref-del.sin
+regcomp.c
+regex.c
+regex.h
+regex_internal.c
+regex_internal.h
+regexec.c
+same-inode.h
+save-cwd.c
+save-cwd.h
+setenv.c
+setenv.h
+sleep.c
+snprintf.c
+stdbool.h
+stdbool.in.h
+stdint.h
+stdint.in.h
+stdio.h
+stdio.in.h
+stdlib.h
+stdlib.in.h
+strcasecmp.c
+strchrnul.c
+strdup.c
+streq.h
+strerror.c
+string.h
+string.in.h
+stripslash.c
+strncasecmp.c
+strndup.c
+strnlen.c
+strtok_r.c
+sys
+sys_stat.h
+sys_stat.in.h
+sysexits.h
+sysexits.in.h
+unistd--.h
+unistd-safer.h
+unistd.h
+unistd.in.h
+unitypes.h
+uniwidth.h
+unsetenv.c
+vasnprintf.c
+vasnprintf.h
+vasprintf.c
+vsnprintf.c
+wchar.h
+wchar.in.h
+wctype.h
+wctype.in.h
+wcwidth.c
+xalloc-die.c
+xalloc.h
+xgetcwd.c
+xgetcwd.h
+xmalloc.c
+xsize.h
+xstrndup.c
+xstrndup.h

@@ -18,11 +18,11 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-noinst_LTLIBRARIES = libmuaux.la
+include gnulib.mk
 
 INCLUDES = @MU_COMMON_INCLUDES@ 
 
-libmuaux_la_SOURCES = \
+libmuaux_la_SOURCES += \
  argpinit.c\
  daemon.c\
  mailcap.c\
@@ -30,44 +30,8 @@ libmuaux_la_SOURCES = \
  muinit.c\
  mu_dbm.c
 
-EXTRA_DIST = utmp.c 
-
-noinst_HEADERS =\
+noinst_HEADERS +=\
  mu_dbm.h\
  mu_asprintf.h
 
-libmuaux_la_LIBADD = @LTLIBOBJS@
-
-BUILT_SOURCES=
-MOSTLYCLEANFILES=
-
-##:## EOF marker for gnulib-sync script. Please, do not remove ##:##
-## Do not change anything below this line ##
-libmuaux_la_SOURCES += allocsa.h allocsa.c
-EXTRA_DIST += allocsa.valgrind
-
-
-libmuaux_la_SOURCES += exit.h
-
-EXTRA_DIST += exitfail.h
-
-EXTRA_DIST += xalloc.h
-
-EXTRA_DIST += xalloc.h
-
-EXTRA_DIST += getpass.h
-
-libmuaux_la_SOURCES += mbswidth.h mbswidth.c
-
-
-
-libmuaux_la_SOURCES += setenv.h
-
-libmuaux_la_SOURCES += snprintf.h
-
-libmuaux_la_SOURCES += vasprintf.h
-
-libmuaux_la_SOURCES += xalloc-die.c
-
-libmuaux_la_SOURCES += xsize.h
 

@@ -30,6 +30,7 @@
 #include "mailutils/errno.h"
 #include "argp.h"
 #include <errno.h> /* May declare program_invocation_name */
+#include <strings.h>
 
 #ifdef __cplusplus
 extern "C" {

@@ -21,7 +21,6 @@
 # include <config.h>
 #endif
 
-#include <getline.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>

@@ -22,7 +22,6 @@
 
 #include "cmdline.h"
 #include <mailutils/tls.h>
-#include "strcase.h" /* FIXME */
 
 static struct argp_option _tls_argp_options[] = {
   {"ssl-cert", OPT_SSL_CERT, N_("FILE"), OPTION_HIDDEN,

@@ -37,8 +37,7 @@
 # include <strings.h>
 #endif
 
-#include <md5.h>
-
+#include <mailutils/md5.h>
 #include <mailutils/body.h>
 #include <mailutils/debug.h>
 #include <mailutils/errno.h>

 Makefile
 Makefile.in
+absolute-header.m4
+alloca.m4
+argp.m4
+canonicalize-lgpl.m4
+chdir-long.m4
+chown.m4
+codeset.m4
+d-ino.m4
+d-type.m4
+dirfd.m4
+dirname.m4
+dos.m4
+double-slash-root.m4
+dup2.m4
+eealloc.m4
+eoverflow.m4
+error.m4
+exitfail.m4
+extensions.m4
+fchdir.m4
+fcntl-safer.m4
+fcntl_h.m4
+float_h.m4
+fnmatch.m4
+getcwd-abort-bug.m4
+getcwd-path-max.m4
+getcwd.m4
+getdelim.m4
+getline.m4
+getlogin_r.m4
+getopt.m4
+getpass.m4
+gettext.m4
+glibc21.m4
+glob.m4
+gnulib-cache.m4
+gnulib-common.m4
+gnulib-comp.m4
+gnulib-tool.m4
+iconv.m4
+include_next.m4
+inline.m4
+intl.m4
+intldir.m4
+intlmacosx.m4
+lchown.m4
+lib-ld.m4
+lib-link.m4
+lib-prefix.m4
+localcharset.m4
+longdouble.m4
+longlong.m4
+lstat.m4
+malloc.m4
+malloca.m4
+mbrtowc.m4
+mbstate_t.m4
+mbswidth.m4
+mempcpy.m4
+memrchr.m4
+openat.m4
+pathmax.m4
+po.m4
+progtest.m4
+readlink.m4
+realloc.m4
+regex.m4
+save-cwd.m4
+setenv.m4
+signed.m4
+sleep.m4
+snprintf.m4
+ssize_t.m4
+stdbool.m4
+stdint.m4
+stdint_h.m4
+stdio_h.m4
+stdlib_h.m4
+strcase.m4
+strchrnul.m4
+strdup.m4
+strerror.m4
+string_h.m4
+strndup.m4
+strnlen.m4
+strtok_r.m4
+sys_stat_h.m4
+sysexits.m4
+unistd-safer.m4
+unistd_h.m4
+vasnprintf.m4
+vasprintf.m4
+vsnprintf.m4
+wchar.m4
+wchar_t.m4
+wctype.m4
+wcwidth.m4
+wint_t.m4
+xalloc.m4
+xgetcwd.m4
+xsize.m4
+xstrndup.m4

@@ -15,10 +15,10 @@ dnl
 
 AC_DEFUN([MU_DEBUG_MODE],
   [AC_ARG_ENABLE(debug,                     
-    [  --enable-debug          enable debugging mode],
+    AC_HELP_STRING([--enable-debug], [enable debugging mode]),
     [if test x"$enableval" = xyes; then
        if test x"$GCC" = xyes; then
-	 AC_MSG_CHECKING(whether gcc accepts -ggdb)
+	 AC_MSG_CHECKING([whether gcc accepts -ggdb])
          save_CFLAGS=$CFLAGS
          CFLAGS="-ggdb -Wall"
          AC_TRY_COMPILE([],void f(){},

@@ -29,7 +29,7 @@ AC_DEFUN([MU_ENABLE_SUPPORT], [
 	case "${enableval}" in
 		yes) mu_cache_var=yes;;
                 no)  mu_cache_var=no;;
-	        *)   AC_MSG_ERROR(bad value ${enableval} for --disable-$1) ;;
+	        *)   AC_MSG_ERROR([bad value ${enableval} for --disable-$1]) ;;
         esac],
                       [mu_cache_var=yes])
 

@@ -26,7 +26,7 @@ AC_DEFUN([MU_CHECK_GSASL],
      AC_HELP_STRING([--with-gsasl], [use libgsasl for SASL authentication]),
      [case $withval in
       yes|no) wantgsasl=$withval;;
-      *) AC_MSG_ERROR(bad value for --with-gsasl: $withval);;
+      *) AC_MSG_ERROR([bad value for --with-gsasl: $withval]);;
       esac],
      [wantgsasl=no])
 

@@ -50,7 +50,7 @@ AC_DEFUN([MU_CHECK_GUILE],
      case "x$GUILE_VERSION" in
      x[[0-9]]*)
        if test $GUILE_VERSION -lt 14; then
-         AC_MSG_RESULT(Nope. Version number too low.)
+         AC_MSG_RESULT([Nope. Version number too low.])
          mu_cv_lib_guile=no
        else
          AC_DEFINE_UNQUOTED(GUILE_VERSION, $GUILE_VERSION,

-# intmax.m4 serial 2 (gettext-0.14.2)
+# intmax.m4 serial 3 (gettext-0.16)
 dnl Copyright (C) 2002-2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -22,7 +22,10 @@ AC_DEFUN([gt_TYPE_INTMAX_T],
 #if HAVE_INTTYPES_H_WITH_UINTMAX
 #include <inttypes.h>
 #endif
-], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
+],     [intmax_t x = -1;
+        return !x;],
+       gt_cv_c_intmax_t=yes,
+       gt_cv_c_intmax_t=no)])
   if test $gt_cv_c_intmax_t = yes; then
     AC_DEFINE(HAVE_INTMAX_T, 1,
       [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])

-# inttypes-pri.m4 serial 2 (gettext-0.15)
+# inttypes-pri.m4 serial 4 (gettext-0.16)
 dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,13 +6,15 @@ dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
+AC_PREREQ(2.52)
+
 # Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
 # macros to non-string values.  This is the case on AIX 4.3.3.
 
 AC_DEFUN([gt_INTTYPES_PRI],
 [
-  AC_REQUIRE([gl_HEADER_INTTYPES_H])
-  if test $gl_cv_header_inttypes_h = yes; then
+  AC_CHECK_HEADERS([inttypes.h])
+  if test $ac_cv_header_inttypes_h = yes; then
     AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
       gt_cv_inttypes_pri_broken,
       [
@@ -26,5 +28,9 @@ char *p = PRId32;
   if test "$gt_cv_inttypes_pri_broken" = yes; then
     AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
       [Define if <inttypes.h> exists and defines unusable PRI* macros.])
+    PRI_MACROS_BROKEN=1
+  else
+    PRI_MACROS_BROKEN=0
   fi
+  AC_SUBST([PRI_MACROS_BROKEN])
 ])

-# inttypes_h.m4 serial 6
-dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
+# inttypes_h.m4 serial 7
+dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,7 +15,7 @@ AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
   [AC_TRY_COMPILE(
     [#include <sys/types.h>
 #include <inttypes.h>],
-    [uintmax_t i = (uintmax_t) -1;],
+    [uintmax_t i = (uintmax_t) -1; return !i;],
     gl_cv_header_inttypes_h=yes,
     gl_cv_header_inttypes_h=no)])
   if test $gl_cv_header_inttypes_h = yes; then

-dnl This file is part of GNU mailutils.
-dnl Copyright (C) 2001, 2005, 2007 Free Software Foundation, Inc.
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software Foundation,
-dnl Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-dnl
-
-AC_SUBST(MU_LIBOBJS)
-AC_SUBST(MU_EXTRA_DIST)
-
-AC_SUBST(MU_EXTRA_DIST)
-m4_define([mu_extra_dist],[])
-AC_DEFUN([MU_LIBSOURCES],[
-m4_foreach(source, [$1], [m4_define([mu_extra_dist], mu_extra_dist source)])])
-AC_DEFUN([MU_LIBSOURCE],[m4_define([mu_extra_dist], mu_extra_dist [$1])])
-
-AC_DEFUN([MU_FINISH],[
-[MU_EXTRA_DIST]="mu_extra_dist"
-])
-
-AC_DEFUN([MU_LIBOBJ],[
- MU_LIBOBJS="$MU_LIBOBJS $1.o"])
-
-AC_DEFUN([MU_CHECK_FUNC],[
- AC_CHECK_FUNC($1,,
-      [MU_LIBOBJ($1)])])
-
-AC_DEFUN([MU_REPLACE_FUNCS],
-[AC_CHECK_FUNCS([$1], , [dnl
- MU_LIBOBJ($ac_func)
-])])
-
-AC_SUBST(GNU_INCLS)
-AC_DEFUN([MU_HEADER],[
- pushdef([mu_upcase],translit($1,[a-z-],[A-Z_]))
- pushdef([mu_cache_var],[mu_cv_header_]translit($1,[-./],[___]))
-
- if test x"[$]mu_cache_var" != xyes; then
-   AC_CONFIG_LINKS(include/mailutils/gnu/$1:mailbox/ifelse($2,,$1,$2))
-   GNU_INCLS="$GNU_INCLS $1"
-   mu_cache_var=yes
- fi
-
- popdef([mu_upcase])
- popdef([mu_cache_var])
-])
-

@@ -86,7 +86,6 @@
 
 #include <mu_dbm.h>
 #include <mu_asprintf.h>
-#include <getline.h>
 
 #if defined (USE_DBM) || defined (USE_SQL)
 # define USE_MAILBOX_QUOTAS 1

@@ -86,7 +86,6 @@
 
 #include <mu_dbm.h>
 #include <mu_asprintf.h>
-#include <getline.h>
 
 #if defined (USE_DBM) || defined (USE_SQL)
 # define USE_MAILBOX_QUOTAS 1

@@ -82,7 +82,6 @@
 #include <mailutils/nls.h>
 #include <mailutils/tls.h>
 #include <mailutils/argcv.h>
-#include <getline.h>
 #include <mu_asprintf.h>
 
 #ifdef __cplusplus

@@ -21,7 +21,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <getline.h>
 
 #include "mail.h"
 

@@ -32,7 +32,7 @@ AM_CPPFLAGS = \
  -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"\
  -DLOCALEDIR=\"$(localedir)\"
 
-EXTRA_DIST = @MU_EXTRA_DIST@ errors muerrno.cin parsedate.y fgetpwent.c cfg_parser.y cfg_parser.h
+EXTRA_DIST = @MU_EXTRA_DIST@ errors muerrno.cin parsedate.y fgetpwent.c cfg_parser.y cfg_parser.h inttostr.c  
 
 libmailutils_la_SOURCES = \
  address.c\
@@ -66,6 +66,7 @@ libmailutils_la_SOURCES = \
  mailer.c\
  mapfile_stream.c\
  mbx_default.c\
+ md5.c\
  message.c\
  memory_stream.c\
  message_stream.c\
@@ -86,6 +87,7 @@ libmailutils_la_SOURCES = \
  registrar.c\
  refcount.c\
  rfc2047.c\
+ sha1.c\
  socket_stream.c\
  stream.c\
  syslog.c\
@@ -93,7 +95,8 @@ libmailutils_la_SOURCES = \
  tcp.c\
  ticket.c\
  url.c\
- wicket.c
+ wicket.c\
+ imaxtostr.c  offtostr.c  umaxtostr.c
 
 BUILT_SOURCES = parsedate.c muerrno.c cfg_parser.c cfg_parser.h
 MOSTLYCLEANFILES=
@@ -112,171 +115,6 @@ cfg_parser.c cfg_parser.h: $(srcdir)/cfg_parser.y
 muerrno.c: errors muerrno.cin
 	$(AWK) -f $(top_srcdir)/scripts/generr.awk $^ > $@
 
-libmailutils_la_DEPENDENCIES = @MU_LTLIBOBJS@
-libmailutils_la_LIBADD = @MU_LTLIBOBJS@ @MU_COMMON_LIBRARIES@
+libmailutils_la_LIBADD = @MU_COMMON_LIBRARIES@
 libmailutils_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
 
-##:## EOF marker for gnulib-sync script. Please, do not remove ##:##
-## Do not change anything below this line ##
-
-BUILT_SOURCES += $(ALLOCA_H)
-EXTRA_DIST += alloca_.h
-
-# We need the following in order to create <alloca.h> when the system
-# doesn't have one that works with the given compiler.
-alloca.h: alloca_.h
-	cp -f $(srcdir)/alloca_.h $@-t
-	mv -f $@-t $@
-MOSTLYCLEANFILES += alloca.h alloca.h-t
-
-libmailutils_la_SOURCES += argp.h argp-ba.c argp-eexst.c \
-           argp-fmtstream.c argp-fmtstream.h argp-fs-xinl.c argp-help.c \
-           argp-namefrob.h argp-parse.c argp-pin.c argp-pv.c argp-pvh.c \
-           argp-xinl.c
-
-EXTRA_DIST += getline.h
-
-EXTRA_DIST += regcomp.c regex.h regex_internal.c regex_internal.h regexec.c
-
-libmailutils_la_SOURCES += strtok_r.h
-
-BUILT_SOURCES += $(GLOB_H)
-EXTRA_DIST += glob_.h glob-libc.h
-
-# We need the following in order to create <glob.h> when the system
-# doesn't have one that works with the given compiler.
-glob.h: glob_.h
-	cp -f $(srcdir)/glob_.h $@-t
-	mv -f $@-t $@
-MOSTLYCLEANFILES += glob.h glob.h-t
-
-EXTRA_DIST += inttostr.c inttostr.h
-
-
-
-
-BUILT_SOURCES += $(FNMATCH_H)
-EXTRA_DIST += fnmatch_.h fnmatch_loop.c
-
-# We need the following in order to create <fnmatch.h> when the system
-# doesn't have one that supports the required API.
-fnmatch.h: fnmatch_.h
-	cp -f $(srcdir)/fnmatch_.h $@-t
-	mv -f $@-t $@
-MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
-
-EXTRA_DIST += getdelim.h
-
-EXTRA_DIST += getlogin_r.h
-
-BUILT_SOURCES += $(GETOPT_H)
-EXTRA_DIST += getopt_.h getopt_int.h
-
-# We need the following in order to create <getopt.h> when the system
-# doesn't have one that works with the given compiler.
-getopt.h: getopt_.h
-	cp -f $(srcdir)/getopt_.h $@-t
-	mv -f $@-t $@
-MOSTLYCLEANFILES += getopt.h getopt.h-t
-
-libmailutils_la_SOURCES += gettext.h
-
-EXTRA_DIST += intprops.h
-
-
-libmailutils_la_SOURCES += mbchar.h
-
-libmailutils_la_SOURCES += mbuiter.h
-
-
-EXTRA_DIST += mempcpy.h
-
-libmailutils_la_SOURCES += minmax.h
-
-libmailutils_la_SOURCES += size_max.h
-
-
-EXTRA_DIST += stat-macros.h
-
-BUILT_SOURCES += $(STDBOOL_H)
-EXTRA_DIST += stdbool_.h
-
-# We need the following in order to create <stdbool.h> when the system
-# doesn't have one that works.
-stdbool.h: stdbool_.h
-	rm -f $@-t $@
-	sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h > $@-t
-	mv $@-t $@
-MOSTLYCLEANFILES += stdbool.h stdbool.h-t
-
-BUILT_SOURCES += $(STDINT_H)
-EXTRA_DIST += stdint_.h
-
-# We need the following in order to create <stdint.h> when the system
-# doesn't have one that works with the given compiler.
-stdint.h: stdint_.h
-	rm -f $@-t $@
-	sed -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
-	    -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
-	    -e 's|@''ABSOLUTE_STDINT_H''@|$(ABSOLUTE_STDINT_H)|g' \
-	    -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
-	    -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
-	    -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
-	    -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
-	    -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
-	    -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
-	    -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
-	    -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
-	    -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \
-	    -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \
-	    -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \
-	    -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \
-	    -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \
-	    -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \
-	    -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \
-	    -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
-	    -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
-	    -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
-	    < $(srcdir)/stdint_.h > $@-t
-	mv $@-t $@
-MOSTLYCLEANFILES += stdint.h stdint.h-t
-
-libmailutils_la_SOURCES += strcase.h
-
-libmailutils_la_SOURCES += strchrnul.h
-
-EXTRA_DIST += strdup.h
-
-EXTRA_DIST += strndup.h
-
-EXTRA_DIST += strnlen.h
-
-libmailutils_la_SOURCES += strnlen1.h strnlen1.c
-
-BUILT_SOURCES += $(SYSEXITS_H)
-EXTRA_DIST += sysexit_.h
-
-# We need the following in order to create <sysexits.h> when the system
-# doesn't have one that works with the given compiler.
-sysexits.h: sysexit_.h
-	cp -f $(srcdir)/sysexit_.h $@-t
-	mv -f $@-t $@
-MOSTLYCLEANFILES += sysexits.h sysexits.h-t
-
-BUILT_SOURCES += $(UNISTD_H)
-
-# We need the following in order to create an empty placeholder for
-# <unistd.h> when the system doesn't have one.
-unistd.h:
-	echo '/* Empty placeholder for $@.  */' >$@
-MOSTLYCLEANFILES += unistd.h
-
-libmailutils_la_SOURCES += printf-args.h printf-parse.h vasnprintf.h
-
-libmailutils_la_SOURCES += vsnprintf.h
-
-libmailutils_la_SOURCES += wcwidth.h
-
-libmailutils_la_SOURCES += xsize.h
-
-EXTRA_DIST += getopt.c getopt1.c imaxtostr.c offtostr.c umaxtostr.c glob.c regex.c fnmatch.c getdelim.c getline.c getline.c md5.c getndelim2.c mempcpy.c strcasecmp.c strncasecmp.c strchrnul.c strndup.c strnlen.c strtok_r.c vasnprintf.c printf-args.c printf-parse.c asnprintf.c vsnprintf.c unlocked-io.h mbchar.c strdup.c memchr.c sha1.c getlogin_r.c getlogin_r.c

-/* Memory allocation on the stack.
-
-   Copyright (C) 1995, 1999, 2001, 2002, 2003, 2004, 2006 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
-
-/* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H
-   means there is a real alloca function.  */
-#ifndef _GNULIB_ALLOCA_H
-# define _GNULIB_ALLOCA_H
-
-/* alloca (N) returns a pointer to N bytes of memory
-   allocated on the stack, which will last until the function returns.
-   Use of alloca should be avoided:
-     - inside arguments of function calls - undefined behaviour,
-     - in inline functions - the allocation may actually last until the
-       calling function returns,
-     - for huge N (say, N >= 65536) - you never know how large (or small)
-       the stack is, and when the stack cannot fulfill the memory allocation
-       request, the program just crashes.
- */
-
-#ifndef alloca
-# ifdef __GNUC__
-#  define alloca __builtin_alloca
-# elif defined _AIX
-#  define alloca __alloca
-# elif defined _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  include <stddef.h>
-#  ifdef  __cplusplus
-extern "C"
-#  endif
-void *alloca (size_t);
-# endif
-#endif
-
-#endif /* _GNULIB_ALLOCA_H */

@@ -23,8 +23,8 @@
 
 #include <stdlib.h>
 #include <errno.h>
-#include <strdup.h>
 #include <alloca.h>
+#include <string.h>
 
 #include <mailutils/debug.h>
 #include <mailutils/errno.h>

@@ -22,6 +22,7 @@
 
 #include <stdlib.h>
 #include <mailutils/nls.h>
+#include <locale.h>
 
 /* Initialize Native Language Support */
 

@@ -56,7 +56,6 @@
 
 #include <mu_asprintf.h>
 #include <mu_umaxtostr.h>
-#include <getline.h>
 
 #if !HAVE_DECL_STRCHRNUL
 extern char *strchrnul (const char *s, int c_in);

+*.gmo
+*.mo
 Makefile
 Makefile.in
 Makefile.in.in
+Makevars.template
 POTFILES
 Rules-quot
 boldquot.sed
 en@boldquot.header
 en@quot.header
+insert-header.sed
 insert-header.sin
 mailutils.pot
 quot.sed
-remove-potcdate.sin
 remove-potcdate.sed
+remove-potcdate.sin
 stamp-po
-*.mo
-*.gmo

-#
-# Makefile variables for PO directory.
-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-#
-
-DOMAIN = $(PACKAGE)
-
-subdir = po
-top_builddir = ..
-
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ \
- --flag=util_error:1:c-format\
- --flag=util_out:2:c-format\
- --flag=util_send:1:c-format\
- --flag=util_finish:3:c-format\
- --flag=mu_error:1:c-format\
- --flag=sieve_compile_error:3:c-format\
- --flag=sieve_debug_internal:3:c-format\
- --flag=mu_sieve_error:2:c-format\
- --flag=mu_sieve_debug:2:c-format\
- --flag=mu_sieve_log_action:2:c-format\
- --flag=mu_stream_printf:3:c-format\
- --flag=mu_pop3_writeline:2:c-format\
- --flag=mu_nntp_writeline:2:c-format\
- --flag=util_out:2:c-format\
- --flag=util_send:1:c-format\
- --flag=util_do_command:1:c-format\
- --flag=util_error:1:c-format\
- --flag=util_cache_command:2:c-format\
- --flag=mailer_err:1:c-format\
- --flag=mh_getyn:1:c-format\
- --flag=mh_getyn_interactive:1:c-format\
- --flag=mh_error:1:c-format\
- --flag=ali_parse_error:1:c-format\
- --flag=pop3d_outf:1:c-format\
- --flag=imap_writeline:2:c-format
-
-COPYRIGHT_HOLDER = Free Software Foundation, Inc.
-MSGID_BUGS_ADDRESS = bug-mailutils@gnu.org
-EXTRA_LOCALE_CATEGORIES =
-
-# EOF

-Makefile.in
-Makefile
 .gdbinit
+Makefile
+Makefile.in
 compile
 config.guess
 config.rpath
 config.sub
 depcomp
+elisp-comp
 install-sh
+link-warning.h
+ltmain.sh
+mailutils.spec
 mdate-sh
 missing
 mkinstalldirs
 texinfo.tex
-ltmain.sh
-mailutils.spec
-elisp-comp