.

1 files changed, 48 insertions, 125 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index 1d2d11be9..8d471c35a 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -11,32 +11,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
-
-# Copyright 1996, 1997, 2000, 2001 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-AC_PREREQ([2.52])
-
-# serial 6
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
 # Do all the work for Automake.                            -*- Autoconf -*-
 
 # This macro actually does too much some checks are only needed if
@@ -1620,7 +1594,7 @@ AC_DEFUN([_jm_DECL_HEADERS],
                    unistd.h sys/time.h utmp.h utmpx.h)
 ])
 
-#serial 28
+#serial 29
 
 dnl We use jm_ for non Autoconf macros.
 m4_pattern_forbid([^jm_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
@@ -1630,34 +1604,34 @@ m4_pattern_forbid([^jm_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
 
 AC_DEFUN([jm_PREREQ],
 [
-  jm_PREREQ_ADDEXT
-  jm_PREREQ_C_STACK
-  jm_PREREQ_CANON_HOST
-  jm_PREREQ_DIRNAME
-  jm_PREREQ_ERROR
-  jm_PREREQ_EXCLUDE
-  jm_PREREQ_GETPAGESIZE
-  jm_PREREQ_HARD_LOCALE
-  jm_PREREQ_HASH
-  jm_PREREQ_HUMAN
-  jm_PREREQ_MBSWIDTH
-  jm_PREREQ_MEMCHR
-  jm_PREREQ_PHYSMEM
-  jm_PREREQ_POSIXVER
-  jm_PREREQ_QUOTEARG
-  jm_PREREQ_READUTMP
-  jm_PREREQ_REGEX
-  jm_PREREQ_STAT
-  jm_PREREQ_STRNLEN
-  jm_PREREQ_TEMPNAME # called by mkstemp
-  jm_PREREQ_XGETCWD
-  jm_PREREQ_XREADLINK
+  AC_REQUIRE([jm_PREREQ_ADDEXT])
+  AC_REQUIRE([jm_PREREQ_C_STACK])
+  AC_REQUIRE([jm_PREREQ_CANON_HOST])
+  AC_REQUIRE([jm_PREREQ_DIRNAME])
+  AC_REQUIRE([jm_PREREQ_ERROR])
+  AC_REQUIRE([jm_PREREQ_EXCLUDE])
+  AC_REQUIRE([jm_PREREQ_GETPAGESIZE])
+  AC_REQUIRE([jm_PREREQ_HARD_LOCALE])
+  AC_REQUIRE([jm_PREREQ_HASH])
+  AC_REQUIRE([jm_PREREQ_HUMAN])
+  AC_REQUIRE([jm_PREREQ_MBSWIDTH])
+  AC_REQUIRE([jm_PREREQ_MEMCHR])
+  AC_REQUIRE([jm_PREREQ_PHYSMEM])
+  AC_REQUIRE([jm_PREREQ_POSIXVER])
+  AC_REQUIRE([jm_PREREQ_QUOTEARG])
+  AC_REQUIRE([jm_PREREQ_READUTMP])
+  AC_REQUIRE([jm_PREREQ_REGEX])
+  AC_REQUIRE([jm_PREREQ_STAT])
+  AC_REQUIRE([jm_PREREQ_STRNLEN])
+  AC_REQUIRE([jm_PREREQ_TEMPNAME]) # called by mkstemp
+  AC_REQUIRE([jm_PREREQ_XGETCWD])
+  AC_REQUIRE([jm_PREREQ_XREADLINK])
 ])
 
 AC_DEFUN([jm_PREREQ_ADDEXT],
 [
   dnl For addext.c.
-  AC_SYS_LONG_FILE_NAMES
+  AC_REQUIRE([AC_SYS_LONG_FILE_NAMES])
   AC_CHECK_FUNCS(pathconf)
   AC_CHECK_HEADERS(limits.h string.h unistd.h)
 ])
@@ -1672,21 +1646,20 @@ AC_DEFUN([jm_PREREQ_CANON_HOST],
   dnl These come from -lnsl on Solaris5.5.1.
   AC_CHECK_FUNCS(gethostbyname gethostbyaddr inet_ntoa)
 
-  AC_CHECK_FUNCS(gethostbyname gethostbyaddr inet_ntoa)
   AC_CHECK_HEADERS(unistd.h string.h netdb.h sys/socket.h \
                    netinet/in.h arpa/inet.h)
 ])
 
 AC_DEFUN([jm_PREREQ_DIRNAME],
 [
-  AC_HEADER_STDC
+  AC_REQUIRE([AC_HEADER_STDC])
   AC_CHECK_HEADERS(string.h)
 ])
 
 AC_DEFUN([jm_PREREQ_EXCLUDE],
 [
-  AC_FUNC_FNMATCH_GNU
-  AC_HEADER_STDBOOL
+  AC_REQUIRE([AC_FUNC_FNMATCH_GNU])
+  AC_REQUIRE([AC_HEADER_STDBOOL])
 ])
 
 AC_DEFUN([jm_PREREQ_GETPAGESIZE],
@@ -1699,13 +1672,13 @@ AC_DEFUN([jm_PREREQ_HARD_LOCALE],
 [
   AC_CHECK_HEADERS(locale.h stdlib.h string.h)
   AC_CHECK_FUNCS(setlocale)
-  AM_C_PROTOTYPES
+  AC_REQUIRE([AM_C_PROTOTYPES])
 ])
 
 AC_DEFUN([jm_PREREQ_HASH],
 [
   AC_CHECK_HEADERS(stdlib.h)
-  AC_HEADER_STDBOOL
+  AC_REQUIRE([AC_HEADER_STDBOOL])
   AC_REQUIRE([jm_CHECK_DECLS])
 ])
 
@@ -1716,7 +1689,7 @@ AC_DEFUN([jm_PREREQ_HUMAN],
   AC_CHECK_HEADERS(locale.h)
   AC_CHECK_DECLS([getenv])
   AC_CHECK_FUNCS(localeconv)
-  AC_HEADER_STDBOOL
+  AC_REQUIRE([AC_HEADER_STDBOOL])
   AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
 ])
 
@@ -1740,22 +1713,22 @@ AC_DEFUN([jm_PREREQ_POSIXVER],
 AC_DEFUN([jm_PREREQ_QUOTEARG],
 [
   AC_CHECK_FUNCS(isascii iswprint)
-  jm_FUNC_MBRTOWC
-  jm_FUNC_MEMCMP
+  AC_REQUIRE([jm_FUNC_MBRTOWC])
+  AC_REQUIRE([jm_FUNC_MEMCMP])
   AC_CHECK_HEADERS(limits.h stddef.h stdlib.h string.h wchar.h wctype.h)
-  AC_HEADER_STDC
-  AC_C_BACKSLASH_A
-  AC_TYPE_MBSTATE_T
-  AM_C_PROTOTYPES
+  AC_REQUIRE([AC_HEADER_STDC])
+  AC_REQUIRE([AC_C_BACKSLASH_A])
+  AC_REQUIRE([AC_TYPE_MBSTATE_T])
+  AC_REQUIRE([AM_C_PROTOTYPES])
 ])
 
 AC_DEFUN([jm_PREREQ_READUTMP],
 [
-  AC_HEADER_STDC
+  AC_REQUIRE([AC_HEADER_STDC])
   AC_CHECK_HEADERS(string.h utmp.h utmpx.h sys/param.h)
   AC_CHECK_FUNCS(utmpname)
   AC_CHECK_FUNCS(utmpxname)
-  AM_C_PROTOTYPES
+  AC_REQUIRE([AM_C_PROTOTYPES])
 
   if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then
     utmp_includes="\
@@ -1798,8 +1771,8 @@ AC_DEFUN([jm_PREREQ_REGEX],
   dnl to get them.
   AC_CHECK_FUNCS(bzero bcopy isascii btowc)
   AC_CHECK_HEADERS(alloca.h libintl.h wctype.h wchar.h)
-  AC_HEADER_STDC
-  AC_FUNC_ALLOCA
+  AC_REQUIRE([AC_HEADER_STDC])
+  AC_REQUIRE([AC_FUNC_ALLOCA])
 ])
 
 AC_DEFUN([jm_PREREQ_STAT],
@@ -1807,7 +1780,7 @@ AC_DEFUN([jm_PREREQ_STAT],
   AC_CHECK_HEADERS(sys/sysmacros.h sys/statvfs.h sys/vfs.h inttypes.h)
   AC_CHECK_HEADERS(sys/param.h sys/mount.h)
   AC_CHECK_FUNCS(statvfs)
-  jm_AC_TYPE_LONG_LONG
+  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])
 
   statxfs_includes="\
 $ac_includes_default
@@ -1838,8 +1811,8 @@ $ac_includes_default
 
 AC_DEFUN([jm_PREREQ_STRNLEN],
 [
-  AC_FUNC_STRNLEN
-  AC_HEADER_STDC
+  AC_REQUIRE([AC_FUNC_STRNLEN])
+  AC_REQUIRE([AC_HEADER_STDC])
   AC_CHECK_HEADERS(memory.h)
   AC_CHECK_DECLS([memchr])
 
@@ -1852,8 +1825,8 @@ AC_DEFUN([jm_PREREQ_STRNLEN],
 
 AC_DEFUN([jm_PREREQ_TEMPNAME],
 [
-  AC_HEADER_STDC
-  AC_HEADER_STAT
+  AC_REQUIRE([AC_HEADER_STDC])
+  AC_REQUIRE([AC_HEADER_STAT])
   AC_CHECK_HEADERS(fcntl.h sys/time.h stdint.h unistd.h)
   AC_CHECK_FUNCS(__secure_getenv gettimeofday)
   AC_CHECK_DECLS([getenv])
@@ -1862,15 +1835,15 @@ AC_DEFUN([jm_PREREQ_TEMPNAME],
 
 AC_DEFUN([jm_PREREQ_XGETCWD],
 [
-  AC_C_PROTOTYPES
+  AC_REQUIRE([AC_C_PROTOTYPES])
   AC_CHECK_HEADERS(limits.h stdlib.h sys/param.h unistd.h)
   AC_CHECK_FUNCS(getcwd)
-  AC_FUNC_GETCWD_NULL
+  AC_REQUIRE([AC_FUNC_GETCWD_NULL])
 ])
 
 AC_DEFUN([jm_PREREQ_XREADLINK],
 [
-  AC_C_PROTOTYPES
+  AC_REQUIRE([AC_C_PROTOTYPES])
   AC_CHECK_HEADERS(limits.h stdlib.h sys/types.h unistd.h)
 ])
 
@@ -5181,56 +5154,6 @@ AC_DEFUN([jm_CHECK_TYPE_STRUCT_TIMESPEC],
   fi
 ])
 
-# Helper functions for option handling.                    -*- Autoconf -*-
-
-# Copyright 2002  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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 1
-
-# Obsolete Automake macros.
-
-# We put here only the macros whose substitution is not an Automake
-# macro; otherwise including this file would trigger dependencies for
-# all the subsitutions.  Generally, obsolete Automake macros are
-# better AU_DEFUNed in the same file as their replacement, or alone in
-# a separate file (see obsol-gt.m4 or obsol-lt.m4 for instance).
-
-AU_DEFUN([AC_FEATURE_CTYPE],     [AC_HEADER_STDC])
-AU_DEFUN([AC_FEATURE_ERRNO],     [AC_REPLACE_FUNCS([strerror])])
-AU_DEFUN([AM_CYGWIN32],	         [AC_CYGWIN])
-AU_DEFUN([AM_EXEEXT],            [AC_EXEEXT])
-AU_DEFUN([AM_FUNC_MKTIME],       [AC_FUNC_MKTIME])
-AU_DEFUN([AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL],
-				 [AC_HEADER_TIOCGWINSZ])
-AU_DEFUN([AM_MINGW32],           [AC_MINGW32])
-AU_DEFUN([AM_PROG_INSTALL],      [AC_PROG_INSTALL])
-AU_DEFUN([AM_SANITY_CHECK_CC],   [AC_PROG_CC])
-AU_DEFUN([AM_SYS_POSIX_TERMIOS], [AC_SYS_POSIX_TERMIOS])
-AU_DEFUN([fp_FUNC_FNMATCH],      [AC_FUNC_FNMATCH])
-AU_DEFUN([fp_PROG_INSTALL],      [AC_PROG_INSTALL])
-AU_DEFUN([md_TYPE_PTRDIFF_T],    [AC_CHECK_TYPES([ptrdiff_t])])
-
-# Don't know how to translate these.
-# If used, Autoconf will complain that they are possibly unexpended;
-# this seems a good enough error message.
-# AC_FEATURE_EXIT
-# AC_SYSTEM_HEADER
-
 #serial 6
 dnl From Jim Meyering and Paul Eggert.
 AC_DEFUN([jm_HEADER_TIOCGWINSZ_IN_TERMIOS_H],