From now on, autoscan files must always map a macro name to a

word: there is no `default' macro for autoscan.
* bin/autoscan.in (&init_tables): Reject entries with no macro at
all.
* lib/autoscan/functions, lib/autoscan/headers: Make the macro
explicit.

diff --git a/ChangeLog b/ChangeLog
index e09ca9bc3242dfde62d3fe4a60238786842d9451..f46aa589879a9f77c4de36244a67935746f5ea96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-09-28  Akim Demaille  <akim@epita.fr>
+
+       From now on, autoscan files must always map a macro name to a
+       word: there is no `default' macro for autoscan.
+
+       * bin/autoscan.in (&init_tables): Reject entries with no macro at
+       all.
+       * lib/autoscan/functions, lib/autoscan/headers: Make the macro
+       explicit.
+
 2002-09-28  Akim Demaille  <akim@epita.fr>
 
        * bin/autoscan.in (%c_keywords): Remove.

diff --git a/bin/autoscan.in b/bin/autoscan.in
index 4f057cf3b619f475374755dbff4ffd696e02cbeb..537e458dd3288e68086104d3234ed59ffbcc8d26 100644 (file)
--- a/bin/autoscan.in
+++ b/bin/autoscan.in
@@ -165,12 +165,11 @@ sub init_tables ()
            if /^\s*$/ || /^\s*\#/;
 
          # '<word>        <macro invocation>' or...
-         # '<word>        warn: <message>'    or...
-         # '<word>'.
-         if (/^(\S+)\s+(\S.*)$/ || /^(\S+)\s*$/)
+         # '<word>        warn: <message>'.
+         if (/^(\S+)\s+(\S.*)$/)
            {
              my $word = $1;
-             my $macro = $2 || $generic_macro{$kind};
+             my $macro = $2;
              # The default macro must be explicitly listed for words
              # which have a specific macros.  This allows to enforce
              # consistency checks.

diff --git a/lib/autoscan/functions b/lib/autoscan/functions
index d793b2e14c0a9409249a57544d70652bcfee7ed4..338a50d196d95ba271f0946faf21ccb4035acf61 100644 (file)
--- a/lib/autoscan/functions
+++ b/lib/autoscan/functions
@@ -76,99 +76,99 @@ wait3           AC_FUNC_WAIT3
 getwd          warn: getwd is deprecated, use getcwd instead
 
 # Others, checked with AC_CHECK_FUNCS.
-__argz_count
-__argz_next
-__argz_stringify
-__fpending
-acl
-alarm
-atexit
-btowc
-clock_gettime
-doprnt
-dup2
-endgrent
-endpwent
-euidaccess
-fchdir
-fdatasync
-fesetround
-floor
-fs_stat_dev
-ftime
-ftruncate
-getcwd
-getdelim
-gethostbyaddr
-gethostbyname
-gethostname
-gethrtime
-getmntent
-getmntinfo
-getpagesize
-getpass
-getspnam
-gettimeofday
-getusershell
-hasmntopt
-inet_ntoa
-isascii
-iswprint
-lchown
-listmntent
-localeconv
-localtime_r
-mblen
-mbrlen
-mempcpy
-mkdir
-mkfifo
-modf
-munmap
-next_dev
-nl_langinfo
-pathconf
-pow
-pstat_getdynamic
-putenv
-re_comp
-realpath
-regcmp
-regcomp
-resolvepath
-rint
-rmdir
-rpmatch
-select
-setenv
-sethostname
-setlocale
-socket
-sqrt
-stime
-stpcpy
-strcasecmp
-strchr
-strcspn
-strdup
-strerror
-strncasecmp
-strndup
-strpbrk
-strrchr
-strspn
-strstr
-strtol
-strtoul
-strtoull
-strtoumax
-strverscmp
-sysinfo
-tzset
-uname
-utmpname
-utmpxname
-wcwidth
+__argz_count            AC_CHECK_FUNCS
+__argz_next             AC_CHECK_FUNCS
+__argz_stringify        AC_CHECK_FUNCS
+__fpending              AC_CHECK_FUNCS
+acl                     AC_CHECK_FUNCS
+alarm                   AC_CHECK_FUNCS
+atexit                  AC_CHECK_FUNCS
+btowc                   AC_CHECK_FUNCS
+clock_gettime           AC_CHECK_FUNCS
+doprnt                  AC_CHECK_FUNCS
+dup2                    AC_CHECK_FUNCS
+endgrent                AC_CHECK_FUNCS
+endpwent                AC_CHECK_FUNCS
+euidaccess              AC_CHECK_FUNCS
+fchdir                  AC_CHECK_FUNCS
+fdatasync               AC_CHECK_FUNCS
+fesetround              AC_CHECK_FUNCS
+floor                   AC_CHECK_FUNCS
+fs_stat_dev             AC_CHECK_FUNCS
+ftime                   AC_CHECK_FUNCS
+ftruncate               AC_CHECK_FUNCS
+getcwd                  AC_CHECK_FUNCS
+getdelim                AC_CHECK_FUNCS
+gethostbyaddr           AC_CHECK_FUNCS
+gethostbyname           AC_CHECK_FUNCS
+gethostname             AC_CHECK_FUNCS
+gethrtime               AC_CHECK_FUNCS
+getmntent               AC_CHECK_FUNCS
+getmntinfo              AC_CHECK_FUNCS
+getpagesize             AC_CHECK_FUNCS
+getpass                 AC_CHECK_FUNCS
+getspnam                AC_CHECK_FUNCS
+gettimeofday            AC_CHECK_FUNCS
+getusershell            AC_CHECK_FUNCS
+hasmntopt               AC_CHECK_FUNCS
+inet_ntoa               AC_CHECK_FUNCS
+isascii                 AC_CHECK_FUNCS
+iswprint                AC_CHECK_FUNCS
+lchown                  AC_CHECK_FUNCS
+listmntent              AC_CHECK_FUNCS
+localeconv              AC_CHECK_FUNCS
+localtime_r             AC_CHECK_FUNCS
+mblen                   AC_CHECK_FUNCS
+mbrlen                  AC_CHECK_FUNCS
+mempcpy                 AC_CHECK_FUNCS
+mkdir                   AC_CHECK_FUNCS
+mkfifo                  AC_CHECK_FUNCS
+modf                    AC_CHECK_FUNCS
+munmap                  AC_CHECK_FUNCS
+next_dev                AC_CHECK_FUNCS
+nl_langinfo             AC_CHECK_FUNCS
+pathconf                AC_CHECK_FUNCS
+pow                     AC_CHECK_FUNCS
+pstat_getdynamic        AC_CHECK_FUNCS
+putenv                  AC_CHECK_FUNCS
+re_comp                 AC_CHECK_FUNCS
+realpath                AC_CHECK_FUNCS
+regcmp                  AC_CHECK_FUNCS
+regcomp                 AC_CHECK_FUNCS
+resolvepath             AC_CHECK_FUNCS
+rint                    AC_CHECK_FUNCS
+rmdir                   AC_CHECK_FUNCS
+rpmatch                 AC_CHECK_FUNCS
+select                  AC_CHECK_FUNCS
+setenv                  AC_CHECK_FUNCS
+sethostname             AC_CHECK_FUNCS
+setlocale               AC_CHECK_FUNCS
+socket                  AC_CHECK_FUNCS
+sqrt                    AC_CHECK_FUNCS
+stime                   AC_CHECK_FUNCS
+stpcpy                  AC_CHECK_FUNCS
+strcasecmp              AC_CHECK_FUNCS
+strchr                  AC_CHECK_FUNCS
+strcspn                 AC_CHECK_FUNCS
+strdup                  AC_CHECK_FUNCS
+strerror                AC_CHECK_FUNCS
+strncasecmp             AC_CHECK_FUNCS
+strndup                 AC_CHECK_FUNCS
+strpbrk                 AC_CHECK_FUNCS
+strrchr                 AC_CHECK_FUNCS
+strspn                  AC_CHECK_FUNCS
+strstr                  AC_CHECK_FUNCS
+strtol                  AC_CHECK_FUNCS
+strtoul                 AC_CHECK_FUNCS
+strtoull                AC_CHECK_FUNCS
+strtoumax               AC_CHECK_FUNCS
+strverscmp              AC_CHECK_FUNCS
+sysinfo                 AC_CHECK_FUNCS
+tzset                   AC_CHECK_FUNCS
+uname                   AC_CHECK_FUNCS
+utmpname                AC_CHECK_FUNCS
+utmpxname               AC_CHECK_FUNCS
+wcwidth                 AC_CHECK_FUNCS
 
 # Local Variables:
 # mode: shell-script

diff --git a/lib/autoscan/headers b/lib/autoscan/headers
index 8442caf6eadfd5dbde221cb22a7c2aa10be13194..1bc3d75cc36a84e5d5d973a657932558356b2875 100644 (file)
--- a/lib/autoscan/headers
+++ b/lib/autoscan/headers
@@ -1,5 +1,5 @@
 # acheaders -- autoscan's mapping from headers to Autoconf macros
-# Copyright 1992, 1993, 1994, 1996, 1999, 2000, 2001
+# Copyright (C) 1992, 1993, 1994, 1996, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -21,80 +21,80 @@
 # unclear to me --akim.
 
 # Ones that have their own macros.
-X11/Xlib.h     AC_PATH_X
+X11/Xlib.h      AC_PATH_X
 alloca.h        AC_FUNC_ALLOCA
-dirent.h       AC_HEADER_DIRENT
-float.h                AC_HEADER_STDC
-float.h                AC_CHECK_HEADERS
-ndir.h         AC_HEADER_DIRENT
-stdarg.h       AC_HEADER_STDC
-stddef.h       AC_HEADER_STDC
-stddef.h       AC_CHECK_HEADERS
-stdlib.h       AC_HEADER_STDC
-stdlib.h       AC_CHECK_HEADERS
-string.h       AC_HEADER_STDC
-string.h       AC_CHECK_HEADERS
-sys/dir.h      AC_HEADER_DIRENT
-sys/mkdev.h    AC_HEADER_MAJOR
-sys/ndir.h     AC_HEADER_DIRENT
-sys/wait.h     AC_HEADER_SYS_WAIT
+dirent.h        AC_HEADER_DIRENT
+float.h         AC_HEADER_STDC
+float.h         AC_CHECK_HEADERS
+ndir.h          AC_HEADER_DIRENT
+stdarg.h        AC_HEADER_STDC
+stddef.h        AC_HEADER_STDC
+stddef.h        AC_CHECK_HEADERS
+stdlib.h        AC_HEADER_STDC
+stdlib.h        AC_CHECK_HEADERS
+string.h        AC_HEADER_STDC
+string.h        AC_CHECK_HEADERS
+sys/dir.h       AC_HEADER_DIRENT
+sys/mkdev.h     AC_HEADER_MAJOR
+sys/ndir.h      AC_HEADER_DIRENT
+sys/wait.h      AC_HEADER_SYS_WAIT
 
 # Others, checked with AC_CHECK_HEADERS.
-OS.h
-argz.h
-arpa/inet.h
+OS.h                    AC_CHECK_HEADERS
+argz.h                  AC_CHECK_HEADERS
+arpa/inet.h             AC_CHECK_HEADERS
 # errno.h is portable.
-fcntl.h
-fenv.h
-fs_info.h
-inttypes.h
-langinfo.h
-libintl.h
-limits.h
-locale.h
-mach/mach.h
-malloc.h
-memory.h
-mntent.h
-mnttab.h
-netdb.h
-netinet/in.h
-nl_types.h
-nlist.h
-paths.h
-sgtty.h
-shadow.h
-stdint.h
-stdio_ext.h
-strings.h
-sys/acl.h
-sys/file.h
-sys/filsys.h
-sys/fs/s5param.h
-sys/fs_types.h
-sys/fstyp.h
-sys/ioctl.h
-sys/mntent.h
-sys/mount.h
-sys/param.h
-sys/socket.h
-sys/statfs.h
-sys/statvfs.h
-sys/systeminfo.h
-sys/time.h
-sys/timeb.h
-sys/vfs.h
-sys/window.h
-syslog.h
-termio.h
-termios.h
-unistd.h
-utime.h
-utmp.h
-utmpx.h
-values.h
-wchar.h
-wctype.h
+fcntl.h                 AC_CHECK_HEADERS
+fenv.h                  AC_CHECK_HEADERS
+fs_info.h               AC_CHECK_HEADERS
+inttypes.h              AC_CHECK_HEADERS
+langinfo.h              AC_CHECK_HEADERS
+libintl.h               AC_CHECK_HEADERS
+limits.h                AC_CHECK_HEADERS
+locale.h                AC_CHECK_HEADERS
+mach/mach.h             AC_CHECK_HEADERS
+malloc.h                AC_CHECK_HEADERS
+memory.h                AC_CHECK_HEADERS
+mntent.h                AC_CHECK_HEADERS
+mnttab.h                AC_CHECK_HEADERS
+netdb.h                 AC_CHECK_HEADERS
+netinet/in.h            AC_CHECK_HEADERS
+nl_types.h              AC_CHECK_HEADERS
+nlist.h                 AC_CHECK_HEADERS
+paths.h                 AC_CHECK_HEADERS
+sgtty.h                 AC_CHECK_HEADERS
+shadow.h                AC_CHECK_HEADERS
+stdint.h                AC_CHECK_HEADERS
+stdio_ext.h             AC_CHECK_HEADERS
+strings.h               AC_CHECK_HEADERS
+sys/acl.h               AC_CHECK_HEADERS
+sys/file.h              AC_CHECK_HEADERS
+sys/filsys.h            AC_CHECK_HEADERS
+sys/fs/s5param.h        AC_CHECK_HEADERS
+sys/fs_types.h          AC_CHECK_HEADERS
+sys/fstyp.h             AC_CHECK_HEADERS
+sys/ioctl.h             AC_CHECK_HEADERS
+sys/mntent.h            AC_CHECK_HEADERS
+sys/mount.h             AC_CHECK_HEADERS
+sys/param.h             AC_CHECK_HEADERS
+sys/socket.h            AC_CHECK_HEADERS
+sys/statfs.h            AC_CHECK_HEADERS
+sys/statvfs.h           AC_CHECK_HEADERS
+sys/systeminfo.h        AC_CHECK_HEADERS
+sys/time.h              AC_CHECK_HEADERS
+sys/timeb.h             AC_CHECK_HEADERS
+sys/vfs.h               AC_CHECK_HEADERS
+sys/window.h            AC_CHECK_HEADERS
+syslog.h                AC_CHECK_HEADERS
+termio.h                AC_CHECK_HEADERS
+termios.h               AC_CHECK_HEADERS
+unistd.h                AC_CHECK_HEADERS
+utime.h                 AC_CHECK_HEADERS
+utmp.h                  AC_CHECK_HEADERS
+utmpx.h                 AC_CHECK_HEADERS
+values.h                AC_CHECK_HEADERS
+wchar.h                 AC_CHECK_HEADERS
+wctype.h                AC_CHECK_HEADERS
 
 # Local Variables:
 # mode: shell-script