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.

35 files changed, 339 insertions, 482 deletions

diff --git a/.cvsignore b/.cvsignore
index dea845403..c2a97a56e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -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
diff --git a/configure.ac b/configure.ac
index d2f20a287..86307243e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
 
diff --git a/examples/argcv.c b/examples/argcv.c
index 4d70d4e8d..be37e2bb1 100644
--- a/examples/argcv.c
+++ b/examples/argcv.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
-#include <getline.h>
 #include <mailutils/argcv.h>
 #include <mailutils/errno.h>
 
diff --git a/examples/mta.c b/examples/mta.c
index bc2cf7714..b148a4ab0 100644
--- a/examples/mta.c
+++ b/examples/mta.c
@@ -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>
 
diff --git a/guimb/guimb.h b/guimb/guimb.h
index e035acb1d..b4ff3a147 100644
--- a/guimb/guimb.h
+++ b/guimb/guimb.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>
diff --git a/imap4d/imap4d.h b/imap4d/imap4d.h
index c98215ac5..bb2f03938 100644
--- a/imap4d/imap4d.h
+++ b/imap4d/imap4d.h
@@ -97,7 +97,6 @@
 
 #include <mu_asprintf.h>
 #include <mu_umaxtostr.h>
-#include <getline.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/mailutils/Makefile.am b/include/mailutils/Makefile.am
index d068d8e93..bdcbae7c2 100644
--- a/include/mailutils/Makefile.am
+++ b/include/mailutils/Makefile.am
@@ -82,5 +82,5 @@ pkginclude_HEADERS = \
 nobase_pkginclude_HEADERS = \
   sys/nntp.h\
   sys/pop3.h
-SUBDIRS = gnu sys
+SUBDIRS = sys
 
diff --git a/include/mailutils/gnu/Makefile.am b/include/mailutils/gnu/Makefile.am
deleted file mode 100644
index b3c6289cc..000000000
--- a/include/mailutils/gnu/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-## 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 
diff --git a/lib/.cvsignore b/lib/.cvsignore
index 7e59a3bc6..32d4f0404 100644
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -1,7 +1,177 @@
-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
diff --git a/lib/Makefile.am b/lib/Makefile.am
index b1ac224fe..c8b261d28 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -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
 
diff --git a/libargp/cmdline.h b/libargp/cmdline.h
index 96c84af09..add8aa53e 100644
--- a/libargp/cmdline.h
+++ b/libargp/cmdline.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" {
diff --git a/libargp/mu_argp.c b/libargp/mu_argp.c
index 70b48accc..99f6dbf33 100644
--- a/libargp/mu_argp.c
+++ b/libargp/mu_argp.c
@@ -21,7 +21,6 @@
 # include <config.h>
 #endif
 
-#include <getline.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libargp/tls.c b/libargp/tls.c
index 5d65219b1..eec2e2a2b 100644
--- a/libargp/tls.c
+++ b/libargp/tls.c
@@ -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,
diff --git a/libproto/nntp/mbox.c b/libproto/nntp/mbox.c
index 7e8f17683..02959b030 100644
--- a/libproto/nntp/mbox.c
+++ b/libproto/nntp/mbox.c
@@ -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>
diff --git a/m4/.cvsignore b/m4/.cvsignore
index 282522db0..45b64c307 100644
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -1,2 +1,104 @@
 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
diff --git a/m4/debug.m4 b/m4/debug.m4
index 840f88bea..5e7de1b3c 100644
--- a/m4/debug.m4
+++ b/m4/debug.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(){},
diff --git a/m4/enable.m4 b/m4/enable.m4
index 23721ef59..d0d6ad0f8 100644
--- a/m4/enable.m4
+++ b/m4/enable.m4
@@ -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])
 
diff --git a/m4/gsasl.m4 b/m4/gsasl.m4
index f4adb81b0..427bd9943 100644
--- a/m4/gsasl.m4
+++ b/m4/gsasl.m4
@@ -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])
 
diff --git a/m4/guile.m4 b/m4/guile.m4
index 26ad25e52..30fa29897 100644
--- a/m4/guile.m4
+++ b/m4/guile.m4
@@ -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,
diff --git a/m4/intmax.m4 b/m4/intmax.m4
index d99c999fd..ce7a8a49d 100644
--- a/m4/intmax.m4
+++ b/m4/intmax.m4
@@ -1,4 +1,4 @@
-# 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>.])
diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4
index ef00da742..7c7f89401 100644
--- a/m4/inttypes-pri.m4
+++ b/m4/inttypes-pri.m4
@@ -1,4 +1,4 @@
-# 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])
 ])
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
index a5d075d96..edc8ecb2d 100644
--- a/m4/inttypes_h.m4
+++ b/m4/inttypes_h.m4
@@ -1,5 +1,5 @@
-# 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.