13-update-preselections.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * lib/autom4te.in (Autoscan-preselections, Autoreconf-preselections)
        (Automake-preselections): Update.
        * bin/autoreconf.in, bin/autoheader.in: Comment changes.

Index: bin/autoheader.in
--- bin/autoheader.in Sat, 14 Sep 2002 14:56:56 +0200 akim
+++ bin/autoheader.in Sat, 28 Sep 2002 17:16:28 +0200 akim
@@ -168,6 +168,8 @@ sub parse_args ()
 # Source what the traces are trying to tell us.
 verbose "$me: running $autoconf to trace from $ARGV[0]";
 xsystem ("$autoconf "
+        # If you change this list, update the
+        # `Autoheader-preselections' section of autom4te.in.
         . " --trace AC_CONFIG_HEADERS:'\$\$config_h ||= \"\$1\";'"
         . " --trace AH_OUTPUT:'\$\$verbatim{\"\$1\"} = \"\\\n\$2\";'"
         . " --trace AC_DEFINE_TRACE_LITERAL:'\$\$symbol{\"\$1\"} = 1;'"
Index: bin/autoreconf.in
--- bin/autoreconf.in Fri, 27 Sep 2002 20:14:45 +0200 akim
+++ bin/autoreconf.in Sat, 28 Sep 2002 17:16:15 +0200 akim
@@ -301,6 +301,8 @@ sub autoreconf ($)
   my $traces = new Autom4te::XFile
     ("$autoconf"
      . join (' --trace=', '',
+            # If you change this list, update the
+            # `Autoreconf-preselections' section of autom4te.in.
             'AC_INIT', 'AM_GNU_GETTEXT', 'AC_PROG_LIBTOOL',
             'AC_CONFIG_HEADERS',
             'AC_CONFIG_SUBDIRS:AC_CONFIG_SUBDIRS:\$1')
Index: lib/autom4te.in
--- lib/autom4te.in Sat, 03 Aug 2002 15:01:59 +0200 akim
+++ lib/autom4te.in Sat, 28 Sep 2002 17:14:16 +0200 akim
@@ -35,11 +35,20 @@ end-language: "Autoheader-preselections"
 ## ------------------------ ##

 begin-language: "Automake-preselections"
+args: --preselect AC_CANONICAL_HOST
+args: --preselect AC_CANONICAL_SYSTEM
+args: --preselect AC_CONFIG_AUX_DIR
+args: --preselect AC_CONFIG_FILES
+args: --preselect AC_CONFIG_HEADERS
+args: --preselect AC_INIT
 args: --preselect AC_LIBSOURCE
 args: --preselect AC_SUBST
+args: --preselect AM_AUTOMAKE_VERSION
 args: --preselect AM_CONDITIONAL
-args: --preselect AC_LIBSOURCE
-args: --preselect AC_CONFIG_FILES
+args: --preselect AM_GNU_GETTEXT
+args: --preselect AM_INIT_AUTOMAKE
+args: --preselect AM_MAINTAINER_MODE
+args: --preselect AM_PROG_CC_C_O
 end-language: "Automake-preselections"


@@ -48,8 +57,10 @@ end-language: "Automake-preselections"
 ## -------------------------- ##

 begin-language: "Autoreconf-preselections"
+args: --preselect AC_CONFIG_HEADERS
+args: --preselect AC_CONFIG_SUBDIRS
+args: --preselect AC_INIT
 args: --preselect AC_PROG_LIBTOOL
-args: --preselect AM_PROG_LIBTOOL
 args: --preselect AM_GNU_GETTEXT
 end-language: "Autoreconf-preselections"

@@ -58,35 +69,57 @@ end-language: "Autoreconf-preselections"
 ## Autoscan-preselections.  ##
 ## ------------------------ ##

+# To update the following list:
+#
+#$ tests/autom4te -l autoconf -M -t AN_OUTPUT:\$3 |
+# sed 's/(.*//' |
+# sort -u |
+# grep -v '^warn' |
+# sed 's/^/args: --preselect /'
+#
+# and add AC_CHECK_LIB by hand.
+#
+# I'm a bit frightened to put this into the Makefile, which was
+# my goal: running autom4te to get this list requires autom4te.cfg,
+# which is what we are building :(  In fact we need three files, not
+# two (autom4te.pre -> autom4te.in -> autom4te.cfg).
 begin-language: "Autoscan-preselections"
 args: --preselect AC_CHECK_FUNCS
 args: --preselect AC_CHECK_HEADERS
 args: --preselect AC_CHECK_LIB
+args: --preselect AC_CHECK_MEMBERS
 args: --preselect AC_CHECK_TYPES
 args: --preselect AC_C_CONST
 args: --preselect AC_C_INLINE
+args: --preselect AC_C_VOLATILE
 args: --preselect AC_DECL_SYS_SIGLIST
 args: --preselect AC_FUNC_ALLOCA
 args: --preselect AC_FUNC_CHOWN
+args: --preselect AC_FUNC_CLOSEDIR_VOID
 args: --preselect AC_FUNC_ERROR_AT_LINE
-args: --preselect AC_FUNC_FNMATCH
 args: --preselect AC_FUNC_FORK
 args: --preselect AC_FUNC_FSEEKO
 args: --preselect AC_FUNC_GETGROUPS
 args: --preselect AC_FUNC_GETLOADAVG
+args: --preselect AC_FUNC_GETMNTENT
 args: --preselect AC_FUNC_GETPGRP
 args: --preselect AC_FUNC_LSTAT
+args: --preselect AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
 args: --preselect AC_FUNC_MALLOC
+args: --preselect AC_FUNC_MBRTOWC
 args: --preselect AC_FUNC_MEMCMP
 args: --preselect AC_FUNC_MKTIME
 args: --preselect AC_FUNC_MMAP
 args: --preselect AC_FUNC_OBSTACK
+args: --preselect AC_FUNC_REALLOC
+args: --preselect AC_FUNC_SELECT_ARGTYPES
 args: --preselect AC_FUNC_SETPGRP
 args: --preselect AC_FUNC_SETVBUF_REVERSED
 args: --preselect AC_FUNC_STAT
 args: --preselect AC_FUNC_STRCOLL
 args: --preselect AC_FUNC_STRERROR_R
 args: --preselect AC_FUNC_STRFTIME
+args: --preselect AC_FUNC_STRNLEN
 args: --preselect AC_FUNC_STRTOD
 args: --preselect AC_FUNC_UTIME_NULL
 args: --preselect AC_FUNC_VPRINTF
@@ -109,6 +142,7 @@ args: --preselect AC_PROG_LN_S
 args: --preselect AC_PROG_MAKE_SET
 args: --preselect AC_PROG_RANLIB
 args: --preselect AC_PROG_YACC
+args: --preselect AC_REPLACE_FNMATCH
 args: --preselect AC_STRUCT_ST_BLOCKS
 args: --preselect AC_STRUCT_TIMEZONE
 args: --preselect AC_STRUCT_TM
@@ -118,6 +152,7 @@ args: --preselect AC_TYPE_PID_T
 args: --preselect AC_TYPE_SIGNAL
 args: --preselect AC_TYPE_SIZE_T
 args: --preselect AC_TYPE_UID_T
+args: --preselect AM_GNU_GETTEXT
 end-language: "Autoscan-preselections"