From: Akim Demaille Date: Sat, 28 Sep 2002 16:39:22 +0000 (+0000) Subject: * lib/autom4te.in (Autoscan-preselections, Autoreconf-preselections) X-Git-Tag: AUTOCONF-2.54a~47 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8054f9034f4d51e22dd6aa720e27676aa33a23fd;p=thirdparty%2Fautoconf.git * lib/autom4te.in (Autoscan-preselections, Autoreconf-preselections) (Automake-preselections): Update. * bin/autoreconf.in, bin/autoheader.in: Comment changes. --- diff --git a/ChangeLog b/ChangeLog index e876503b3..2264b6437 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-09-28 Akim Demaille + + * lib/autom4te.in (Autoscan-preselections, Autoreconf-preselections) + (Automake-preselections): Update. + * bin/autoreconf.in, bin/autoheader.in: Comment changes. + 2002-09-28 Akim Demaille * lib/autoscan/autoscan.pre: Move all the remaining rules to... diff --git a/bin/autoheader.in b/bin/autoheader.in index 8f8bca127..03754f136 100644 --- a/bin/autoheader.in +++ b/bin/autoheader.in @@ -168,6 +168,8 @@ $autoconf .= ' --verbose' if $verbose; # 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;'" diff --git a/bin/autoreconf.in b/bin/autoreconf.in index 261becac1..515bd8aed 100644 --- a/bin/autoreconf.in +++ b/bin/autoreconf.in @@ -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') diff --git a/lib/autom4te.in b/lib/autom4te.in index 8543bdfff..2424e1224 100644 --- a/lib/autom4te.in +++ b/lib/autom4te.in @@ -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" diff --git a/man/autoheader.1 b/man/autoheader.1 index 756e46e8a..780da198a 100644 --- a/man/autoheader.1 +++ b/man/autoheader.1 @@ -1,11 +1,12 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.29. -.TH AUTOHEADER "1" "September 2002" "autoheader 2.54a" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.013. +.TH AUTOHEADER "1" "September 2002" "GNU Autoconf 2.54a" FSF .SH NAME -autoheader \- Create a template header for configure +autoheader \- manual page for autoheader 2.54a .SH SYNOPSIS .B autoheader [\fIOPTION\fR] ... [\fITEMPLATE-FILE\fR] .SH DESCRIPTION +.PP Create a template file of C `#define' statements for `configure' to use. To this end, scan TEMPLATE-FILE, or `configure.ac' if present, or else `configure.in'. @@ -50,12 +51,6 @@ prepend directory DIR to search path .TP \fB\-I\fR, \fB\-\-include\fR=\fIDIR\fR append directory DIR to search path -.SH AUTHOR -Written by Roland McGrath and Akim Demaille. -.PP -Copyright 2002 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. .SH "REPORTING BUGS" Report bugs to . .SH "SEE ALSO" @@ -81,3 +76,8 @@ programs are properly installed at your site, the command .B info autoheader .PP should give you access to the complete manual. +.PP +Copyright 2002 Free Software Foundation, Inc. +.br +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/man/autoreconf.1 b/man/autoreconf.1 index 219c93ddd..9f196efe3 100644 --- a/man/autoreconf.1 +++ b/man/autoreconf.1 @@ -1,11 +1,12 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.29. -.TH AUTORECONF "1" "September 2002" "autoreconf 2.54a" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.013. +.TH AUTORECONF "1" "September 2002" "GNU Autoconf 2.54a" FSF .SH NAME -autoreconf \- Update generated configuration files +autoreconf \- manual page for autoreconf 2.54a .SH SYNOPSIS .B autoreconf [\fIOPTION\fR] ... [\fICONFIGURE-AC or DIRECTORY\fR] ... .SH DESCRIPTION +.PP Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint' (formerly `gettextize'), and `libtoolize' where appropriate) repeatedly to remake the GNU Build System files in the DIRECTORIES or @@ -47,12 +48,6 @@ append directory DIR to search path .PP The environment variables AUTOCONF, AUTOHEADER, AUTOMAKE, ACLOCAL, AUTOPOINT, LIBTOOLIZE are honored. -.SH AUTHOR -Written by David J. MacKenzie and Akim Demaille. -.PP -Copyright 2002 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. .SH "REPORTING BUGS" Report bugs to . .SH "SEE ALSO" @@ -78,3 +73,8 @@ programs are properly installed at your site, the command .B info autoreconf .PP should give you access to the complete manual. +.PP +Copyright 2002 Free Software Foundation, Inc. +.br +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.