diff options
| author | Zack Weinberg <zackw@panix.com> | 2020-09-11 14:23:10 -0400 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2020-09-11 14:23:10 -0400 |
| commit | ab9ef6cf1825eded75153c556d933639314bde65 (patch) | |
| tree | 55bccf4679b88b8eaa2321b790dc491a39ffa63a /bin/aclocal.in | |
| parent | 74a413ff814a070dc9a5ca577ddd42099fad2605 (diff) | |
| download | automake-ab9ef6cf1825eded75153c556d933639314bde65.tar.gz | |
Sync ChannelDefs.pm from autoconf.
ChannelDefs.pm *ought* to be kept in sync between automake and autoconf,
because it defines the set of valid -W options, and autoreconf assumes
that it can pass arbitrary -W options to all of the tools it invokes.
However, it isn’t covered by either project’s ‘make fetch’ and it hasn’t
actually *been* in sync for more than 17 years.
This patch manually brings over all of the changes made on the autoconf side.
Most importantly, there is a new warnings channel ‘cross’, for warnings
related to cross-compilation. Also, the ‘usage’ function now *returns*
the text to be put into a usage message, instead of printing it itself.
(This is necessary on autoconf’s side.)
* lib/Automake/ChannelDefs.pm: Sync from autoconf.
(cross): New warnings channel.
(portability-recursive): Document.
(usage): Now returns the text to be printed, instead of printing it.
(parse_warnings): Second argument may now be a list.
Diffstat (limited to 'bin/aclocal.in')
| -rw-r--r-- | bin/aclocal.in | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/bin/aclocal.in b/bin/aclocal.in index c968bd710..1e734ea48 100644 --- a/bin/aclocal.in +++ b/bin/aclocal.in @@ -1048,15 +1048,11 @@ Options: --verbose don't be silent --version print version number, then exit -W, --warnings=CATEGORY report the warnings falling in CATEGORY +EOF -Warning categories include: - syntax dubious syntactic constructs (default) - unsupported unknown macros (default) - all all the warnings (default) - no-CATEGORY turn off warnings in CATEGORY - none turn off all the warnings - error treat warnings as errors + print Automake::ChannelDefs::usage (), "\n"; + print <<'EOF'; Report bugs to <@PACKAGE_BUGREPORT@>. GNU Automake home page: <@PACKAGE_URL@>. General help using GNU software: <https://www.gnu.org/gethelp/>. |