* lib/autoscan/autoscan.pre: Move all the remaining rules to...

* lib/autoconf/c.m4, lib/autoconf/functions.m4,
* lib/autoconf/headers.m4, lib/autoconf/libs.m4,
* lib/autoconf/specific.m4, lib/autoconf/types.m4: here.

diff --git a/ChangeLog b/ChangeLog
index 9f33af2636f96d58f425ae54aae701f05dee36e2..e876503b33106f94ac1e0aac6182794c0ffeff9c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-28  Akim Demaille  <akim@epita.fr>
+
+       * lib/autoscan/autoscan.pre: Move all the remaining rules to...
+       * lib/autoconf/c.m4, lib/autoconf/functions.m4,
+       * lib/autoconf/headers.m4, lib/autoconf/libs.m4,
+       * lib/autoconf/specific.m4, lib/autoconf/types.m4: here.
+
 2002-09-28  Akim Demaille  <akim@epita.fr>
 
        * tests/torture.at (Configuring subdirectories): Be robust to

diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index dc4821fc5b1fb7aff43f411556ff4464f647d29c..1198b23d3dd9b6f60407e6855d5656721af350b7 100644 (file)
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -340,6 +340,8 @@ AS_IF([$ac_preproc_ok], [$1], [$2])])# _AC_PROG_PREPROC_WORKS_IFELSE
 # Find a working C preprocessor.
 # We shouldn't have to require AC_PROG_CC, but this is due to the concurrency
 # between the AC_LANG_COMPILER_REQUIRE family and that of AC_PROG_CC.
+AN_MAKEVAR([CPP], [AC_PROG_CPP])
+AN_PROGRAM([cpp], [AC_PROG_CPP])
 AC_DEFUN([AC_PROG_CPP],
 [AC_REQUIRE([AC_PROG_CC])dnl
 AC_ARG_VAR([CPP],      [C preprocessor])dnl
@@ -391,6 +393,9 @@ AU_DEFUN([ac_cv_prog_gcc],
 # COMPILER ... is a space separated list of C compilers to search for.
 # This just gives the user an opportunity to specify an alternative
 # search list for the C compiler.
+AN_MAKEVAR([CC],  [AC_PROG_CC])
+AN_PROGRAM([cc],  [AC_PROG_CC])
+AN_PROGRAM([gcc], [AC_PROG_CC])
 AC_DEFUN([AC_PROG_CC],
 [AC_LANG_PUSH(C)dnl
 AC_ARG_VAR([CC],     [C compiler command])dnl
@@ -471,6 +476,7 @@ fi[]dnl
 
 # AC_PROG_GCC_TRADITIONAL
 # -----------------------
+AN_FUNCTION([ioctl],   [AC_PROG_GCC_TRADITIONAL])
 AC_DEFUN([AC_PROG_GCC_TRADITIONAL],
 [if test $ac_cv_c_compiler_gnu = yes; then
     AC_CACHE_CHECK(whether $CC needs -traditional,
@@ -614,6 +620,10 @@ AU_DEFUN([ac_cv_prog_gxx],
 # RCC  Rational C++
 # xlC_r        AIX C Set++ (with support for reentrant code)
 # xlC  AIX C Set++
+AN_MAKEVAR([CXX],  [AC_PROG_CXX])
+AN_PROGRAM([CC],   [AC_PROG_CXX])
+AN_PROGRAM([c++],  [AC_PROG_CXX])
+AN_PROGRAM([g++],  [AC_PROG_CXX])
 AC_DEFUN([AC_PROG_CXX],
 [AC_LANG_PUSH(C++)dnl
 AC_ARG_VAR([CXX],      [C++ compiler command])dnl
@@ -941,6 +951,7 @@ esac
 # HP C version B.11.11.04 doesn't allow a typedef as the return value for an
 # inline function, only builtin types.
 #
+AN_IDENTIFIER([inline], [AC_C_INLINE])
 AC_DEFUN([AC_C_INLINE],
 [AC_CACHE_CHECK([for inline], ac_cv_c_inline,
 [ac_cv_c_inline=no
@@ -967,6 +978,7 @@ esac
 
 # AC_C_CONST
 # ----------
+AN_IDENTIFIER([const],  [AC_C_CONST])
 AC_DEFUN([AC_C_CONST],
 [AC_CACHE_CHECK([for an ANSI C-conforming const], ac_cv_c_const,
 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
@@ -1034,6 +1046,7 @@ fi
 # optimizations that could break the user's code.  So, do not #define
 # volatile away unless it is really necessary to allow the user's code
 # to compile cleanly.  Benign compiler failures should be tolerated.
+AN_IDENTIFIER([volatile], [AC_C_VOLATILE])
 AC_DEFUN([AC_C_VOLATILE],
 [AC_CACHE_CHECK([for working volatile], ac_cv_c_volatile,
 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [

diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index 9d2bc1d184ea6420d531c3f66f63430e8a93eb9a..67142122dd3e5cd08a7d79381a6665c6c7e83af4 100644 (file)
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -130,6 +130,7 @@ AN_FUNCTION([acl],                     [AC_CHECK_FUNCS])
 AN_FUNCTION([alarm],                   [AC_CHECK_FUNCS])
 AN_FUNCTION([atexit],                  [AC_CHECK_FUNCS])
 AN_FUNCTION([btowc],                   [AC_CHECK_FUNCS])
+AN_FUNCTION([bzero],                   [AC_CHECK_FUNCS])
 AN_FUNCTION([clock_gettime],           [AC_CHECK_FUNCS])
 AN_FUNCTION([doprnt],                  [AC_CHECK_FUNCS])
 AN_FUNCTION([dup2],                    [AC_CHECK_FUNCS])
@@ -166,7 +167,10 @@ AN_FUNCTION([localeconv],              [AC_CHECK_FUNCS])
 AN_FUNCTION([localtime_r],             [AC_CHECK_FUNCS])
 AN_FUNCTION([mblen],                   [AC_CHECK_FUNCS])
 AN_FUNCTION([mbrlen],                  [AC_CHECK_FUNCS])
+AN_FUNCTION([memchr],                  [AC_CHECK_FUNCS])
+AN_FUNCTION([memmove],                 [AC_CHECK_FUNCS])
 AN_FUNCTION([mempcpy],                 [AC_CHECK_FUNCS])
+AN_FUNCTION([memset],                  [AC_CHECK_FUNCS])
 AN_FUNCTION([mkdir],                   [AC_CHECK_FUNCS])
 AN_FUNCTION([mkfifo],                  [AC_CHECK_FUNCS])
 AN_FUNCTION([modf],                    [AC_CHECK_FUNCS])
@@ -212,11 +216,16 @@ AN_FUNCTION([strverscmp],              [AC_CHECK_FUNCS])
 AN_FUNCTION([sysinfo],                 [AC_CHECK_FUNCS])
 AN_FUNCTION([tzset],                   [AC_CHECK_FUNCS])
 AN_FUNCTION([uname],                   [AC_CHECK_FUNCS])
+AN_FUNCTION([utime],                   [AC_CHECK_FUNCS])
 AN_FUNCTION([utmpname],                [AC_CHECK_FUNCS])
 AN_FUNCTION([utmpxname],               [AC_CHECK_FUNCS])
 AN_FUNCTION([wcwidth],                 [AC_CHECK_FUNCS])
 
 
+AN_FUNCTION([dcgettext],    [AM_GNU_GETTEXT])
+AN_FUNCTION([getwd],        [warn: getwd is deprecated, use getcwd instead])
+
+
 ## --------------------------------- ##
 ## 3. Tests for specific functions.  ##
 ## --------------------------------- ##
@@ -307,6 +316,7 @@ AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
 # AC_FUNC_ALLOCA
 # --------------
 AN_FUNCTION([alloca], [AC_FUNC_ALLOCA])
+AN_HEADER([alloca.h], [AC_FUNC_ALLOCA])
 AC_DEFUN([AC_FUNC_ALLOCA],
 [# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
@@ -428,6 +438,7 @@ fi
 
 # AC_FUNC_ERROR_AT_LINE
 # ---------------------
+AN_FUNCTION([error],         [AC_FUNC_ERROR_AT_LINE])
 AN_FUNCTION([error_at_line], [AC_FUNC_ERROR_AT_LINE])
 AC_DEFUN([AC_FUNC_ERROR_AT_LINE],
 [AC_LIBSOURCES([error.h, error.c])dnl
@@ -515,6 +526,7 @@ AC_DEFINE(fnmatch, rpl_fnmatch,
 
 # AC_REPLACE_FNMATCH
 # ------------------
+AN_FUNCTION([fnmatch], [AC_REPLACE_FNMATCH])
 AC_DEFUN([AC_REPLACE_FNMATCH],
 [_AC_FUNC_FNMATCH_IF([POSIX], [ac_cv_func_fnmatch_works],
                      [rm -f $ac_config_libobj_dir/fnmatch.h],
@@ -1243,6 +1255,7 @@ AU_ALIAS([AC_MMAP], [AC_FUNC_MMAP])
 # ---------------
 # Ensure obstack support.  Yeah, this is not exactly a `FUNC' check.
 AN_FUNCTION([obstack_init], [AC_FUNC_OBSTACK])
+AN_IDENTIFIER([obstack],    [AC_FUNC_OBSTACK])
 AC_DEFUN([AC_FUNC_OBSTACK],
 [AC_LIBSOURCES([obstack.h, obstack.c])dnl
 AC_CACHE_CHECK([for obstacks], ac_cv_func_obstack,
@@ -1666,7 +1679,8 @@ AU_ALIAS([AC_UTIME_NULL], [AC_FUNC_UTIME_NULL])
 
 # AC_FUNC_FORK
 # -------------
-AN_FUNCTION([fork], [AC_FUNC_FORK])
+AN_FUNCTION([fork],  [AC_FUNC_FORK])
+AN_FUNCTION([vfork], [AC_FUNC_FORK])
 AC_DEFUN([AC_FUNC_FORK],
 [AC_REQUIRE([AC_TYPE_PID_T])dnl
 AC_CHECK_HEADERS(unistd.h vfork.h)

diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4
index a7511a25f333084eee9af2fdd877061154ca4286..3aff005d8359a16a44e895c31589e77094135200 100644 (file)
--- a/lib/autoconf/headers.m4
+++ b/lib/autoconf/headers.m4
@@ -285,6 +285,7 @@ AN_HEADER([argz.h],             [AC_CHECK_HEADERS])
 AN_HEADER([arpa/inet.h],        [AC_CHECK_HEADERS])
 AN_HEADER([fcntl.h],            [AC_CHECK_HEADERS])
 AN_HEADER([fenv.h],             [AC_CHECK_HEADERS])
+AN_HEADER([float.h],            [AC_CHECK_HEADERS])
 AN_HEADER([fs_info.h],          [AC_CHECK_HEADERS])
 AN_HEADER([inttypes.h],         [AC_CHECK_HEADERS])
 AN_HEADER([langinfo.h],         [AC_CHECK_HEADERS])
@@ -303,8 +304,11 @@ AN_HEADER([nlist.h],            [AC_CHECK_HEADERS])
 AN_HEADER([paths.h],            [AC_CHECK_HEADERS])
 AN_HEADER([sgtty.h],            [AC_CHECK_HEADERS])
 AN_HEADER([shadow.h],           [AC_CHECK_HEADERS])
+AN_HEADER([stddef.h],           [AC_CHECK_HEADERS])
 AN_HEADER([stdint.h],           [AC_CHECK_HEADERS])
 AN_HEADER([stdio_ext.h],        [AC_CHECK_HEADERS])
+AN_HEADER([stdlib.h],           [AC_CHECK_HEADERS])
+AN_HEADER([string.h],           [AC_CHECK_HEADERS])
 AN_HEADER([strings.h],          [AC_CHECK_HEADERS])
 AN_HEADER([sys/acl.h],          [AC_CHECK_HEADERS])
 AN_HEADER([sys/file.h],         [AC_CHECK_HEADERS])
@@ -373,6 +377,10 @@ m4_define([AH_CHECK_HEADERS_DIRENT],
 
 # AC_HEADER_DIRENT
 # ----------------
+AN_HEADER([dirent.h],   [AC_HEADER_DIRENT])
+AN_HEADER([ndir.h],     [AC_HEADER_DIRENT])
+AN_HEADER([sys/dir.h],  [AC_HEADER_DIRENT])
+AN_HEADER([sys/ndir.h], [AC_HEADER_DIRENT])
 AC_DEFUN([AC_HEADER_DIRENT],
 [AH_CHECK_HEADERS_DIRENT(dirent.h sys/ndir.h sys/dir.h ndir.h)
 ac_header_dirent=no
@@ -392,6 +400,10 @@ fi
 
 # AC_HEADER_MAJOR
 # ---------------
+AN_FUNCTION([major],     [AC_HEADER_MAJOR])
+AN_FUNCTION([makedev],   [AC_HEADER_MAJOR])
+AN_FUNCTION([minor],     [AC_HEADER_MAJOR])
+AN_HEADER([sys/mkdev.h], [AC_HEADER_MAJOR])
 AC_DEFUN([AC_HEADER_MAJOR],
 [AC_CACHE_CHECK(whether sys/types.h defines makedev,
                 ac_cv_header_sys_types_h_makedev,
@@ -467,6 +479,28 @@ fi
 
 # AC_HEADER_STDC
 # --------------
+# FIXME: I find this list very strange.  It comes from the original
+# autoscan list, but I don't think it is useful for the same reason
+# that we don't bind AC_PROG_CC to finding a C function calls: if the
+# user uses bcmp, then she will certainly have the `#include', and
+# therefore, we will trigger AC_HEADER_STDC elsewhere.  --akim 2002-09-28
+# FIXME: Err... index and rindex are _not_ to be used... --akim 2002-09-28
+AN_FUNCTION([bcmp],     [AC_HEADER_STDC])
+AN_FUNCTION([bcopy],    [AC_HEADER_STDC])
+AN_FUNCTION([bzero],    [AC_HEADER_STDC])
+AN_FUNCTION([index],    [AC_HEADER_STDC])
+AN_FUNCTION([memchr],   [AC_HEADER_STDC])
+AN_FUNCTION([memcpy],   [AC_HEADER_STDC])
+AN_FUNCTION([memmove],  [AC_HEADER_STDC])
+AN_FUNCTION([memset],   [AC_HEADER_STDC])
+AN_FUNCTION([rindex],   [AC_HEADER_STDC])
+
+AN_HEADER([float.h],    [AC_HEADER_STDC])
+AN_HEADER([stdarg.h],   [AC_HEADER_STDC])
+AN_HEADER([stddef.h],   [AC_HEADER_STDC])
+AN_HEADER([stdlib.h],   [AC_HEADER_STDC])
+AN_HEADER([string.h],   [AC_HEADER_STDC])
+
 AC_DEFUN([AC_HEADER_STDC],
 [AC_CACHE_CHECK(for ANSI C header files, ac_cv_header_stdc,
 [AC_TRY_CPP([#include <stdlib.h>
@@ -520,6 +554,7 @@ fi
 
 # AC_HEADER_SYS_WAIT
 # ------------------
+AN_HEADER([sys/wait.h], [AC_HEADER_SYS_WAIT])
 AC_DEFUN([AC_HEADER_SYS_WAIT],
 [AC_CACHE_CHECK([for sys/wait.h that is POSIX.1 compatible],
   ac_cv_header_sys_wait_h,
@@ -547,6 +582,7 @@ fi
 
 # AC_HEADER_TIME
 # --------------
+AN_IDENTIFIER([timeval],  [AC_HEADER_TIME])
 AC_DEFUN([AC_HEADER_TIME],
 [AC_CACHE_CHECK([whether time.h and sys/time.h may both be included],
   ac_cv_header_time,

diff --git a/lib/autoconf/libs.m4 b/lib/autoconf/libs.m4
index b5a2ca38c5a425f0e7590210d83aa298f48c7ab8..aef77af4d0bdd045b8066fd5c38b09bec85df156 100644 (file)
--- a/lib/autoconf/libs.m4
+++ b/lib/autoconf/libs.m4
@@ -322,6 +322,7 @@ fi])dnl
 # paths, otherwise set no_x=yes.
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
+AN_HEADER([X11/Xlib.h],  [AC_PATH_X])
 AC_DEFUN([AC_PATH_X],
 [dnl Document the X abnormal options inherited from history.
 m4_divert_once([HELP_BEGIN], [

diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index 5444ccad3f973b51befd42182354506b02a2e481..b14eaacd78a5a5d54b428724e8ad05122ec62046 100644 (file)
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -58,6 +58,7 @@
 
 # AC_DECL_SYS_SIGLIST
 # -------------------
+AN_IDENTIFIER([sys_siglist],     [AC_DECL_SYS_SIGLIST])
 AC_DEFUN([AC_DECL_SYS_SIGLIST],
 [AC_CACHE_CHECK([for sys_siglist declaration in signal.h or unistd.h],
   ac_cv_decl_sys_siglist,

diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4
index d3b00831600dfc685c31511535ba9a9daea079e2..9b2d5630c75065f83bc016b3d4473538690d265b 100644 (file)
--- a/lib/autoconf/types.m4
+++ b/lib/autoconf/types.m4
@@ -235,6 +235,13 @@ AC_DEFUN([AC_CHECK_TYPE],
 
 
 
+# ---------------------------- #
+# Types that must be checked.  #
+# ---------------------------- #
+
+AN_IDENTIFIER([ptrdiff_t], [AC_CHECK_TYPES])
+
+
 # ----------------- #
 # Specific checks.  #
 # ----------------- #
@@ -284,6 +291,7 @@ AC_DEFINE_UNQUOTED(GETGROUPS_T, $ac_cv_type_getgroups,
 
 
 # AU::AM_TYPE_PTRDIFF_T
+# ---------------------
 AU_DEFUN([AM_TYPE_PTRDIFF_T],
 [AC_CHECK_TYPES(ptrdiff_t)])
 
@@ -311,6 +319,8 @@ AC_DEFUN([AC_TYPE_MBSTATE_T],
 # AC_TYPE_UID_T
 # -------------
 # FIXME: Rewrite using AC_CHECK_TYPE.
+AN_IDENTIFIER([gid_t], [AC_TYPE_UID_T])
+AN_IDENTIFIER([uid_t], [AC_TYPE_UID_T])
 AC_DEFUN([AC_TYPE_UID_T],
 [AC_CACHE_CHECK(for uid_t in sys/types.h, ac_cv_type_uid_t,
 [AC_EGREP_HEADER(uid_t, sys/types.h,
@@ -322,15 +332,23 @@ fi
 ])
 
 
+AN_IDENTIFIER([size_t], [AC_TYPE_SIZE_T])
 AC_DEFUN([AC_TYPE_SIZE_T], [AC_CHECK_TYPE(size_t, unsigned)])
+
+AN_IDENTIFIER([pid_t], [AC_TYPE_PID_T])
 AC_DEFUN([AC_TYPE_PID_T],  [AC_CHECK_TYPE(pid_t,  int)])
+
+AN_IDENTIFIER([off_t], [AC_TYPE_OFF_T])
 AC_DEFUN([AC_TYPE_OFF_T],  [AC_CHECK_TYPE(off_t,  long)])
+
+AN_IDENTIFIER([mode_t], [AC_TYPE_MODE_T])
 AC_DEFUN([AC_TYPE_MODE_T], [AC_CHECK_TYPE(mode_t, int)])
 
 
 # AC_TYPE_SIGNAL
 # --------------
 # Note that identifiers starting with SIG are reserved by ANSI C.
+AN_FUNCTION([signal],  [AC_TYPE_SIGNAL])
 AC_DEFUN([AC_TYPE_SIGNAL],
 [AC_CACHE_CHECK([return type of signal handlers], ac_cv_type_signal,
 [AC_COMPILE_IFELSE(
@@ -553,6 +571,7 @@ AC_CHECK_MEMBERS([struct stat.st_rdev],
 # ------------
 # FIXME: This macro is badly named, it should be AC_CHECK_TYPE_STRUCT_TM.
 # Or something else, but what? AC_CHECK_TYPE_STRUCT_TM_IN_SYS_TIME?
+AN_IDENTIFIER([tm], [AC_STRUCT_TM])
 AC_DEFUN([AC_STRUCT_TM],
 [AC_CACHE_CHECK([whether struct tm is in sys/time.h or time.h],
   ac_cv_struct_tm,

diff --git a/lib/autoscan/autoscan.list b/lib/autoscan/autoscan.list
index ce3a42582f1cc8959ff737fa7faf7089ba282c7f..3843c82f4a4dfd1e93b907463106a1c41bb37fea 100644 (file)
--- a/lib/autoscan/autoscan.list
+++ b/lib/autoscan/autoscan.list
@@ -17,7 +17,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
-
 function: __argz_count         AC_CHECK_FUNCS
 function: __argz_next          AC_CHECK_FUNCS
 function: __argz_stringify             AC_CHECK_FUNCS
@@ -27,27 +26,27 @@ function: acl               AC_CHECK_FUNCS
 function: alarm                AC_CHECK_FUNCS
 function: alloca               AC_FUNC_ALLOCA
 function: atexit               AC_CHECK_FUNCS
-function: bcmp                    AC_HEADER_STDC
-function: bcopy                   AC_HEADER_STDC
+function: bcmp         AC_HEADER_STDC
+function: bcopy                AC_HEADER_STDC
 function: btowc                AC_CHECK_FUNCS
-function: bzero                   AC_CHECK_FUNCS
-function: bzero                   AC_HEADER_STDC
+function: bzero                AC_CHECK_FUNCS
+function: bzero                AC_HEADER_STDC
 function: chown                AC_FUNC_CHOWN
 function: clock_gettime                AC_CHECK_FUNCS
 function: closedir             AC_FUNC_CLOSEDIR_VOID
-function: dcgettext               AM_GNU_GETTEXT
+function: dcgettext            AM_GNU_GETTEXT
 function: doprnt               AC_CHECK_FUNCS
 function: dup2         AC_CHECK_FUNCS
 function: endgrent             AC_CHECK_FUNCS
 function: endpwent             AC_CHECK_FUNCS
-function: error                   AC_FUNC_ERROR_AT_LINE
+function: error                AC_FUNC_ERROR_AT_LINE
 function: error_at_line                AC_FUNC_ERROR_AT_LINE
 function: euidaccess           AC_CHECK_FUNCS
 function: fchdir               AC_CHECK_FUNCS
 function: fdatasync            AC_CHECK_FUNCS
 function: fesetround           AC_CHECK_FUNCS
 function: floor                AC_CHECK_FUNCS
-function: fnmatch                 AC_FUNC_FNMATCH
+function: fnmatch              AC_REPLACE_FNMATCH
 function: fork         AC_FUNC_FORK
 function: fs_stat_dev          AC_CHECK_FUNCS
 function: fseeko               AC_FUNC_FSEEKO
@@ -71,11 +70,11 @@ function: getpgrp           AC_FUNC_GETPGRP
 function: getspnam             AC_CHECK_FUNCS
 function: gettimeofday         AC_CHECK_FUNCS
 function: getusershell         AC_CHECK_FUNCS
-function: getwd          warn: getwd is deprecated, use getcwd instead
+function: getwd                warn: getwd is deprecated, use getcwd instead
 function: hasmntopt            AC_CHECK_FUNCS
-function: index                   AC_HEADER_STDC
+function: index                AC_HEADER_STDC
 function: inet_ntoa            AC_CHECK_FUNCS
-function: ioctl                   AC_PROG_GCC_TRADITIONAL
+function: ioctl                AC_PROG_GCC_TRADITIONAL
 function: isascii              AC_CHECK_FUNCS
 function: iswprint             AC_CHECK_FUNCS
 function: lchown               AC_CHECK_FUNCS
@@ -84,22 +83,22 @@ function: localeconv                AC_CHECK_FUNCS
 function: localtime_r          AC_CHECK_FUNCS
 function: lstat                AC_FUNC_LSTAT
 function: lstat                AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
-function: major                   AC_HEADER_MAJOR
-function: makedev                 AC_HEADER_MAJOR
+function: major                AC_HEADER_MAJOR
+function: makedev              AC_HEADER_MAJOR
 function: malloc               AC_FUNC_MALLOC
 function: mblen                AC_CHECK_FUNCS
 function: mbrlen               AC_CHECK_FUNCS
 function: mbrtowc              AC_FUNC_MBRTOWC
-function: memchr                  AC_CHECK_FUNCS
-function: memchr                  AC_HEADER_STDC
+function: memchr               AC_CHECK_FUNCS
+function: memchr               AC_HEADER_STDC
 function: memcmp               AC_FUNC_MEMCMP
-function: memcpy                  AC_HEADER_STDC
-function: memmove                 AC_CHECK_FUNCS
-function: memmove                 AC_HEADER_STDC
+function: memcpy               AC_HEADER_STDC
+function: memmove              AC_CHECK_FUNCS
+function: memmove              AC_HEADER_STDC
 function: mempcpy              AC_CHECK_FUNCS
-function: memset                  AC_CHECK_FUNCS
-function: memset                  AC_HEADER_STDC
-function: minor                   AC_HEADER_MAJOR
+function: memset               AC_CHECK_FUNCS
+function: memset               AC_HEADER_STDC
+function: minor                AC_HEADER_MAJOR
 function: mkdir                AC_CHECK_FUNCS
 function: mkfifo               AC_CHECK_FUNCS
 function: mktime               AC_FUNC_MKTIME
@@ -119,7 +118,7 @@ function: realpath          AC_CHECK_FUNCS
 function: regcmp               AC_CHECK_FUNCS
 function: regcomp              AC_CHECK_FUNCS
 function: resolvepath          AC_CHECK_FUNCS
-function: rindex                  AC_HEADER_STDC
+function: rindex               AC_HEADER_STDC
 function: rint         AC_CHECK_FUNCS
 function: rmdir                AC_CHECK_FUNCS
 function: rpmatch              AC_CHECK_FUNCS
@@ -130,7 +129,7 @@ function: sethostname               AC_CHECK_FUNCS
 function: setlocale            AC_CHECK_FUNCS
 function: setpgrp              AC_FUNC_SETPGRP
 function: setvbuf              AC_FUNC_SETVBUF_REVERSED
-function: signal                  AC_TYPE_SIGNAL
+function: signal               AC_TYPE_SIGNAL
 function: socket               AC_CHECK_FUNCS
 function: sqrt         AC_CHECK_FUNCS
 function: stat         AC_FUNC_STAT
@@ -160,26 +159,26 @@ function: strverscmp              AC_CHECK_FUNCS
 function: sysinfo              AC_CHECK_FUNCS
 function: tzset                AC_CHECK_FUNCS
 function: uname                AC_CHECK_FUNCS
+function: utime                AC_CHECK_FUNCS
 function: utime                AC_FUNC_UTIME_NULL
-function: utime                   AC_CHECK_FUNCS
 function: utmpname             AC_CHECK_FUNCS
 function: utmpxname            AC_CHECK_FUNCS
-function: vfork                   AC_FUNC_FORK
+function: vfork                AC_FUNC_FORK
 function: vfprintf             AC_FUNC_VPRINTF
 function: vprintf              AC_FUNC_VPRINTF
 function: vsprintf             AC_FUNC_VPRINTF
 function: wait3                AC_FUNC_WAIT3
 function: wcwidth              AC_CHECK_FUNCS
 header: OS.h           AC_CHECK_HEADERS
-header: X11/Xlib.h      AC_PATH_X
-header: alloca.h        AC_FUNC_ALLOCA
+header: X11/Xlib.h             AC_PATH_X
+header: alloca.h               AC_FUNC_ALLOCA
 header: argz.h         AC_CHECK_HEADERS
 header: arpa/inet.h            AC_CHECK_HEADERS
-header: dirent.h        AC_HEADER_DIRENT
+header: dirent.h               AC_HEADER_DIRENT
 header: fcntl.h                AC_CHECK_HEADERS
 header: fenv.h         AC_CHECK_HEADERS
-header: float.h         AC_CHECK_HEADERS
-header: float.h         AC_HEADER_STDC
+header: float.h                AC_CHECK_HEADERS
+header: float.h                AC_HEADER_STDC
 header: fs_info.h              AC_CHECK_HEADERS
 header: inttypes.h             AC_CHECK_HEADERS
 header: langinfo.h             AC_CHECK_HEADERS
@@ -191,7 +190,7 @@ header: malloc.h            AC_CHECK_HEADERS
 header: memory.h               AC_CHECK_HEADERS
 header: mntent.h               AC_CHECK_HEADERS
 header: mnttab.h               AC_CHECK_HEADERS
-header: ndir.h          AC_HEADER_DIRENT
+header: ndir.h         AC_HEADER_DIRENT
 header: netdb.h                AC_CHECK_HEADERS
 header: netinet/in.h           AC_CHECK_HEADERS
 header: nl_types.h             AC_CHECK_HEADERS
@@ -199,28 +198,28 @@ header: nlist.h           AC_CHECK_HEADERS
 header: paths.h                AC_CHECK_HEADERS
 header: sgtty.h                AC_CHECK_HEADERS
 header: shadow.h               AC_CHECK_HEADERS
-header: stdarg.h        AC_HEADER_STDC
-header: stddef.h        AC_CHECK_HEADERS
-header: stddef.h        AC_HEADER_STDC
+header: stdarg.h               AC_HEADER_STDC
+header: stddef.h               AC_CHECK_HEADERS
+header: stddef.h               AC_HEADER_STDC
 header: stdint.h               AC_CHECK_HEADERS
 header: stdio_ext.h            AC_CHECK_HEADERS
-header: stdlib.h        AC_CHECK_HEADERS
-header: stdlib.h        AC_HEADER_STDC
-header: string.h        AC_CHECK_HEADERS
-header: string.h        AC_HEADER_STDC
+header: stdlib.h               AC_CHECK_HEADERS
+header: stdlib.h               AC_HEADER_STDC
+header: string.h               AC_CHECK_HEADERS
+header: string.h               AC_HEADER_STDC
 header: strings.h              AC_CHECK_HEADERS
 header: sys/acl.h              AC_CHECK_HEADERS
-header: sys/dir.h       AC_HEADER_DIRENT
+header: sys/dir.h              AC_HEADER_DIRENT
 header: sys/file.h             AC_CHECK_HEADERS
 header: sys/filsys.h           AC_CHECK_HEADERS
 header: sys/fs/s5param.h               AC_CHECK_HEADERS
 header: sys/fs_types.h         AC_CHECK_HEADERS
 header: sys/fstyp.h            AC_CHECK_HEADERS
 header: sys/ioctl.h            AC_CHECK_HEADERS
-header: sys/mkdev.h     AC_HEADER_MAJOR
+header: sys/mkdev.h            AC_HEADER_MAJOR
 header: sys/mntent.h           AC_CHECK_HEADERS
 header: sys/mount.h            AC_CHECK_HEADERS
-header: sys/ndir.h      AC_HEADER_DIRENT
+header: sys/ndir.h             AC_HEADER_DIRENT
 header: sys/param.h            AC_CHECK_HEADERS
 header: sys/socket.h           AC_CHECK_HEADERS
 header: sys/statfs.h           AC_CHECK_HEADERS
@@ -229,7 +228,7 @@ header: sys/systeminfo.h            AC_CHECK_HEADERS
 header: sys/time.h             AC_CHECK_HEADERS
 header: sys/timeb.h            AC_CHECK_HEADERS
 header: sys/vfs.h              AC_CHECK_HEADERS
-header: sys/wait.h      AC_HEADER_SYS_WAIT
+header: sys/wait.h             AC_HEADER_SYS_WAIT
 header: sys/window.h           AC_CHECK_HEADERS
 header: syslog.h               AC_CHECK_HEADERS
 header: termio.h               AC_CHECK_HEADERS
@@ -248,45 +247,46 @@ identifier: S_ISFIFO              AC_HEADER_STAT
 identifier: S_ISLNK            AC_HEADER_STAT
 identifier: S_ISREG            AC_HEADER_STAT
 identifier: S_ISSOCK           AC_HEADER_STAT
-identifier: const           AC_C_CONST
-identifier: gid_t           AC_TYPE_UID_T
-identifier: inline          AC_C_INLINE
-identifier: mode_t          AC_TYPE_MODE_T
-identifier: obstack         AC_FUNC_OBSTACK
-identifier: off_t           AC_TYPE_OFF_T
-identifier: pid_t           AC_TYPE_PID_T
-identifier: ptrdiff_t       AC_CHECK_TYPES
-identifier: size_t          AC_TYPE_SIZE_T
+identifier: const              AC_C_CONST
+identifier: gid_t              AC_TYPE_UID_T
+identifier: inline             AC_C_INLINE
+identifier: mode_t             AC_TYPE_MODE_T
+identifier: obstack            AC_FUNC_OBSTACK
+identifier: off_t              AC_TYPE_OFF_T
+identifier: pid_t              AC_TYPE_PID_T
+identifier: ptrdiff_t          AC_CHECK_TYPES
+identifier: size_t             AC_TYPE_SIZE_T
 identifier: st_blksize         AC_CHECK_MEMBERS([struct stat.st_blksize])
 identifier: st_blocks          AC_STRUCT_ST_BLOCKS
 identifier: st_rdev            AC_CHECK_MEMBERS([struct stat.st_rdev])
-identifier: sys_siglist     AC_DECL_SYS_SIGLIST
-identifier: timeval         AC_HEADER_TIME
-identifier: tm              AC_STRUCT_TM
+identifier: sys_siglist                AC_DECL_SYS_SIGLIST
+identifier: timeval            AC_HEADER_TIME
+identifier: tm         AC_STRUCT_TM
 identifier: tm_zone            AC_STRUCT_TIMEZONE
-identifier: uid_t           AC_TYPE_UID_T
+identifier: uid_t              AC_TYPE_UID_T
+identifier: volatile           AC_C_VOLATILE
 makevar: AWK           AC_PROG_AWK
 makevar: BISON         AC_PROG_YACC
-makevar: CC              AC_PROG_CC
-makevar: CPP             AC_PROG_CPP
-makevar: CXX             AC_PROG_CXX
+makevar: CC            AC_PROG_CC
+makevar: CPP           AC_PROG_CPP
+makevar: CXX           AC_PROG_CXX
 makevar: INSTALL               AC_PROG_INSTALL
 makevar: LEX           AC_PROG_LEX
 makevar: LN            AC_PROG_LN_S
 makevar: MAKE          AC_PROG_MAKE_SET
 makevar: RANLIB                AC_PROG_RANLIB
 makevar: YACC          AC_PROG_YACC
-program: CC              AC_PROG_CXX
+program: CC            AC_PROG_CXX
 program: awk           AC_PROG_AWK
 program: bison         AC_PROG_YACC
 program: byacc         AC_PROG_YACC
-program: c++             AC_PROG_CXX
-program: cc              AC_PROG_CC
-program: cpp             AC_PROG_CPP
+program: c++           AC_PROG_CXX
+program: cc            AC_PROG_CC
+program: cpp           AC_PROG_CPP
 program: flex          AC_PROG_LEX
-program: g++             AC_PROG_CXX
+program: g++           AC_PROG_CXX
 program: gawk          AC_PROG_AWK
-program: gcc             AC_PROG_CC
+program: gcc           AC_PROG_CC
 program: install               AC_PROG_INSTALL
 program: lex           AC_PROG_LEX
 program: ln            AC_PROG_LN_S

diff --git a/lib/autoscan/autoscan.pre b/lib/autoscan/autoscan.pre
index 758aeed304a9216a97d2d317ed789d80f38b6de2..0bb363e01b756fb04f5fffaf351e713bd5e1bc03 100644 (file)
--- a/lib/autoscan/autoscan.pre
+++ b/lib/autoscan/autoscan.pre
@@ -16,83 +16,3 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
-
-# Functions that have their own macros.
-function: bcmp                    AC_HEADER_STDC
-function: bcopy                   AC_HEADER_STDC
-function: bzero                   AC_CHECK_FUNCS
-function: bzero                   AC_HEADER_STDC
-function: dcgettext               AM_GNU_GETTEXT
-function: error                   AC_FUNC_ERROR_AT_LINE
-function: fnmatch                 AC_FUNC_FNMATCH
-function: index                   AC_HEADER_STDC
-function: ioctl                   AC_PROG_GCC_TRADITIONAL
-function: major                   AC_HEADER_MAJOR
-function: makedev                 AC_HEADER_MAJOR
-function: memchr                  AC_CHECK_FUNCS
-function: memchr                  AC_HEADER_STDC
-function: memcpy                  AC_HEADER_STDC
-function: memmove                 AC_CHECK_FUNCS
-function: memmove                 AC_HEADER_STDC
-function: memset                  AC_CHECK_FUNCS
-function: memset                  AC_HEADER_STDC
-function: minor                   AC_HEADER_MAJOR
-function: rindex                  AC_HEADER_STDC
-function: signal                  AC_TYPE_SIGNAL
-function: utime                   AC_CHECK_FUNCS
-function: vfork                   AC_FUNC_FORK
-
-# Functions we should no longer use.
-function: getwd          warn: getwd is deprecated, use getcwd instead
-
-
-
-# Headers with specific macros.
-header: X11/Xlib.h      AC_PATH_X
-header: alloca.h        AC_FUNC_ALLOCA
-header: dirent.h        AC_HEADER_DIRENT
-header: float.h         AC_CHECK_HEADERS
-header: float.h         AC_HEADER_STDC
-header: ndir.h          AC_HEADER_DIRENT
-header: stdarg.h        AC_HEADER_STDC
-header: stddef.h        AC_CHECK_HEADERS
-header: stddef.h        AC_HEADER_STDC
-header: stdlib.h        AC_CHECK_HEADERS
-header: stdlib.h        AC_HEADER_STDC
-header: string.h        AC_CHECK_HEADERS
-header: string.h        AC_HEADER_STDC
-header: sys/dir.h       AC_HEADER_DIRENT
-header: sys/mkdev.h     AC_HEADER_MAJOR
-header: sys/ndir.h      AC_HEADER_DIRENT
-header: sys/wait.h      AC_HEADER_SYS_WAIT
-
-# Keywords.
-identifier: const           AC_C_CONST
-identifier: inline          AC_C_INLINE
-
-# Variables.
-identifier: sys_siglist     AC_DECL_SYS_SIGLIST
-
-# Types.
-identifier: gid_t           AC_TYPE_UID_T
-identifier: mode_t          AC_TYPE_MODE_T
-identifier: obstack         AC_FUNC_OBSTACK
-identifier: off_t           AC_TYPE_OFF_T
-identifier: pid_t           AC_TYPE_PID_T
-identifier: ptrdiff_t       AC_CHECK_TYPES
-identifier: size_t          AC_TYPE_SIZE_T
-identifier: timeval         AC_HEADER_TIME
-identifier: tm              AC_STRUCT_TM
-identifier: uid_t           AC_TYPE_UID_T
-
-
-makevar: CC              AC_PROG_CC
-makevar: CPP             AC_PROG_CPP
-makevar: CXX             AC_PROG_CXX
-
-program: CC              AC_PROG_CXX
-program: c++             AC_PROG_CXX
-program: cc              AC_PROG_CC
-program: cpp             AC_PROG_CPP
-program: g++             AC_PROG_CXX
-program: gcc             AC_PROG_CC