From: Peter Rosin Date: Mon, 16 Aug 2010 08:00:23 +0000 (+0200) Subject: Merge branch 'msvc' X-Git-Tag: v1.11b~553 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b76e39c947d9862f786dc0eeb86553f8944dbd9;hp=a89953333a36b8b8ebce393fe74034e4bfb739ab;p=platform%2Fupstream%2Fautomake.git Merge branch 'msvc' --- diff --git a/.gitignore b/.gitignore index 81e5a98..716ef8b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,9 @@ config.log config.status config.status.lineno configure.lineno +cscope.files +cscope.in.out +cscope.out +cscope.po.out tags TAGS diff --git a/ChangeLog b/ChangeLog index 0f90bd0..73123f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,292 @@ through to the wrapped archiver. * tests/ar-lib.test: Test the above. +2010-08-10 Stefano Lattarini + + Tweak and/or extend some `acloca*.test' tests. + * tests/aclocal8.test: Ensure verbose printing of captured + output. + * tests/aclocal.test: Likewise. Also, add trailing `:' + command. + * tests/acloca19.test: Likewise. + * tests/aclocal5.test: Add trailing `:' command, and prefer + `$me' over hard-coded test name. + * tests/aclocal6.test: Likewise. + * tests/aclocal18.test: Add trailing `:' command, and make + some grepping slighty stricter. + * tests/acloca14.test: Likewise. Also, prefer `diff' over + `cmp', and add some "cosmetic" blank lines. + +2010-08-09 Stefano Lattarini + + Tweak and extend tests `pr[!0-9]*.test'. + * tests/primary3.test: Add trailing `:' command. + * tests/primary.test: Make grepping of Automake's stderr stricter. + Also, add trailing `:' command, and cosmetic changes in spacing. + * tests/primary2.test: Likewise. + * tests/prefix.test: Enable `errexit' shell flags, and related + changes. Add a trailing `:' command. + * tests/proginst.test: Likewise. + + Modernize, improve and extend tests for PR (`pr[0-9]*.test'). + * tests/pr2.test: Add trailing `:' command. + * tests/pr229.test: Likewise. + * tests/pr401.test: Likewise. + * tests/pr401b.test: Likewise. + * tests/pr401c.test: Likewise. + * tests/pr300-prog.test: Likewise, plus cosmetic changes in + spacing. + * tests/pr300-lib.test: Likewise. + * tests/pr300-ltlib.test: Likewise, and ensure verbose printing + of captured make stdout. + * tests/pr211.test: Add trailing `:' command. Also, use the + `configure.in' stub created by ./defs, rather than writing it + from scratch. + * tests/pr204.test: Likewise, plus cosmetic spacing changes. + * tests/pr287.test: Likewise, and move setting of `errexit' shell + flag earlier in the script (just after inclusion of ./defs). + * tests/pr220.test: Make grepping of Automake's stderr stricter. + Also, add trailing `:' command, and cosmetic changes in spacing. + * tests/pr224.test: Move setting of `errexit' shell flag earlier + in the script (just after inclusion of ./defs). Do not export + `CC=gcc' to configure explicitly (it's already exported globally + in ./defs, since we have "gcc" in $required). Use the stub for + `configure.in' created by ./defs, rather than writing it from + scratch. Do not create dummy files required by "gnu" mode (e.g. + README, NEWS), since we run automake in foreign mode anyway. + * tests/pr72.test: Enable `errexit' shell flags, and related + changes. Extend existing checks a bit. + * tests/pr9.test: Likewise. Also, avoid obolescent constructs in + the generated `configure.in', and extend existing checks over the + generated tarball a bit. + * tests/pr87.test: Enable `errexit' shell flags, and related + changes. Add a trailing `:' command. Also, do not create dummy + files required by "gnu" mode (e.g. README, NEWS), since we run + automake in foreign mode anyway. + * tests/pr243.test: Avoid obolescent constructs in the generated + `configure.in'. Enable the `errexit' shell flag, and related + changes. Cosmetic changes to spacing, add trailing `:' command, + and add a "FIXME" comment. + * tests/pr266.test: Likewise, and add explicit command line switch + `--enable-dependecy-tracking' to the ./configure call. + * tests/pr279.test: Avoid obolescent constructs in the generated + `configure.in'; also, use the `configure.in' stub created by + ./defs, rather than writing it from scratch. Enable `errexit' + shell flag, and related changes. Add trailing `:' command. + * tests/pr279-2.test: Likewise, and make grepping of Makefile.in + stricter. + * tests/pr307.test: Move setting of `errexit' shell flag earlier + in the script (just after inclusion of ./defs). Escape literal + dots in grep regular expressions. Also, add a trailing `:' + command, and cosmetic changes to spacing. + + Tests for PR: add excerpts from original bug report, for clarity. + * tests/pr2.test: Ditto. + * tests/pr9.test: Likewise. + * tests/pr72.test: Likewise. + * tests/pr87.test: Likewise. + * tests/pr211.test: Likewise. + * tests/pr220.test: Likewise. + * tests/pr224.test: Likewise. + * tests/pr229.test: Likewise. + * tests/pr243.test: Likewise. + * tests/pr266.test: Likewise. + * tests/pr279.test: Likewise, and tell to keep it in sync + with its sister test. + * tests/pr279-2.test: Likewise. + +2010-08-08 Stefano Lattarini + + Tweak, extend and improve tests `cond[a-z]*.test'. + * tests/condd.test: Add trailing `:' command. Typofix in + comment. + * tests/condhook.test: Make sure target `install-data-hook' is + not called by `make install', but that data files are installed. + Use proper m4 quoting in configure.in. Add trailing `:' command. + * tests/condhook2.test: New test, sister test of condhook, with + inverted semantic. + * tests/condinc2.test: Use proper m4 quoting in configure.in. + Prefer trailing `:' command over trailing `Exit 0'. + * tests/condman2.test: Enable errexit shell flag, and related + changes. Add trailing `:' command. + * tests/condman.test: Likewise. Also, do not create useless + dummy manpages, and use proper m4 quoting in configure.in. + * tests/condman3.test: New test, similar to condman.test, but + it also runs ./configure and "make install", and check the + installed files. + * tests/Makefile.am (TESTS): Updated. + + Modernize, improve and/or extend tests `colon*.test. + * tests/colon.test: Rely on the `configure.in' stub created by + `./defs', rather than writing one from scratch. Do not create + a useless dummy file. Add trailing `:' command. + * tests/colon4.test: Enable the `errexit' shell flag, and + related changes. Rely on the `configure.in' stub created by + `./defs', rather than writing one from scratch. + * tests/colon7.test: Enable `errexit' shell flag, and related + changes. Improve the generated `configure.in' file. Add + trailing `:' command. + * tests/colon2.test: Likewise. Also, add some new checks. + * tests/colon5.test: Improve the generated `configure.in' file. + Add new, much deeper checks. Add trailing `:' command. + * tests/colon6.test: Likewise. + * tests/colon3.test: Add trailing `:' command. Remove useless + comments and echos. Improve the generated `configure.in' file. + make some grepping tests stricter. Add a "FIXME" comments about + planned improvements. + + Improve and extend tests `asm*.test'. + * tests/asm.test: Use configure.in stub generated by ./defs, + and avoid obsoleted autoconf constructs. Make grepping of + Automake stderr stricter. Do not create useless source file. + Improve verbose messages. Minor cosmetic changes. Tell to + keep it in sync with other sister tests asm*.test. + * tests/asm2.test: Likewise. + * tests/asm3.test: Likewise. + + Modernize, improve and/or extend test scripts `conf*.test'. + * tests/confh5.test: Cosmetic changes. + * tests/conff.test: Likewise. + * tests/confdeps.test: Likewise. + * tests/conflnk.test: Likewise. + * tests/conflnk2.test: Likewise. + * tests/confsub.test: Likewise. + * tests/confvar.test: Likewise, and make grepping of Makefile.in + stricter. + * tests/confvar2.test: Likewise. + * tests/conflnk3.test: Cosmetic changes, and re-enable a temporarly + disabled test (which didn't work with autoconf <= 2.59, but now we + are requiring autoconf 2.62, so...) + * tests/conflnk4.test: Cosmetic changes, and extend existing tests + accordingly to "TODO" comments. + * tests/conff2.test: Make grepping of Automake's stderr stricter. + Add some comments explaining why we don't use the `configure.in' + stub preset be ./defs. + * tests/confh.test: Use the `configure.in' stub created by ./defs, + rather than writing one from scratch, and do not call AC_OUTPUT. + Enable `errexit' shell flag, and related changes. Prefer diff over + cmp to compare text files. Prefer perl over sed to fetch the value + of $(DIST_COMMON) from Makefile.in. Make grepping of the contents + of $(DIST_COMMON) stricter. + * tests/confh4.test: Use the `configure.in' stub created by ./defs, + rather than writing one from scratch. Make grepping of Makefile.in + stricter. + * tests/confh5.test: Make grepping of `config.h' stricter. Add a + comment. + * tests/configure.test: Avoid obsolescent constructs in generated + `configure.ac'. Do not write `configure.in' two times. Escape + literal dots in grep regular expressions. + * tests/confincl.test: Enable `errexit' shell flag, and related + changes. Prefer fgrep over grep. Other cosmetic changes. + * tests/config.test: Renamed to ... + * tests/confh6.test: ... this. Fix m4 quoting in `configure.in', + and make grepping of `config.h' and `config.h.in' stricter. + * tests/conf2.test: Renamed ... + * tests/confh7.test: ... to this. Use the `configure.in' stub + created by ./defs, rather than writing one from scratch. Try to + run the checks both with and without AC_PROG_CC and AC_OUTPUT in + `configure.in'. + * tests/Makefile.am (TESTS): Updated. + + Minor improvements and fixes in tests `depcomp*.test'. + * tests/depcomp.test: Do not create useless dummy source files. + Add a trailing `:' command. + * tests/depcomp2.test: Use `unset' on the CFLAG variable to ensure + it's not in in the environment, rather tthan exporting it with an + empty value. Do not pass CC=gcc to configure, as that's already + done in ./defs since we have gcc in $required. Ensure verbose + printing of captured stderr, and normalize its checking. Add a + trailing `:' command. + * tests/depcomp3.test: Quote literal dots and dollar characters in + grep regexps. Always use `: >' rather than `touch' to create empty + files. Explicitly declare phony targets as such in the created + Makefile.am. Add a trailing `:' command. + * tests/depcomp4.test: Quote literal dots and dollar characters in + grep regexp. Explicitly declare phony targets as such in the + created Makefile.am. Ensure verbose printing of captured makes' + stoud/stderr. Add a trailing `:' command. + * tests/depcomp5.test: Move setting of `errexit' shell flag earlier + in the script (just after inclusion of ./defs). Quote literal dots + and dollar characters in grep regexps. Explicitly declare phony + targets as such in the created Makefile.am. Add a trailing `:' + command. + * tests/depcomp6.test: Consistenty use m4 quoting in the generated + configure.in. Cosmetic fixes to spacing. Make the "dummy" `if' + statement required by OpenBSD's sh `set -e' more robust, and add + explanatory comments to it. + * tests/depcomp7.test: Likewise, and add a trailing `:' command. + + Separate failing part of test `all.test'. + * tests/all.test: Keep only (x)failing part of the test. Working + checks moved out to ... + * tests/all2.test: ... this new test. + * tests/Makefile.am (TESTS): Updated. + + Modernize, improve and extend tests `subobj*.test'. + * tests/subobjname.test: Add trailing `:' command. + * tests/subobj.test: Make grepping of `Makefile.in' stricter. + Escape literal dots in grep regexps. + * tests/subobj2.test: Add trailing `:' command. Do not use the + unportable fgrep option `-e'. + * tests/subobj3.test: Add trailing `:' command. + (configure.in): Use proper m4 quoting, and avoid obsolescent + constructs. + * tests/subobj8.test: Likewise. Also, enable `errexit' shell + flag, with related changes + * tests/subobj4.test: Likewise. Also, make grepping of + `Makefile.in' stricter. + * tests/subobj5.test: Add trailing `:' command. Move setting of + `errexit' shell flag earlier in the script (just after inclusion + of ./defs). + (configure.in): Use the stub created by `./defs', rather than + writing it from scratch, and avoid obsolescent constructs. + * tests/subobj6.test: Add trailing `:' command. Move setting of + `errexit' shell flag earlier in the script (just after inclusion + of ./defs). Do not create useless dummy ac-init file `f'. + * tests/subobj7.test: Do not create useless dummy ac-init file + `f'. + (configure.in): Use the stub created by `./defs', rather than + writing it from scratch, and avoid obsolescent constructs. + * tests/subobj9.test: Move setting of `errexit' shell flag earlier + in the script (just after inclusion of ./defs). Fail the test if + `make distcheck' fails. Ensure verbose printing of captured make + stdout. Avoid uselsss fork by doing simple grep instead of using + test -n "`COMMAND | grep ...`". + (configure.in): Normalize the call to AC_INIT w.r.t. other tests. + (Makefile.am): Explicitly mark target "print" as phony. + * tests/subobj10.test: Removed duplicated call to `set -e'. Add + trailing `:' command. + (configure.in): Normalize the call to AC_INIT w.r.t. other tests. + + Remove a couple of obsoleted tests. + * tests/fpinstall.test: Removed. + * tests/fpinst2.test: Likewise. + * tests/Makefile.am (TESTS): Updated. + + Bootstrap: updated HACKING entry. + * HACKING ("Working with git"): Explain how to override the + autoconf and autom4te programs used by the bootstrap process. + + Bootstrap: fixlet. + * bootstrap: Do not remove `lib/Automake/Config.pm' anymore, + since we don't generate it. Correctly quote arguments of + `eval' builtin. Fixed a botched error message. Removed an + extra blank line. + + Bootstrap: don't search perl in $PATH. + * bootstrap: Do not explicitly search perl in $PATH anymore. + ($PATH_SEPARATOR): Removed, it's no more needed. + + Bootstrap: let the user choose which autoconf to use. + * bootstrap ($AUTOCONF): New variable, from the environment. + ($AUTOM4TE): Likewise, for clarity. + Use "$AUTOCONF" instead of calling "autoconf" directly. + + Minor improvements to tests ar*.test. + * tests/ar.test: Add trailing `:' command. + * tests/ar2.test: Likewise, and make grepping of generated + Makefile.in stricter. + 2010-08-06 Peter Rosin Add new auxiliary 'ar-lib' script, wrapping Microsoft lib. @@ -34,6 +320,29 @@ * lib/compile (func_file_conv): Use `!' not `^' for pattern negation. +2010-08-08 Ralf Wildenhues + + Fix maintainer-check failure. + * tests/cond5.test: Quote sleep argument, this isn't about + time stamp differences. + + Sync auxiliary files from upstream. + * lib/config.guess, lib/config.sub, lib/texinfo.tex: + Sync from upstream. + +2010-08-06 Stefano Lattarini + + Work around a nasty bug (segfault) of Solaris make. + * lib/am/check.am (recheck, recheck-html): Trim trailing spaces + from $list, to avoid triggering a nasty bug (potential segfault) + on Solaris make. + +2010-08-06 Peter Rosin + + Make cond5.test more robust on MSYS. + * tests/cond5.test: Add delay before the first kill attempt to + cater for problems with MSYS bash. + 2010-08-01 Peter Rosin Wrap some MSVC options in the compile script. @@ -152,7 +461,7 @@ the background automake process, but poll it every 10 seconds for at most 30 times (this makes the test both faster on good machines, and more resilient to spurious timeout-due failures when in low - priority or on havily-loaded systems). + priority or on heavily-loaded systems). Check also that automake writes the expected error messages on the standard error. Enable `errexit' flag, and related changes. @@ -291,6 +600,8 @@ * tests/ext.test: Add a comment explaining why an apparently useless `if' statement is indeed required. +2010-06-13 Stefano Lattarini + Add useful comment in test script obsolete.test. * tests/obsolte.test: Add a comment explaining why we need an indirection in adding $AUTOUPDATE to $required. @@ -299,6 +610,15 @@ * tests/Makefile.am (TESTS): Use only spaces, not tabs, in the definition of this variable. + Parallel tests generation: improve comments (tiny change). + * tests/Makefile.am ($(parallel_tests)): Added useful comment to + generated tests. + + Tests defs: truly get rid of `$am_defs_included' (unused variable) + * tests/defs.in ($am_defs_included): Remove, its now unused. It + should have been removed in a previous changeset, but the removal + was done only partially (oversight). + 2010-06-12 Ralf Wildenhues Remove a couple of unneeded conditionals from tests. @@ -358,6 +678,13 @@ * tests/pluseq9.test: Slighty extended w.r.t. the grepping of Automake stderr. Some unrelated cosmetic changes. +2010-06-12 Stefano Lattarini + + cscope.test: ensure verbose printing of captured stderr. + * tests/cscope.test: Print captured stderr before failing. + +2010-06-12 Stefano Lattarini + Testsuite: ensure verbose printing of captured stderr. * tests/acloca18.test: Print captured stderr before either failing or grepping it. Be sure to send captured stderr to stderr, not to @@ -472,6 +799,19 @@ Enable `errexit' shell flag. 2010-06-08 Stefano Lattarini + Ralf Wildenhues + + Fix error in generation of parallel tests. + * tests/defs.in ($am_skip_defs): New variable, to be used when + ./defs must be sourced multiple times. If set, unset it and + only define $srcdir; otherwise, also go through the rest of + the script. + ($am_defs_included): Remove, no more needed. + * tests/Makefile.am ($(parallel_tests)): Update accordingly, + using only $srcdir from defs. + Fixes potential test failures of tests that use $required. + +2010-06-08 Stefano Lattarini Enable `errexit' shell flag in some test scripts. * tests/subcond.test: Enabled `errexit' shell flag, and related @@ -494,6 +834,33 @@ * tests/version2.test: Likewise, and avoid deprecated constructs in the generated `configure.in'. +2010-06-07 Stefano Lattarini + Ralf Wildenhues + + Improve declaration of dependencies in the testsuite. + * tests/Makefile.am (check_SCRIPTS): Remove. Instead, let ... + ($(TEST_LOGS)): ... all test logs depend on the scripts. + * test/gen-parallel-tests: For each parallel test foo-p.test, + let `foo-p.log' also depend on `foo.test', since it is sourced. + +2010-06-06 Ralf Wildenhues + + Coverage for TAGS_DEPENDENCIES warning. + * tests/tags2.test: New test. + * tests/Makefile.am: Update. + + Coverage for use of anachronistic variables. + * tests/oldvars.test: New test. + * tests/Makefile.am: Update. + + Testsuite coverage for bogus macro file serial numbers. + * tests/acloca18.test: Also test ill-formed serial numbers + and serial numbers after macro definitions. + + Coverage for aclocal diagnosing underquoted macros. + * tests/acloca23.test: New test. + * tests/Makefile.am: Update. + 2010-06-06 Ralf Wildenhues Prefer AUTOMAKE_fails over `$AUTOMAKE | grep' in tests. @@ -502,6 +869,30 @@ * tests/mdate.test: Likewise. Prompted by Stefano Lattarini's change to discover.test. +2010-06-06 Ralf Wildenhues + + More minor message fixes. + * aclocal.in (scan_file): Fix recommended info command line. + * automake.in (handle_lib_objects): No need to prepend function + name to prog_error message. + (handle_tags): Add missing word and missing space in error + message. + (handle_dist): Add missing closing single quote in message. + Line-wrap one long message for readability. + +2010-06-06 Stefano Lattarini + Ralf Wildenhues + + Fix distcheck failure with distributed generated parallel tests. + * tests/Makefile.am ($(parallel_tests)): Cope with $(srcdir) + being different from the value at developer `make dist' time. + * tests/defs.in: Protect against mutiple inclusion, by using ... + ($am_defs_included): ... this new variable. + ($srcdir): Do not compute, but simply define to `@abs_srcdir@' + as substituted by configure. + Report, suggestions and first fix by Ralf Wildenhues, final + patch by Stefano Lattarini. + 2010-06-06 Stefano Lattarini Improve tests link*.test (enable `errexit' shell flag). @@ -609,6 +1000,10 @@ 2010-06-06 Stefano Lattarini + Tiny fix in silent8.test (display output of `make' command). + * tests/silent8.test: Make sure that the captured output of `make' + command is always displayed. + Make tests on user extensibility of silent-rules mode stricter. * tests/silent6.test: Made stricter w.r.t. the grepping of the output produced by `make'. @@ -658,28 +1053,6 @@ * tests/silent5.test: Likewise. * tests/silent9.test: Likewise. -2010-01-24 Ralf Wildenhues - - Fix silent-rules output for disabled dependency tracking. - * lib/am/depend2.am [!%FASTDEP%]: Rework silent-rules variable - expansion code to also work in the case where %AMDEP% expands - to FALSE at config.status time, using new substitution string - %VERBOSE-NODEP%. - * automake.in (verbose_nodep_flag): New function, appending - `@am__nodep@' to the verbose-variable name. - (handle_languages): If dependencies are not disabled, use it to - set %VERBOSE-NODEP%. - * m4/depend.m4: Substitute am__nodep as '_no', so the second - verbose-variable will always expand to an empty string, if - dependencies are enabled. - * tests/silent5.test: Also test --disable-dependency-tracking; - also test per-target flags for non-C language files. - * tests/silent9.test: New test, like silent4.test but disable - dependency tracking. - * tests/Makefile.am: Adjust. - * NEWS, THANKS: Update. - Report by Dmitry V. Levin . - 2010-05-23 Stefano Lattarini Extend test on `nostdinc' automake option. @@ -710,6 +1083,14 @@ 2010-05-23 Ralf Wildenhues + Fix truncated comment in Makefile.am. + * Makefile.am (sc_tests_logs_duplicate_prefixes): Fix unfinished + sentence in comment. + Report by Stefano Lattarini. + + Relax silent8.test for NetBSD make. + * tests/silent8.test: Accept ./foo.info in output as well. + Fix unportable sed script in maintainer-check test. * Makefile.am (sc_tests_Exit_not_exit): Rewrite sed script to not contain semicolon after 'b' or brace commands, for NetBSD. @@ -737,6 +1118,45 @@ 2010-04-25 Ralf Wildenhues + Warning and error message formatting cleanups. + * aclocal.in (parse_arguments, main): Remove trailing period or + newline in error or warning messages, avoid capitalization of + the first word of a message. + * automake.in (check_user_variables, handle_languages) + (handle_ltlibraries, scan_aclocal_m4, scan_autoconf_config_files) + (scan_autoconf_files, cond_stack_if, require_file_internal) + (usage, generate_makefile, parse_arguments): Likewise. + * lib/Automake/ChannelDefs.pm (set_strictness): Likewise. + * lib/Automake/Configure_ac.pm (find_configure_ac): Likewise. + * lib/Automake/Options.pm (set_strictness): Likewise. + * lib/Automake/Rule.pm (define): Likewise. + * lib/Automake/Variable.pm (define, variables_dump): Likewise. + * tests/ltinstloc.test, tests/suffix11.test: Adjust expected + error message. + * lib/Automake/Channels.pm (setup_channel): Reword error message + to be the same as in msg. + + Fix placing of ellipses in English text and synopses. + * Makefile.am: Be sure to add a space before `...' in natural + language text. + * automake.in (scan_autoconf_traces): Likewise. + * lib/Automake/Rule.pm (define): Likewise. + * lib/Automake/Variable.pm (define): Likewise. + * lib/am/dejagnu.am: Likewise. + * lib/am/progs.am: Likewise. + * lib/gnupload (dprint, upload): Likewise. + * tests/confdeps.test: Likewise. + * tests/location.test: Adjust expected output. + * automake.in (usage): In synopsis, use singular for OPTION, + * remove space before ellipsis. + * aclocal.in (usage): Likewise. Also, fix indentation. + + Fix more duplicate message prefixes. + * lib/Automake/XFile.pm (seek): Do not prepend $me. + ($me): Remove now-unused package-global. + * aclocal.in (check_acinclude): Remove duplicate 'warning: ' + prefix. + Fix typo in manual. * doc/automake.texi (Simple Tests using parallel-tests): Add missing closing parenthesis. @@ -745,7 +1165,7 @@ * automake.in (read_main_am_file): Call variables_dump, not macros_dump. Print actual error before list of variables. -2010-04-25 Stefano Lattarini +2010-04-22 Stefano Lattarini Minor improvements in comments of test `silent3.test'. * tests/silent3.test: Tell to keep it in sync with `silent9.test' @@ -820,6 +1240,57 @@ 2010-04-11 Ralf Wildenhues + Print 'warnings are treated as errors' note if needed. + * lib/Automake/Channels.pm: Fix typo in comment. + (_print_message): If -Werror is enabled, print a 'warnings are + treated as errors' note before the first such warning. + * tests/warnopts.test: Adjust comment to mention expected warning. + Adjust code to ignore 'warnings are treated as errors' note. + * tests/location.test: Adjust expected output with -Werror. + * tests/werror4.test: New test. + * tests/Makefile.am: Update. + * NEWS: Update. + + Ensure we don't print 'warning:' or 'error:' twice. + * Makefile.am (sc_ensure_testsuite_has_run): New helper rule. + (sc_tests_logs_duplicate_prefixes): New rule, to check for + wrong-looking warning and error messages in the test suite logs. + * aclocal.in (scan_configure_dep, scan_file): Remove duplicate + `warning: ' prefix. + * tests/vars3.test: Rename variable to avoid false positive. + + Prepend type to warning, error, and fatal messages. + For the first part of messages of types `error' or `fatal', + prepend `error: ' to the message. Prepend `warning: ' to + warning messages, whatever the setting of -Werror. + * lib/Automake/Channels.pm (partial): Move up definition. + (_format_message): Emit `header' and `footer' strings only with + the first resp. last part of a set of partial messages. + * lib/Automake/ChannelDefs.pm: Add missing '1;' statement at the + end of the module. + (Automake::ChannelDefs): Setup warning channels with header + `warning: ', error and fatal messages with header `error: '. + * tests/condinc2.test, tests/ltinstloc.test: Adjust expected + error messages. + * tests/comment5.test: Likewise. Also, include stack notes + should not start with `error:'. + * tests/location.test: Likewise. Also, try both -Werror and + -Wno-error. + * NEWS: Update. + Report by Bruno Haible. + + Fix capitalization of error messages, reword one message. + * lib/Automake/Variable.pm (define): Do not capitalize the first + word in the error message. + * automake.in (require_file_internal): Likewise. Also, reword + and line-wrap for better readability. + * tests/distcom7.test, tests/pluseq5.test, tests/pluseq9.test: + Adjust tests. + + Fix connected warnings about obsolete exeext override. + * lib/Automake/Rule.pm (define): Merge two warnings that belong + together, by setting the 'partial' flag for the first one. + Fix per-Makefile.am setting of -Werror. Before this patch, 'AUTOMAKE_OPTIONS = -Werror' in one Makefile.am would carry over to other Makefile.am files @@ -855,6 +1326,24 @@ * NEWS, THANKS: Update. Report by Pavel Sanda. +2010-04-11 Stefano Lattarini + + Avoid possible false negatives in cond46.test. + * tests/cond46.test: Enable shell `errexit' flag (and bumped + copyright years). Due to this change, the testcase should now + fail on unexpected failures in calls to $ACLOCAL/$AUTOMAKE (whose + outcomes were previously unchecked), and on failures in grepping + the expected diagnostic in Automake stderr. + +2010-04-04 Stefano Lattarini + + Generated tests are now just a thin layer around other tests. + * tests/Makefile.am: Rewrite the rule to generate the `*-p.test' + test scripts so that any of them simply includes the corresponding + `*.test' script (after setting `$parallel_tests' to `yes'). + * tests/.gitignore: Add wildcard for temporary files used in the + generation of `*-p.test' tests. + 2010-03-30 Stefano Lattarini Avoid an unportable use of `$status' shell variable. @@ -936,6 +1425,30 @@ * tests/parallel-tests6.test: Likewise. * tests/parallel-tests7.test: Likewise. +2010-03-01 Ralf Wildenhues + + Fix cscope test on systems without working Fortran compiler. + * tests/cscope.test: Skip remainder of test if `$MAKE all' fails. + * THANKS: Update. + Report by Peter Johansson. + +2010-02-24 Antonio Diaz Diaz (tiny change) + Ralf Wildenhues + + Add lzip compression support. + * automake.in (handle_dist): Recognize dist-lzip. + (make_paragraphs): Map LZIP to dist-lzip. + * doc/automake.texi (Dist): Add dist-lzip. + (Options): Likewise. + * lib/Automake/Options.pm (_process_option_list): Add dist-lzip. + * lib/am/distdir.am + (dist dist-all): Add command to create an lzip-compressed tarball. + (distcheck): Handle lzip-compressed tarballs just like the others. + * tests/defs.in: Test for lzip, too. + * tests/lzip.test: New file, based on nogzip.test. + * tests/Makefile.am (TESTS): Add lzip.test. + * NEWS: Update. + 2010-02-22 Karl Berry Improve help message of mdate-sh. @@ -992,6 +1505,28 @@ Fix some typos in the manual * doc/automake.texi (Nested Packages, Rebuilding): Fix typos. +2010-01-24 Ralf Wildenhues + + Fix silent-rules output for disabled dependency tracking. + * lib/am/depend2.am [!%FASTDEP%]: Rework silent-rules variable + expansion code to also work in the case where %AMDEP% expands + to FALSE at config.status time, using new substitution string + %VERBOSE-NODEP%. + * automake.in (verbose_nodep_flag): New function, appending + `@am__nodep@' to the verbose-variable name. + (handle_languages): If dependencies are not disabled, use it to + set %VERBOSE-NODEP%. + * m4/depend.m4: Substitute am__nodep as '_no', so the second + verbose-variable will always expand to an empty string, if + dependencies are enabled. + * tests/silent5.test: Also test --disable-dependency-tracking; + also test per-target flags for non-C language files. + * tests/silent9.test: New test, like silent4.test but disable + dependency tracking. + * tests/Makefile.am: Adjust. + * NEWS, THANKS: Update. + Report by Dmitry V. Levin . + 2010-01-17 Stefano Lattarini Slighty improve tests acoutbs.test and acoutbs2.test. diff --git a/ChangeLog.09 b/ChangeLog.09 index 063c06b..7b07c36 100644 --- a/ChangeLog.09 +++ b/ChangeLog.09 @@ -33,6 +33,10 @@ * lib/gnupload: Mention ncftpput in `--help' output. Report by Bruce Korb. +2009-12-06 Ralf Wildenhues + + * NEWS: Update. + 2009-12-05 Antonio Diaz Diaz Replace unlzma, gunzip, bunzip2 with pack tool -d invocation. @@ -63,6 +67,24 @@ current directory. Use it instead of `pwd` command substitution, to avoid Heirloom/Solaris Sh bug with `set -e'. +2009-12-05 Ralf Wildenhues + + Fix requirements of silent8.test. + * tests/silent8.test: Require makeinfo --html, tex, texi2dvi -o, + dvips. + +2009-12-04 Stefano Lattarini + + File `automake.in' is not meant to be executed (only to be + preprocessed into `automake'), so don't leave it executable. + * automake.in: Remove executable bit. + +2009-12-04 Stefano Lattarini + + Don't make the generated Automake's Config.pm executable. + * lib/Automake/Makefile.am (Config.pm): Don't make the generated + `Config.pm' file executable. + 2009-11-28 Jim Meyering do not put world-writable directories in distribution tarballs @@ -89,6 +111,37 @@ * Makefile.am (EXTRA_DIST): Add bootstrap. Report by Jan Engelhardt. +2009-11-14 Ralf Wildenhues + + Coverage for corner cases in derive_suffix. + Ensure unrelatex SUFFIXES entries and unrelated inference rules + are ignored silently. + * tests/ext3.test: New test. + * tests/Makefile.am: Update. + + Coverage for user-provided _LINK variables. + * tests/link_override.test: New test. + * tests/Makefile.am: Adjust. + + Coverage: warn about substitutions that need EXTRA_PRIMARY. + * tests/extra9.test: New test. + * tests/Makefile.am: Adjust. + + Coverage: warn about configure substitution in EXTRA_PRIMARY. + * tests/subst5.test: New test. + * tests/Makefile.am: Update. + + Coverage for syntax errors with conditionals in included fragments. + * tests/condinc2.test: Amend test. + + Coverage: diagnose variables with forbidden dist_ prefix. + * tests/candist.test: New test. + * tests/Makefile.am: Update. + + Coverage for conditional `else' and `endif' arguments. + * tests/cond46.test: New test. + * tests/Makefile.am: Update. + 2009-10-31 Jim Meyering Ralf Wildenhues @@ -102,8 +155,122 @@ * tests/subdir10.test: New test. * tests/Makefile.am: Update. +2009-10-18 Ralf Wildenhues + + Simplify Variable::_check_ambiguous_condition. + * lib/Automake/Variable.pm (_check_ambiguous_condition): No need + to check for $def since ambiguous_p returns an empty $message if + there is no other condition which is ambiguous to $cond. + + Coverage for DisjConditions.pm. + * lib/Automake/tests/DisjConditions.pl (test_basics): Increase + test coverage: test ->human, ->merge, ->simplify, ->multiply. + * lib/Automake/tests/DisjConditions-t.pl (test_basics): Likewise + changes, but including state copies across thread creation. + * lib/Automake/tests/DisjCon2.pl: New test. + * lib/Automake/tests/DisjCon3.pl: Likewise. + * lib/Automake/tests/Makefile.am (TESTS, XFAIL_TESTS): Adjust. + + Coverage and fixes for Condition.pm. + * lib/Automake/Condition.pm (new): Catch common programming + errors better by checking type of passed argument before + munging them to all be strings through split. + * lib/Automake/tests/Condition.pl (test_basics): Also test + ->human. + (test_merge): New function, test ->merge, ->merge_conds, + ->strip. + * lib/Automake/tests/Condition-t.pl (test_basics, test_merge): + Likewise changes, but including state copies across thread + creation. + * lib/Automake/tests/Cond2.pl: New test for programming error. + * lib/Automake/tests/Cond3.pl: Likewise. + * lib/Automake/tests/Makefile.am (TESTS, XFAIL_TESTS): Update. + + Coverage for Wrap.pm. + * lib/Automake/tests/Wrap.pl (@tests): Add test for word with + trailing space. + (test_makefile_wrap, @makefile_tests): New function, new list of + tests, to test makefile_wrap. + + Coverage for Version.pm. + * lib/Automake/tests/Version.pl (test_version_compare): Also + try Automake::Version::check for the version pairs, taking into + account the special-case naming of code forks. + (@tests): Add more test cases. + (test_bad_versions, @bad_versions): New function, new test cases, + to ensure bad version strings are rejected. + * lib/Automake/tests/Version2.pl: New test. + * lib/Automake/tests/Version3.pl: Likewise. + * lib/Automake/tests/Makefile.am (TESTS): Add tests here ... + (XFAIL_TESTS): ... and here, new. + + Pod coverage for Perl modules. + * lib/Automake/ChannelDefs.pm (parse_warnings): Fix + typo in Pod documentation. + * lib/Automake/Condition.pm: Add a couple of missing `=back' + lines. + (_has): Renamed from ... + (has): ... this, as this is an internal method. + (strip, false, true_when): Adjust callers. + * lib/Automake/Configure_ac.pm: Add Pod `Functions' section with + documentation for find_configure_ac and require_configure_ac. + * lib/Automake/Location.pm: Fix typo in Pod. Add `Methods' + section, document methods. + * lib/Automake/RuleDef.pm: New `Methods' Pod section. + * lib/Automake/VarDef.pm: Document `raw_value'. + * lib/Automake/Wrap.pm (_tab_length): Rename from ... + (tab_length): ... this, as this is an internal method. + (wrap): Adjust callers. + * lib/Automake/XFile.pm: Reorganize Pod a bit, add `Methods' + section. + 2009-10-17 Ralf Wildenhues + Perl coverage support using Devel::Cover. + This introduces makefile rules to run the testsuite with Perl + coverage enabled. It skips tests that use perl ithreads, by + unsetting AUTOMAKE_JOBS and setting WANT_NO_THREADS to make the + threaded tests skip. + * Makefile.am (PERL_COVERAGE_DB, PERL_COVERAGE_FLAGS) + (PERL_COVER): New variables. + (check-coverage, recheck-coverage, clean-coverage): New phony + targets. + (check-coverage-run, recheck-coverage-run): New phony helper + targets. + (clean-local): New, depend on clean-coverage. + * lib/Automake/tests/Condition-t.pl: Skip if WANT_NO_THREADS is + set. + * lib/Automake/tests/DisjConditions-t.pl: Likewise. + * tests/defs.in: New required entry 'perl-threads'. + * tests/parallel-am.test: Use it to skip if WANT_NO_THREADS is + set. + * tests/parallel-am2.test: Likewise. + * tests/parallel-am3.test: Likewise. + + Add convenience `recheck' target to our toplevel Makefile.am. + * Makefile.am (recheck): New convenience target. + * tests/README: Give examples for running only failed or + outdated or otherwise selected tests. + + dist: allow running several compressors in parallel. + * lib/am/distdir.am (am__post_remove_distdir): New internal + variable. + (DIST_TARGETS): New variable, set to list of chosen distribution + formats. Order formats by expected duration, slowest first, for + better parallelism. + (dist-gzip, dist-bzip2, dist-lzma, dist-xz, dist-tarZ) + (dist-shar, dist-zip): Use $(am__post_remove_distdir). + (dist, dist-all): Do not depend on distdir. Instead of + replicating each compression command, use a recursive invocation + to allow running all $(DIST_TARGETS) in parallel. + * NEWS: Update. + Report by Peter Breitenlohner. + + Fix license headers of cscope tests to be GPLv2+. + * tests/cscope.test: Revert to GPL version 2. + * tests/cscope2.test: Likewise. + * tests/cscope3.test: Likewise. + Sync auxiliary files from upstream. * INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub, lib/texinfo.tex: Sync from upstream. @@ -197,6 +364,77 @@ `--no-function-argzero', since the latter does not work with versions 3.x of Zsh. +2009-09-26 Ralf Wildenhues + + Fixups and tests for cscope functionality. + It seems cscope is not able to take into account relative + file names of included cscope.files files, but it is able to + canonicalize file names containing '../' sequences. + This patch makes the cscope references relative again, and + fixes some corner cases. + * NEWS: Reword a bit. + * THANKS: Update. + * automake.in (handle_tags): Use $(am__cd). Provide default + empty rule for the `cscope' target, for empty sources. + * lib/am/tags.am (cscopelist): Construct relative path to files + in $(srcdir) if $(srcdir) is relative. + [TOPDIR_P] (cscope): Do not depend on cscope-clean. Only invoke + $(CSCOPE) if cscope.files is nonemtpy. + (clean-cscope): Rename from ... + (cscopeclean): ... this. + (cscope.files): Depend on clean-cscope. + (distclean-tags) [!TOPDIR_P]: No need to remove cscope files + here. + * tests/cscope.test, tests/cscope2.test, tests/cscope3.test: New + tests. + * tests/Makefile.am: Adjust. + +2009-09-25 Debarshi Ray + + New target to generate cscope database. + * automake.in (handle_tags): Handle cscope. + * doc/automake.texi (Tags): Document cscope. + * lib/am/tags.am (CSCOPE): New macro. + [TOPDIR_P] (AM_RECURSIVE_TARGETS): Add cscope. + (cscope): New target. + (cscopeclean): Likewise. + (cscope.files): Likewise. + (cscopelist): Likewise. + (distclean-tags): Remove `cscope.out', `cscope.in.out', + `cscope.po.out' and `cscope.files'. + * NEWS: Update. + Based upon earlier patch from Jesse Barnes. + +2009-09-25 Ralf Wildenhues + + Use silent-rules for building the Automake package. + * configure.ac (AM_INIT_AUTOMAKE): Add silent-rules option. + * Makefile.am (automake, aclocal, INSTALL): Add silencing + variables to recipe. + * doc/Makefile.am (update_mans, $(srcdir)/aclocal.1) + ($(srcdir)/automake.1, $(srcdir)/amhello-1.0.tar.gz): Likewise. + * lib/Automake/Makefile.am (Config.pm): Likewise. + * tests/Makefile.am ($(srcdir)/parallel-tests.am) + ($(parallel_tests), defs-p): Likewise. + +2009-09-25 Jack Kelly + + Add silent rules support for texinfo outputs. + * automake.in (define_verbose_texinfo): Define several new verbose + tagvars and verbose vars. + (define_verbose_tagvar): Increase spacing to 8 to accommodate + MAKEINFO, TEXI2DVI, TEXI2PDF. + (handle_texinfo): Additional substitution for silencing dvips. + (output_texinfo_build_rules): Additional substitutions for + silencing texi2dvi and texi2pdf. + * lib/am/texibuild.am: Add silencing to makeinfo, makeinfo --html, + texi2dvi and texi2pdf rules. + * lib/am/texinfos.am: Add silencing to .dvi.ps rule. + * tests/Makefile.am: Add silent8.test. + * tests/silent8.test: New test: tests that silent texinfo rules + produce quiet messages. + * NEWS: Update. + 2009-09-18 Peter Johansson (tiny change) Fix link to "Recursive Make Considered Harmful" paper. @@ -351,6 +589,11 @@ 2009-05-17 Ralf Wildenhues + Post-release version bump. + * configure.ac, NEWS: Bump version to 1.11a. + +2009-05-17 Ralf Wildenhues + Automake 1.11. * configure.ac: Bump version to 1.11. * doc/automake.texi (Releases): Add line for 1.11. Remove line diff --git a/HACKING b/HACKING index f25a0e0..34f2b39 100644 --- a/HACKING +++ b/HACKING @@ -7,7 +7,6 @@ * Don't put this file into the distribution. Don't mention it in the ChangeLog. - ================================================================ = Administrivia @@ -33,8 +32,8 @@ texinfo.tex (bug-texinfo@gnu.org), Most of them are updated before release with `make fetch'. -* Changes other than bug fixes must be mentioned in NEWS - +* Changes other than bug fixes must be mentioned in NEWS. Important + bug fixes should be mentioned in NES, too. ================================================================ = Naming @@ -60,7 +59,7 @@ * Use `##' comments liberally. Comment anything even remotely unusual. -* Never use basename or dirname. Instead use sed +* Never use basename or dirname. Instead use sed. * Do not use `cd' within back-quotes, use `$(am__cd)' instead. Otherwise the directory name may be printed, depending on CDPATH. @@ -73,7 +72,6 @@ "important" command it runs. The printed commands should be preceded by a single space. - ================================================================ = Editing automake.in and aclocal.in @@ -90,7 +88,6 @@ * Perl 5 is now OK. - ================================================================ = Working with git @@ -99,7 +96,12 @@ tree, so the resulting files (aclocal.m4 and Makefile.in) should be the same as you would get if you install this version of automake and use it to generate those files. Be sure to have the - latest stable version of Autoconf installed. + latest stable version of Autoconf installed. If such version is + not installed as "autoconf", pass it explicitly (along with the + accompanying "autom4te") when calling `bootstrap' and `configure'. + For example: + $ AUTOCONF=autoconf2.65 AUTOM4TE=autom4te2.65 ./bootstrap + $ ./configure AUTOCONF=autoconf2.65 AUTOM4TE=autom4te2.65 * Dependent files aclocal.m4, configure and Makefile.in in all directories should be up to date in the git repository, so that @@ -164,13 +166,18 @@ ================================================================ = Test suite -* Use "make check" and "make maintainer-check" liberally +* Use "make check" and "make maintainer-check" liberally. -* Make sure each test file is executable +* Make sure each test file is executable. * Use `keep_testdirs=yes' to keep test directories for successful tests also. +* Use perl coverage information to ensure your new code is thoroughly + tested by your new tests. + +* See file `tests/README' for more information. + ================================================================ = Release procedure diff --git a/Makefile.am b/Makefile.am index 3aead75..3dd2a18 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,17 +86,34 @@ do_subst = sed \ automake: automake.in aclocal: aclocal.in automake aclocal: Makefile - rm -f $@ $@.tmp - $(do_subst) $(srcdir)/$@.in >$@.tmp - chmod +x $@.tmp - chmod a-w $@.tmp - mv -f $@.tmp $@ + $(AM_V_GEN)rm -f $@ $@.tmp + $(AM_V_at)$(do_subst) $(srcdir)/$@.in >$@.tmp + $(AM_V_at)chmod +x $@.tmp + $(AM_V_at)chmod a-w $@.tmp + $(AM_V_at)mv -f $@.tmp $@ ## The master location for INSTALL is lib/INSTALL. ## This is where `make fetch' will install new versions. ## Make sure we also update this copy. INSTALL: lib/INSTALL - cp $(srcdir)/lib/INSTALL $@ + $(AM_V_GEN)cp $(srcdir)/lib/INSTALL $@ + +## recheck: convenience proxy target for the test suites. +TEST_SUBDIRS = lib/Automake/tests tests + +.PHONY: recheck +recheck: + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + for subdir in $(TEST_SUBDIRS); do \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@) || eval $$failcom; \ + done; \ + test -z "$$fail" ################################################################ ## @@ -108,6 +125,41 @@ INSTALL: lib/INSTALL dist-hook: cd $(distdir)/tests && chmod a+rx *.test + +# Perl coverage statistics. +PERL_COVERAGE_DB = $(abs_top_builddir)/cover_db +PERL_COVERAGE_FLAGS = -MDevel::Cover=-db,$(PERL_COVERAGE_DB),-silent,on,-summary,off +PERL_COVER = cover + +check-coverage-run recheck-coverage-run: all + $(mkinstalldirs) $(PERL_COVERAGE_DB) + PERL5OPT="$$PERL5OPT $(PERL_COVERAGE_FLAGS)"; export PERL5OPT; \ + WANT_NO_THREADS=yes; export WANT_NO_THREADS; unset AUTOMAKE_JOBS; \ + $(MAKE) $(AM_MAKEFLAGS) `echo $@ | sed 's/-coverage-run//'` + +check-coverage-report: + @if test ! -d "$(PERL_COVERAGE_DB)"; then \ + echo "No coverage database found in \`$(PERL_COVERAGE_DB)'." >&2; \ + echo "Please run \`make check-coverage' first" >&2; \ + exit 1; \ + fi + $(PERL_COVER) $(PERL_COVER_FLAGS) "$(PERL_COVERAGE_DB)" + +# We don't use direct dependencies here because we'd like to be able +# to invoke the report even after interrupted check-coverage. +check-coverage: check-coverage-run + $(MAKE) $(AM_MAKEFLAGS) check-coverage-report + +recheck-coverage: recheck-coverage-run + $(MAKE) $(AM_MAKEFLAGS) check-coverage-report + +clean-coverage: + rm -rf "$(PERL_COVERAGE_DB)" +clean-local: clean-coverage + +.PHONY: check-coverage recheck-coverage check-coverage-run \ + recheck-coverage-run check-coverage-report clean-coverage + # Some simple checks, and then ordinary check. These are only really # guaranteed to work on my machine. syntax_check_rules = \ @@ -140,6 +192,7 @@ sc_tests_required_after_defs \ sc_tests_overriding_macros_on_cmdline \ sc_tests_plain_sleep \ sc_tests_plain_egrep_fgrep \ +sc_tests_logs_duplicate_prefixes \ sc_mkdir_p \ sc_perl_at_substs \ sc_unquoted_DESTDIR \ @@ -409,6 +462,24 @@ sc_tests_plain_egrep_fgrep: exit 1; \ fi +## Rule to ensure that the testsuite has been run before. We don't depend on `check' +## here, because that would be very wasteful in the common case. We could run +## `make check RECHECK_LOGS=' and avoid toplevel races with AM_RECURSIVE_TARGETS. +sc_ensure_testsuite_has_run: + @if test ! -f tests/test-suite.log; then \ + echo "Run \`make check' before \`maintainer-check'" >&2; \ + exit 1; \ + fi +.PHONY: sc_ensure_testsuite_has_run + +## Ensure our warning and error messages do not contain duplicate 'warning:' prefixes. +## This test actually depends on the testsuite having been run before. +sc_tests_logs_duplicate_prefixes: sc_ensure_testsuite_has_run + @if grep -E '(warning|error):.*(warning|error):' tests/*.log; then \ + echo 'Duplicate warning/error message prefixes seen in above tests.' >&2; \ + exit 1; \ + fi + sc_mkdir_p: @if grep 'mkdir_p' $(srcdir)/automake.in \ $(srcdir)/lib/am/*.am $(srcdir)/tests/*.test; then \ @@ -527,7 +598,7 @@ fetch: >>Fetchdir/update.patch 2>/dev/null; then :; \ else \ stat=1; \ - echo "Updating $(srcdir)/lib/$$file..."; \ + echo "Updating $(srcdir)/lib/$$file ..."; \ cp Fetchdir/$$file $(srcdir)/lib/$$file; \ fi; \ done; \ diff --git a/Makefile.in b/Makefile.in index 528b80e..3a89eba 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11a from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -59,9 +59,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \ $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/lead-dot.m4 \ $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \ $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \ - $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \ - $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/silent.m4 \ + $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/substnot.m4 \ + $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -92,6 +92,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(bindir)" SCRIPTS = $(bin_SCRIPTS) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -105,9 +111,10 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck + cscope distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -116,6 +123,7 @@ am__remove_distdir = \ { test ! -d "$(distdir)" \ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ && rm -fr "$(distdir)"; }; } +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -143,10 +151,12 @@ am__relativize = \ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best +DIST_TARGETS = dist-bzip2 dist-gzip distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APIVERSION = @APIVERSION@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -265,6 +275,12 @@ do_subst = sed \ -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \ -e 's,[@]datadir[@],$(datadir),g' +TEST_SUBDIRS = lib/Automake/tests tests + +# Perl coverage statistics. +PERL_COVERAGE_DB = $(abs_top_builddir)/cover_db +PERL_COVERAGE_FLAGS = -MDevel::Cover=-db,$(PERL_COVERAGE_DB),-silent,on,-summary,off +PERL_COVER = cover # Some simple checks, and then ordinary check. These are only really # guaranteed to work on my machine. @@ -298,6 +314,7 @@ sc_tests_required_after_defs \ sc_tests_overriding_macros_on_cmdline \ sc_tests_plain_sleep \ sc_tests_plain_egrep_fgrep \ +sc_tests_logs_duplicate_prefixes \ sc_mkdir_p \ sc_perl_at_substs \ sc_unquoted_DESTDIR \ @@ -459,6 +476,10 @@ ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -522,8 +543,32 @@ GTAGS: && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) + +clean-cscope: + -rm -f cscope.files + +cscope.files: clean-cscope cscopelist-recursive cscopelist + +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -602,36 +647,39 @@ distdir: $(DISTFILES) else :; fi dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -9 -c >$(distdir).tar.lz + $(am__post_remove_distdir) dist-lzma: distdir tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | xz -9 -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -644,6 +692,8 @@ distcheck: dist bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -686,7 +736,7 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -744,7 +794,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-recursive -clean-am: clean-generic mostlyclean-am +clean-am: clean-generic clean-local mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -813,26 +863,27 @@ ps-am: uninstall-am: uninstall-binSCRIPTS @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-exec-am install-strip tags-recursive \ - uninstall-am +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am \ + install-exec-am install-strip tags-recursive uninstall-am .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ - distcheck distclean distclean-generic distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-binSCRIPTS \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-exec-hook install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ - tags-recursive uninstall uninstall-am uninstall-binSCRIPTS \ - uninstall-hook + all all-am am--refresh check check-am clean clean-cscope \ + clean-generic clean-local cscope cscopelist \ + cscopelist-recursive ctags ctags-recursive dist dist-all \ + dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-generic distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-binSCRIPTS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-exec-hook install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-binSCRIPTS uninstall-hook install-exec-hook: @@ -855,14 +906,28 @@ uninstall-hook: automake: automake.in aclocal: aclocal.in automake aclocal: Makefile - rm -f $@ $@.tmp - $(do_subst) $(srcdir)/$@.in >$@.tmp - chmod +x $@.tmp - chmod a-w $@.tmp - mv -f $@.tmp $@ + $(AM_V_GEN)rm -f $@ $@.tmp + $(AM_V_at)$(do_subst) $(srcdir)/$@.in >$@.tmp + $(AM_V_at)chmod +x $@.tmp + $(AM_V_at)chmod a-w $@.tmp + $(AM_V_at)mv -f $@.tmp $@ INSTALL: lib/INSTALL - cp $(srcdir)/lib/INSTALL $@ + $(AM_V_GEN)cp $(srcdir)/lib/INSTALL $@ + +.PHONY: recheck +recheck: + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + for subdir in $(TEST_SUBDIRS); do \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@) || eval $$failcom; \ + done; \ + test -z "$$fail" ################################################################ @@ -870,6 +935,35 @@ INSTALL: lib/INSTALL dist-hook: cd $(distdir)/tests && chmod a+rx *.test +check-coverage-run recheck-coverage-run: all + $(mkinstalldirs) $(PERL_COVERAGE_DB) + PERL5OPT="$$PERL5OPT $(PERL_COVERAGE_FLAGS)"; export PERL5OPT; \ + WANT_NO_THREADS=yes; export WANT_NO_THREADS; unset AUTOMAKE_JOBS; \ + $(MAKE) $(AM_MAKEFLAGS) `echo $@ | sed 's/-coverage-run//'` + +check-coverage-report: + @if test ! -d "$(PERL_COVERAGE_DB)"; then \ + echo "No coverage database found in \`$(PERL_COVERAGE_DB)'." >&2; \ + echo "Please run \`make check-coverage' first" >&2; \ + exit 1; \ + fi + $(PERL_COVER) $(PERL_COVER_FLAGS) "$(PERL_COVERAGE_DB)" + +# We don't use direct dependencies here because we'd like to be able +# to invoke the report even after interrupted check-coverage. +check-coverage: check-coverage-run + $(MAKE) $(AM_MAKEFLAGS) check-coverage-report + +recheck-coverage: recheck-coverage-run + $(MAKE) $(AM_MAKEFLAGS) check-coverage-report + +clean-coverage: + rm -rf "$(PERL_COVERAGE_DB)" +clean-local: clean-coverage + +.PHONY: check-coverage recheck-coverage check-coverage-run \ + recheck-coverage-run check-coverage-report clean-coverage + .PHONY: $(syntax_check_rules) $(syntax_check_rules): automake aclocal maintainer-check: $(syntax_check_rules) @@ -1090,6 +1184,19 @@ sc_tests_plain_egrep_fgrep: exit 1; \ fi +sc_ensure_testsuite_has_run: + @if test ! -f tests/test-suite.log; then \ + echo "Run \`make check' before \`maintainer-check'" >&2; \ + exit 1; \ + fi +.PHONY: sc_ensure_testsuite_has_run + +sc_tests_logs_duplicate_prefixes: sc_ensure_testsuite_has_run + @if grep -E '(warning|error):.*(warning|error):' tests/*.log; then \ + echo 'Duplicate warning/error message prefixes seen in above tests.' >&2; \ + exit 1; \ + fi + sc_mkdir_p: @if grep 'mkdir_p' $(srcdir)/automake.in \ $(srcdir)/lib/am/*.am $(srcdir)/tests/*.test; then \ @@ -1175,7 +1282,7 @@ fetch: >>Fetchdir/update.patch 2>/dev/null; then :; \ else \ stat=1; \ - echo "Updating $(srcdir)/lib/$$file..."; \ + echo "Updating $(srcdir)/lib/$$file ..."; \ cp Fetchdir/$$file $(srcdir)/lib/$$file; \ fi; \ done; \ diff --git a/NEWS b/NEWS index 6971bd7..c0f3ebd 100644 --- a/NEWS +++ b/NEWS @@ -1,14 +1,31 @@ -New in 1.11.0a: +New in 1.11a: + +* Changes to automake: + + - automake now generates silenced rules for texinfo outputs. + +* New targets: + + - New `cscope' target to build a cscope database for the source tree. * Miscellaneous changes: + - The `dist' and `dist-all' targets now can run compressors in parallel. + - The `lzma' compression scheme and associated automake option `dist-lzma' is obsoleted by `xz' and `dist-xz' due to upstream changes. + - "make dist" can now create lzip-compressed tarballs. + + - Messages of types warning or error from `automake' and `aclocal' are now + prefixed with the respective type, and presence of -Werror is noted. + - The `compile' script now converts some options for MSVC for a better user experience. Similarly, the new `ar-lib' script wraps Microsoft lib. -Bugs fixed in 1.11.0a: +Bugs fixed in 1.11a: + + - Lots of minor bugfixes. * Bugs introduced by 1.11: @@ -39,6 +56,11 @@ Bugs fixed in 1.11.0a: - AM_PROG_GCJ uses AC_CHECK_TOOLS to look for `gcj' now, so that prefixed tools are preferred in a cross-compile setup. + - The distribution is tarred up with mode 755 now by the `dist*' targets. + This fixes a race condition where untrusted users could modify files + in the $(PACKAGE)-$(VERSION) distdir before packing if the toplevel + build directory was world-searchable. This is CVE-2009-4029. + - Several scripts as well as the parallel-tests testsuite driver now exit with the right exit status upon receiving a signal. diff --git a/THANKS b/THANKS index b3ceae6..810a700 100644 --- a/THANKS +++ b/THANKS @@ -67,6 +67,7 @@ danbp danpb@nospam.postmaster.co.uk Daniel Jacobowitz drow@false.org Daniel Kahn Gillmor dkg@fifthhorseman.net Daniel Richard G. danielg@teragram.com +Debarshi Ray rishi@gnu.org Dave Brolley brolley@redhat.com Dave Korn dave.korn.cygwin@googlemail.com Dave Morrison dave@bnl.gov @@ -271,6 +272,7 @@ Per Oyvind Hvidsten poeh@enter.vg Peter Breitenlohner peb@mppmu.mpg.de Peter Eisentraut peter_e@gmx.net Peter Gavin pgavin@debaser.kicks-ass.org +Peter Johansson trojkan@gmail.com Peter Mattis petm@scam.XCF.Berkeley.EDU Peter Muir iyhi@yahoo.com Peter O'Gorman peter@pogma.com diff --git a/aclocal.in b/aclocal.in index b5c2c41..4c81a47 100644 --- a/aclocal.in +++ b/aclocal.in @@ -183,8 +183,7 @@ sub check_acinclude () foreach my $key (keys %map) { # FIXME: should print line number of acinclude.m4. - msg ('syntax', "warning: macro `$key' defined in " - . "acinclude.m4 but never used") + msg ('syntax', "macro `$key' defined in acinclude.m4 but never used") if $map{$key} eq 'acinclude.m4' && ! exists $macro_seen{$key}; } } @@ -435,7 +434,7 @@ sub scan_configure_dep ($) # Make this just a warning, because we do not know whether # the macro is actually used (it could be called conditionally). msg ('unsupported', "$file:$line", - "warning: macro `$2' not found in library"); + "macro `$2' not found in library"); } } @@ -507,7 +506,7 @@ sub scan_file ($$$) if ($number !~ /$serial_number_rx/go) { msg ('syntax', "$file:$.", - "warning: ill-formed serial number `$number', " + "ill-formed serial number `$number', " . "expecting a version string with only digits and dots"); } elsif ($defun_seen) @@ -559,8 +558,8 @@ sub scan_file ($$$) $defun_seen = 1; if (! defined $1) { - msg ('syntax', "$file:$.", "warning: underquoted definition of $2" - . "\n run info '(automake)Extending aclocal'\n" + msg ('syntax', "$file:$.", "underquoted definition of $2" + . "\n run info Automake 'Extending aclocal'\n" . " or see http://sources.redhat.com/automake/" . "automake.html#Extending-aclocal") unless $underquoted_manual_once; @@ -870,14 +869,14 @@ sub usage ($) { my ($status) = @_; - print "Usage: aclocal [OPTIONS] ... + print "Usage: aclocal [OPTION]... Generate `aclocal.m4' by scanning `configure.ac' or `configure.in' Options: --acdir=DIR directory holding config files (for debugging) --diff[=COMMAND] run COMMAND [diff -u] on M4 files that would be - changed (implies --install and --dry-run) + changed (implies --install and --dry-run) --dry-run pretend to, but do not actually update any file --force always update output file --help print this help, then exit @@ -985,13 +984,13 @@ sub parse_arguments () } if (exists $argopts{$ARGV[0]}) { - fatal ("option `$ARGV[0]' requires an argument\n" - . "Try `$0 --help' for more information."); + fatal ("option `$ARGV[0]' requires an argument.\n" + . "Try `$0 --help' for more information"); } else { fatal ("unrecognized option `$ARGV[0]'\n" - . "Try `$0 --help' for more information."); + . "Try `$0 --help' for more information"); } } @@ -1012,7 +1011,7 @@ sub parse_arguments () if ($install && !@user_includes) { fatal ("--install should copy macros in the directory indicated by the" - . "\nfirst -I option, but no -I was supplied."); + . "\nfirst -I option, but no -I was supplied"); } if (! -d $system_includes[0]) @@ -1063,7 +1062,7 @@ my $loop = 0; while (1) { ++$loop; - prog_error "Too many loops." if $loop > 2; + prog_error "too many loops" if $loop > 2; reset_maps; scan_m4_files; diff --git a/aclocal.m4 b/aclocal.m4 index d7cbc11..6cbae15 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11 -*- Autoconf -*- +# generated automatically by aclocal 1.11a -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, +[m4_warning([this file was generated for autoconf 2.67. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -29,6 +29,7 @@ m4_include([m4/mkdirp.m4]) m4_include([m4/options.m4]) m4_include([m4/runlog.m4]) m4_include([m4/sanity.m4]) +m4_include([m4/silent.m4]) m4_include([m4/strip.m4]) m4_include([m4/substnot.m4]) m4_include([m4/tar.m4]) diff --git a/automake.in b/automake.in old mode 100755 new mode 100644 index 8fd6869..c0c5289 --- a/automake.in +++ b/automake.in @@ -1207,11 +1207,25 @@ sub define_verbose_tagvar ($) my ($name) = @_; if (option 'silent-rules') { - define_verbose_var ($name, '@echo " '. $name . ' ' x (6 - length ($name)) . '" $@;'); + define_verbose_var ($name, '@echo " '. $name . ' ' x (8 - length ($name)) . '" $@;'); define_verbose_var ('at', '@'); } } +# define_verbose_texinfo +# ---------------------- +# Engage the needed `silent-rules' machinery for assorted texinfo commands. +sub define_verbose_texinfo () +{ + my @tagvars = ('DVIPS', 'MAKEINFO', 'INFOHTML', 'TEXI2DVI', 'TEXI2PDF'); + foreach my $tag (@tagvars) + { + define_verbose_tagvar($tag); + } + define_verbose_var('texinfo', '-q'); + define_verbose_var('texidevnull', '> /dev/null'); +} + # define_verbose_libtool # ---------------------- # Engage the needed `silent-rules' machinery for `libtool --silent'. @@ -1313,7 +1327,7 @@ sub check_user_variables (@) msg_cond_var ('gnu', $cond, $flag, "`$flag' is a user variable, " . "you should not override it;\n" - . "use `AM_$flag' instead."); + . "use `AM_$flag' instead"); } } } @@ -1573,7 +1587,7 @@ sub handle_languages my $srcdir = dirname ($source); if ($lang->ansi && $obj =~ /\$U/) { - prog_error "`$obj' contains \$U, but `$source' doesn't." + prog_error "`$obj' contains \$U, but `$source' doesn't" if $source !~ /\$U/; (my $source_ = $source) =~ s/\$U/_/g; @@ -2303,9 +2317,9 @@ sub handle_lib_objects my ($xname, $varname) = @_; my $var = var ($varname); - prog_error "handle_lib_objects: `$varname' undefined" + prog_error "`$varname' undefined" unless $var; - prog_error "handle_lib_objects: unexpected variable name `$varname'" + prog_error "unexpected variable name `$varname'" unless $varname =~ /^(.*)(?:LIB|LD)ADD$/; my $prefix = $1 || 'AM_'; @@ -2338,7 +2352,7 @@ sub handle_lib_objects # FIXME: should display a stack of nested variables # as context when $var != $subvar. err_var ($var, "linker flags such as `$val' belong in " - . "`${prefix}LDFLAGS"); + . "`${prefix}LDFLAGS'"); } return (); } @@ -2880,7 +2894,7 @@ sub handle_ltlibraries my $onlyone = ($dir ne $adir) ? ("\nLibtool libraries can be built for only one " - . "destination.") : ""; + . "destination") : ""; error ($liblocations{$val}{$acond}, "... and should also be $adirtxt$adircond.$onlyone"); @@ -3245,6 +3259,9 @@ sub output_texinfo_build_rules ($$$@) $output_rules .= file_contents ('texibuild', new Automake::Location, + AM_V_MAKEINFO => verbose_flag('MAKEINFO'), + AM_V_TEXI2DVI => verbose_flag('TEXI2DVI'), + AM_V_TEXI2PDF => verbose_flag('TEXI2PDF'), DEPS => "@deps", DEST_PREFIX => $dpfx, DEST_INFO_PREFIX => $dipfx, @@ -3254,12 +3271,15 @@ sub output_texinfo_build_rules ($$$@) GENERIC_INFO => $generic_info, INSRC => $insrc, MAKEINFOFLAGS => $makeinfoflags, + SILENT => silent_flag(), SOURCE => ($generic ? '$<' : $source), SOURCE_INFO => ($generic_info ? '$<' : $source), SOURCE_REAL => $source, SOURCE_SUFFIX => $ssfx, + TEXIQUIET => verbose_flag('texinfo'), + TEXIDEVNULL => verbose_flag('texidevnull'), ); return ($dirstamp, "$dpfx.dvi", "$dpfx.pdf", "$dpfx.ps", "$dpfx.html"); } @@ -3568,6 +3588,7 @@ sub handle_texinfo () my ($mostlyclean, $clean, $maintclean) = ('', '', ''); if ($info_texinfos) { + define_verbose_texinfo; ($mostlyclean, $clean, $maintclean) = handle_texinfo_helper ($info_texinfos); chomp $mostlyclean; chomp $clean; @@ -3576,10 +3597,12 @@ sub handle_texinfo () $output_rules .= file_contents ('texinfos', new Automake::Location, + AM_V_DVIPS => verbose_flag('DVIPS'), MOSTLYCLEAN => $mostlyclean, TEXICLEAN => $clean, MAINTCLEAN => $maintclean, - 'LOCAL-TEXIS' => !!$info_texinfos); + 'LOCAL-TEXIS' => !!$info_texinfos, + TEXIQUIET => verbose_flag('texinfo')); } @@ -3736,6 +3759,7 @@ sub handle_tags { my @tag_deps = (); my @ctag_deps = (); + my @cscope_deps = (); if (var ('SUBDIRS')) { $output_rules .= ("tags-recursive:\n" @@ -3759,6 +3783,17 @@ sub handle_tags push (@ctag_deps, 'ctags-recursive'); &depend ('.PHONY', 'ctags-recursive'); &depend ('.MAKE', 'ctags-recursive'); + + $output_rules .= ("cscopelist-recursive:\n" + . "\tlist=\'\$(SUBDIRS)\'; for subdir in \$\$list; do \\\n" + # Never fail here if a subdir fails; it + # isn't important. + . "\t test \"\$\$subdir\" = . || (\$(am__cd) \$\$subdir" + . " && \$(MAKE) \$(AM_MAKEFLAGS) cscopelist); \\\n" + . "\tdone\n"); + push (@cscope_deps, 'cscopelist-recursive'); + &depend ('.PHONY', 'cscopelist-recursive'); + &depend ('.MAKE', 'cscopelist-recursive'); } if (&saw_sources_p (1) @@ -3781,13 +3816,14 @@ sub handle_tags new Automake::Location, CONFIG => "@config", TAGSDIRS => "@tag_deps", - CTAGSDIRS => "@ctag_deps"); + CTAGSDIRS => "@ctag_deps", + CSCOPEDIRS => "@cscope_deps"); set_seen 'TAGS_DEPENDENCIES'; } elsif (reject_var ('TAGS_DEPENDENCIES', - "doesn't make sense to define `TAGS_DEPENDENCIES'" - . "without\nsources or `ETAGS_ARGS'")) + "it doesn't make sense to define `TAGS_DEPENDENCIES'" + . " without\nsources or `ETAGS_ARGS'")) { } else @@ -3796,8 +3832,9 @@ sub handle_tags # Otherwise, it would be possible for a top-level "make TAGS" # to fail because some subdirectory failed. $output_rules .= "tags: TAGS\nTAGS:\n\n"; - # Ditto ctags. + # Ditto ctags and cscope. $output_rules .= "ctags: CTAGS\nCTAGS:\n\n"; + $output_rules .= "cscope cscopelist:\n\n"; } } @@ -3907,9 +3944,9 @@ sub handle_dist () { my $archive_defined = option 'no-dist-gzip' ? 0 : 1; $archive_defined ||= - grep { option "dist-$_" } qw(shar zip tarZ bzip2 lzma xz); + grep { option "dist-$_" } qw(shar zip tarZ bzip2 lzip lzma xz); error (option 'no-dist-gzip', - "no-dist-gzip specified but no dist-* specified, " + "no-dist-gzip specified but no dist-* specified,\n" . "at least one archive format must be enabled") unless $archive_defined; } @@ -4096,7 +4133,7 @@ sub scan_aclocal_m4 () push (@ac_deps, '$(ACLOCAL_M4_SOURCES)'); msg_var ('obsolete', 'ACLOCAL_M4_SOURCES', "`ACLOCAL_M4_SOURCES' is obsolete.\n" - . "It should be safe to simply remove it."); + . "It should be safe to simply remove it"); } # Note that it might be possible that aclocal.m4 doesn't exist but @@ -5188,8 +5225,8 @@ sub scan_autoconf_config_files ($$) my ($local, @rest) = split (/:/); @rest = ("$local.in",) unless @rest; msg ('portability', $where, - "Omit leading `./' from config file names such as `$local'," - . "\nas not all make implementations treat `file' and `./file' equally.") + "omit leading `./' from config file names such as `$local'," + . "\nas not all make implementations treat `file' and `./file' equally") if ($local =~ /^\.\//); my $input = locate_am @rest; if ($input) @@ -5313,7 +5350,7 @@ sub scan_autoconf_traces ($) if ($seen_init_automake) { error ($where, "AC_CONFIG_AUX_DIR must be called before " - . "AM_INIT_AUTOMAKE...", partial => 1); + . "AM_INIT_AUTOMAKE ...", partial => 1); error ($seen_init_automake, "... AM_INIT_AUTOMAKE called here"); } $config_aux_dir = $args[1]; @@ -5549,7 +5586,7 @@ sub scan_autoconf_files () . "should verify that $configure_ac invokes AM_INIT_AUTOMAKE," . "\nthat aclocal.m4 is present in the top-level directory,\n" . "and that aclocal.m4 was recently regenerated " - . "(using aclocal)."); + . "(using aclocal)"); } else { @@ -5560,7 +5597,7 @@ sub scan_autoconf_files () error ($seen_init_automake, "your implementation of AM_INIT_AUTOMAKE comes from " . "an\nold Automake version. You should recreate " . - "aclocal.m4\nwith aclocal and run automake again.\n", + "aclocal.m4\nwith aclocal and run automake again", # $? = 63 is used to indicate version mismatch to missing. exit_code => 63); } @@ -5568,9 +5605,9 @@ sub scan_autoconf_files () { error ($seen_init_automake, "no proper implementation of AM_INIT_AUTOMAKE was " . - "found,\nprobably because aclocal.m4 is missing...\n" . + "found,\nprobably because aclocal.m4 is missing.\n" . "You should run aclocal to create this file, then\n" . - "run automake again.\n"); + "run automake again"); } } } @@ -6365,7 +6402,7 @@ sub cond_stack_if ($$$) my $mac = $_am_macro_for_cond{$cond}; $text .= "\n The usual way to define `$cond' is to add "; $text .= ($mac =~ / /) ? $mac : "`$mac'"; - $text .= "\n to `$configure_ac' and run `aclocal' and `autoconf' again."; + $text .= "\n to `$configure_ac' and run `aclocal' and `autoconf' again"; # These warnings appear in Automake files (depend2.am), # so there is no need to display them more than once: $scope = US_GLOBAL; @@ -7061,6 +7098,7 @@ sub make_paragraphs ($%) 'XZ' => !! option 'dist-xz', 'LZMA' => !! option 'dist-lzma', + 'LZIP' => !! option 'dist-lzip', 'BZIP2' => !! option 'dist-bzip2', 'COMPRESS' => !! option 'dist-tarZ', 'GZIP' => ! option 'no-dist-gzip', @@ -7842,7 +7880,7 @@ sub require_file_internal ($$$@) $trailer2 = "\n Consider adding the COPYING file" . " to the version control system" . "\n for your code, to avoid questions" - . " about which license your project uses."; + . " about which license your project uses"; } # Windows Perl will hang if we try to delete a @@ -7876,8 +7914,9 @@ sub require_file_internal ($$$@) # the top level Makefile. Furthermore Automake # hasn't been asked to create the Makefile.in # that distributes the aux dir files. - error ($where, 'Please make a full run of automake' - . " so $fullfile gets distributed."); + error ($where, 'please rerun automake without ' + . "Makefile arguments\n" + . "so $fullfile gets distributed"); } } } @@ -8284,7 +8323,7 @@ sub generate_makefile ($$) if (-e $out_file) { unlink ($out_file) - or fatal "cannot remove $out_file: $!\n"; + or fatal "cannot remove $out_file: $!"; } my $gm_file = new Automake::XFile "> $out_file"; @@ -8302,7 +8341,7 @@ sub generate_makefile ($$) # Print usage information. sub usage () { - print "Usage: $0 [OPTION] ... [Makefile]... + print "Usage: $0 [OPTION]... [Makefile]... Generate Makefile.in for configure from Makefile.am. @@ -8468,7 +8507,7 @@ sub parse_arguments () if (defined $output_directory) { - msg 'obsolete', "`--output-dir' is deprecated\n"; + msg 'obsolete', "`--output-dir' is deprecated"; } else { @@ -8495,20 +8534,20 @@ sub parse_arguments () } elsif (exists $argopts{$ARGV[0]}) { - fatal ("option `$ARGV[0]' requires an argument\n" - . "Try `$0 --help' for more information."); + fatal ("option `$ARGV[0]' requires an argument.\n" + . "Try `$0 --help' for more information"); } else { fatal ("unrecognized option `$ARGV[0]'.\n" - . "Try `$0 --help' for more information."); + . "Try `$0 --help' for more information"); } } my $errspec = 0; foreach my $arg (@ARGV) { - fatal ("empty argument\nTry `$0 --help' for more information.") + fatal ("empty argument\nTry `$0 --help' for more information") if ($arg eq ''); # Handle $local:$input syntax. diff --git a/bootstrap b/bootstrap index 7766bd3..9f1a8d8 100755 --- a/bootstrap +++ b/bootstrap @@ -19,40 +19,18 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Find the path separator. -# (Snippet copied from configure's initialization in Autoconf 2.65) -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - # Don't ignore failures. set -e # Set program basename. me=`echo "$0" | sed 's,^.*/,,'` -# Find perl. Code based on Autoconf, but without non-POSIX support. -if test -z "$PERL"; then - save_IFS=$IFS - IFS=$PATH_SEPARATOR - for dir in $PATH; do - IFS=$save_IFS - test -z "$dir" && dir=. - if test -x "$dir/perl" && test ! -d "$dir/perl"; then - PERL="$dir/perl" - break - fi - done -fi - -if test -z "$PERL"; then - echo "$me: cannot find perl" >&2 - exit 1 -fi +# Let user choose which version of autoconf, autom4te and perl to use. +: ${AUTOCONF=autoconf} +export AUTOCONF # might be used by aclocal and/or automake +: ${AUTOM4TE=autom4te} +export AUTOM4TE # ditto +: ${PERL=perl} # Variables to substitute. VERSION=`sed -ne '/AC_INIT/s/^[^[]*\[[^[]*\[\([^]]*\)\].*$/\1/p' configure.ac` @@ -71,7 +49,7 @@ fi # Read the rule for calculating APIVERSION and execute it. apiver_cmd=`sed -ne 's/\[\[/[/g;s/\]\]/]/g;/^APIVERSION=/p' configure.ac` -eval $apiver_cmd +eval "$apiver_cmd" # Sanity checks. if test -z "$VERSION"; then @@ -80,7 +58,7 @@ if test -z "$VERSION"; then fi if test -z "$APIVERSION"; then - echo "$me: cannot find VERSION" >&2 + echo "$me: cannot find APIVERSION" >&2 exit 1 fi @@ -112,7 +90,6 @@ dosubst () chmod a-w $2 } - # Create temporary replacement for lib/Automake/Config.pm. dosubst automake-$APIVERSION/Automake/Config.in \ automake-$APIVERSION/Automake/Config.pm @@ -133,10 +110,9 @@ cd .. # Run the autotools. $PERL ./aclocal.tmp -I m4 -autoconf +$AUTOCONF $PERL ./automake.tmp # Remove temporary files and directories. rm -rf aclocal-$APIVERSION automake-$APIVERSION rm -f aclocal.tmp automake.tmp -rm -f lib/Automake/Config.pm diff --git a/configure b/configure index cdfa840..b7f3e9b 100755 --- a/configure +++ b/configure @@ -1,13 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for GNU Automake 1.11. +# Generated by GNU Autoconf 2.67 for GNU Automake 1.11a. # # Report bugs to . # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -319,7 +319,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -359,19 +359,19 @@ else fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -533,7 +533,7 @@ test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -552,8 +552,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GNU Automake' PACKAGE_TARNAME='automake' -PACKAGE_VERSION='1.11' -PACKAGE_STRING='GNU Automake 1.11' +PACKAGE_VERSION='1.11a' +PACKAGE_STRING='GNU Automake 1.11a' PACKAGE_BUGREPORT='bug-automake@gnu.org' PACKAGE_URL='http://www.gnu.org/software/automake/' @@ -572,6 +572,8 @@ PERL_THREADS PERL pkgvdatadir APIVERSION +AM_BACKSLASH +AM_DEFAULT_VERBOSITY am__untar am__tar AMTAR @@ -642,6 +644,7 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules ' ac_precious_vars='build_alias host_alias @@ -708,8 +711,9 @@ do fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -754,7 +758,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -780,7 +784,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -984,7 +988,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1000,7 +1004,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1030,8 +1034,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1039,7 +1043,7 @@ Try \`$0 --help' for more information." # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1057,13 +1061,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1086,7 +1090,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1100,8 +1104,8 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1116,9 +1120,9 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1157,11 +1161,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1187,7 +1191,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNU Automake 1.11 to adapt to many kinds of systems. +\`configure' configures GNU Automake 1.11a to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1201,7 +1205,7 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1256,10 +1260,17 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU Automake 1.11:";; + short | recursive ) echo "Configuration of GNU Automake 1.11a:";; esac cat <<\_ACEOF +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0') + Report bugs to . GNU Automake home page: . General help using GNU software: . @@ -1325,10 +1336,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU Automake configure 1.11 -generated by GNU Autoconf 2.65 +GNU Automake configure 1.11a +generated by GNU Autoconf 2.67 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1342,8 +1353,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU Automake $as_me 1.11, which was -generated by GNU Autoconf 2.65. Invocation command line was +It was created by GNU Automake $as_me 1.11a, which was +generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -1453,11 +1464,9 @@ trap 'exit_status=$? { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -1491,11 +1500,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -1508,11 +1515,9 @@ _ASBOX echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -1526,11 +1531,9 @@ _ASBOX fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -1585,7 +1588,12 @@ _ACEOF ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -1600,7 +1608,11 @@ do { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -1676,7 +1688,7 @@ if $ac_cache_corrupted; then $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -1695,16 +1707,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_aux_dir= for ac_dir in lib "$srcdir"/lib; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in lib \"$srcdir\"/lib" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in lib \"$srcdir\"/lib" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -1719,7 +1737,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } @@ -1730,16 +1748,16 @@ else test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -1764,7 +1782,7 @@ am_AUTOCONF="${AUTOCONF-autoconf}" am_AUTOHEADER="${AUTOHEADER-autoheader}" -am__api_version='1.11' +am__api_version='1.11a' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -1867,11 +1885,11 @@ am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -1895,7 +1913,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi if test "$2" = conftest.file || test $am_try -eq 2; then @@ -1910,7 +1928,7 @@ then # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -2148,7 +2166,7 @@ done $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2156,7 +2174,7 @@ SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2184,13 +2202,25 @@ else fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=1;; +esac +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2206,7 +2236,7 @@ fi # Define the identity of the package. PACKAGE='automake' - VERSION='1.11' + VERSION='1.11a' cat >>confdefs.h <<_ACEOF @@ -2307,10 +2337,10 @@ fi if test -z "$PERL"; then - as_fn_error "perl not found" "$LINENO" 5 + as_fn_error $? "perl not found" "$LINENO" 5 fi $PERL -e 'require 5.006;' || { - as_fn_error "perl 5.6 or better is required; perl 5.8.2 or better + as_fn_error $? "perl 5.6 or better is required; perl 5.8.2 or better is recommended. If you have several perl versions installed, select the one Automake should use using ./configure PERL=/path/to/perl" "$LINENO" 5 @@ -2419,7 +2449,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_autoconf_installed" >&5 $as_echo "$am_cv_autoconf_installed" >&6; } if test "$am_cv_autoconf_installed" = no; then - as_fn_error "Autoconf $required_autoconf_version or better is required. + as_fn_error $? "Autoconf $required_autoconf_version or better is required. Please make sure it is installed and in your PATH." "$LINENO" 5 fi @@ -2445,7 +2475,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_autoconf_works" >&5 $as_echo "$am_cv_autoconf_works" >&6; } if test "$am_cv_autoconf_works" = no; then - as_fn_error "The installed version of autoconf does not work. + as_fn_error $? "The installed version of autoconf does not work. Please check config.log for error messages before this one." "$LINENO" 5 fi @@ -2471,7 +2501,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_autoconf_version" >&5 $as_echo "$am_cv_autoconf_version" >&6; } if test "$am_cv_autoconf_version" = no; then - as_fn_error "Autoconf $required_autoconf_version or better is required." "$LINENO" 5 + as_fn_error $? "Autoconf $required_autoconf_version or better is required." "$LINENO" 5 fi # Test for ln. We need use it to install the versioned binaries. @@ -2561,7 +2591,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -2627,7 +2657,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -2694,7 +2724,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_FGREP"; then - as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_FGREP=$FGREP @@ -2860,6 +2890,7 @@ DEFS=`sed -n "$ac_script" confdefs.h` ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -3022,19 +3053,19 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -3230,7 +3261,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -3283,8 +3314,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNU Automake $as_me 1.11, which was -generated by GNU Autoconf 2.65. Invocation command line was +This file was extended by GNU Automake $as_me 1.11a, which was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -3338,11 +3369,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNU Automake config.status 1.11 -configured by $0, generated by GNU Autoconf 2.65, +GNU Automake config.status 1.11a +configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -3360,11 +3391,16 @@ ac_need_defaults=: while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -3386,6 +3422,7 @@ do $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -3396,7 +3433,7 @@ do ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -3462,7 +3499,7 @@ do "tests/aclocal-${APIVERSION}") CONFIG_FILES="$CONFIG_FILES tests/aclocal-${APIVERSION}:tests/aclocal.in" ;; "tests/automake-${APIVERSION}") CONFIG_FILES="$CONFIG_FILES tests/automake-${APIVERSION}:tests/automake.in" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -3498,7 +3535,7 @@ $debug || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -3515,7 +3552,7 @@ if test "x$ac_cr" = x; then fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -3529,18 +3566,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -3629,20 +3666,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -3660,7 +3705,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -3688,7 +3733,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -3715,7 +3760,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -3852,22 +3897,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -3888,7 +3933,7 @@ _ACEOF ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -3909,7 +3954,7 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff --git a/configure.ac b/configure.ac index de4583d..079525d 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -AC_INIT([GNU Automake], [1.11], [bug-automake@gnu.org]) +AC_INIT([GNU Automake], [1.11a], [bug-automake@gnu.org]) m4_ifndef([AC_PACKAGE_URL], [AC_SUBST([PACKAGE_URL], [http://www.gnu.org/software/automake/])]) @@ -32,7 +32,8 @@ AC_CANONICAL_BUILD AC_SUBST([am_AUTOCONF], ["${AUTOCONF-autoconf}"]) AC_SUBST([am_AUTOHEADER], ["${AUTOHEADER-autoheader}"]) -AM_INIT_AUTOMAKE([1.10a dist-bzip2 filename-length-max=99 color-tests parallel-tests]) +AM_INIT_AUTOMAKE([1.10a dist-bzip2 filename-length-max=99 color-tests + parallel-tests silent-rules]) # The API version is the base version. We must guarantee # compatibility for all releases with the same API version. diff --git a/doc/Makefile.am b/doc/Makefile.am index bb48fa2..01cf663 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -27,12 +27,12 @@ dist_man1_MANS = \ $(srcdir)/automake-$(APIVERSION).1 MAINTAINERCLEANFILES = $(dist_man1_MANS) update_mans = \ - PATH="`pwd`/../tests$(PATH_SEPARATOR)$$PATH" && \ + $(AM_V_GEN)PATH="`pwd`/../tests$(PATH_SEPARATOR)$$PATH" && \ export PATH && \ $(HELP2MAN) --output=$@ $(dist_man1_MANS): $(top_srcdir)/configure.ac $(srcdir)/aclocal.1 $(srcdir)/automake.1: - f=`echo $@ | sed 's|.*/||; s|\.1$$||; $(transform)'`; \ + $(AM_V_GEN)f=`echo $@ | sed 's|.*/||; s|\.1$$||; $(transform)'`; \ echo ".so man1/$$f-$(APIVERSION).1" > $@ $(srcdir)/aclocal-$(APIVERSION).1: $(srcdir)/../aclocal.in $(update_mans) aclocal-$(APIVERSION) @@ -70,7 +70,7 @@ dist_doc_DATA = $(srcdir)/amhello-1.0.tar.gz # aclocal-$(APIVERSION) and automake-$(APIVERSION) are generated by # configure in tests/. $(srcdir)/amhello-1.0.tar.gz: $(amhello_sources) $(top_srcdir)/configure.ac - PATH="`pwd`/../tests$(PATH_SEPARATOR)$$PATH" && \ + $(AM_V_GEN)PATH="`pwd`/../tests$(PATH_SEPARATOR)$$PATH" && \ export PATH && \ cd $(srcdir)/amhello && \ ACLOCAL=aclocal-$(APIVERSION) AUTOMAKE=automake-$(APIVERSION) \ diff --git a/doc/Makefile.in b/doc/Makefile.in index 95a8fb8..d2e5a82 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11a from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -59,16 +59,43 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \ $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/lead-dot.m4 \ $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \ $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \ - $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \ - $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/silent.m4 \ + $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/substnot.m4 \ + $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = +AM_V_DVIPS = $(am__v_DVIPS_$(V)) +am__v_DVIPS_ = $(am__v_DVIPS_$(AM_DEFAULT_VERBOSITY)) +am__v_DVIPS_0 = @echo " DVIPS " $@; +AM_V_MAKEINFO = $(am__v_MAKEINFO_$(V)) +am__v_MAKEINFO_ = $(am__v_MAKEINFO_$(AM_DEFAULT_VERBOSITY)) +am__v_MAKEINFO_0 = @echo " MAKEINFO" $@; +AM_V_INFOHTML = $(am__v_INFOHTML_$(V)) +am__v_INFOHTML_ = $(am__v_INFOHTML_$(AM_DEFAULT_VERBOSITY)) +am__v_INFOHTML_0 = @echo " INFOHTML" $@; +AM_V_TEXI2DVI = $(am__v_TEXI2DVI_$(V)) +am__v_TEXI2DVI_ = $(am__v_TEXI2DVI_$(AM_DEFAULT_VERBOSITY)) +am__v_TEXI2DVI_0 = @echo " TEXI2DVI" $@; +AM_V_TEXI2PDF = $(am__v_TEXI2PDF_$(V)) +am__v_TEXI2PDF_ = $(am__v_TEXI2PDF_$(AM_DEFAULT_VERBOSITY)) +am__v_TEXI2PDF_0 = @echo " TEXI2PDF" $@; +AM_V_texinfo = $(am__v_texinfo_$(V)) +am__v_texinfo_ = $(am__v_texinfo_$(AM_DEFAULT_VERBOSITY)) +am__v_texinfo_0 = -q +AM_V_texidevnull = $(am__v_texidevnull_$(V)) +am__v_texidevnull_ = $(am__v_texidevnull_$(AM_DEFAULT_VERBOSITY)) +am__v_texidevnull_0 = > /dev/null INFO_DEPS = $(srcdir)/automake.info TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex am__TEXINFO_TEX_DIR = $(top_srcdir)/lib @@ -114,6 +141,7 @@ CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APIVERSION = @APIVERSION@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -212,7 +240,7 @@ dist_man1_MANS = \ MAINTAINERCLEANFILES = $(dist_man1_MANS) update_mans = \ - PATH="`pwd`/../tests$(PATH_SEPARATOR)$$PATH" && \ + $(AM_V_GEN)PATH="`pwd`/../tests$(PATH_SEPARATOR)$$PATH" && \ export PATH && \ $(HELP2MAN) --output=$@ @@ -278,7 +306,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): .texi.info: - restore=: && backupdir="$(am__leading_dot)am$$$$" && \ + $(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \ am__cwd=`pwd` && $(am__cd) $(srcdir) && \ rm -rf $$backupdir && mkdir $$backupdir && \ if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ @@ -300,18 +328,18 @@ $(am__aclocal_m4_deps): rm -rf $$backupdir; exit $$rc .texi.dvi: - TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + $(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ - $(TEXI2DVI) $< + $(TEXI2DVI) $(AM_V_texinfo) $< $(AM_V_texidevnull) .texi.pdf: - TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + $(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ - $(TEXI2PDF) $< + $(TEXI2PDF) $(AM_V_texinfo) $< $(AM_V_texidevnull) .texi.html: - rm -rf $(@:.html=.htp) - if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + $(AM_V_MAKEINFO)rm -rf $(@:.html=.htp) + $(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ -o $(@:.html=.htp) $<; \ then \ rm -rf $@; \ @@ -346,8 +374,8 @@ mostlyclean-vti: maintainer-clean-vti: -rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi .dvi.ps: - TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ - $(DVIPS) -o $@ $< + $(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + $(DVIPS) $(AM_V_texinfo) -o $@ $< uninstall-dvi-am: @$(NORMAL_UNINSTALL) @@ -548,6 +576,20 @@ GTAGS: && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -780,24 +822,25 @@ uninstall-man: uninstall-man1 .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-aminfo \ - clean-generic ctags dist-info distclean distclean-generic \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-dist_docDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-man1 install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-aminfo maintainer-clean-generic \ - maintainer-clean-vti mostlyclean mostlyclean-aminfo \ - mostlyclean-generic mostlyclean-vti pdf pdf-am ps ps-am tags \ - uninstall uninstall-am uninstall-dist_docDATA uninstall-dvi-am \ - uninstall-html-am uninstall-info-am uninstall-man \ - uninstall-man1 uninstall-pdf-am uninstall-ps-am + clean-generic cscopelist ctags dist-info distclean \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dist_docDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-aminfo \ + maintainer-clean-generic maintainer-clean-vti mostlyclean \ + mostlyclean-aminfo mostlyclean-generic mostlyclean-vti pdf \ + pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-dist_docDATA uninstall-dvi-am uninstall-html-am \ + uninstall-info-am uninstall-man uninstall-man1 \ + uninstall-pdf-am uninstall-ps-am $(dist_man1_MANS): $(top_srcdir)/configure.ac $(srcdir)/aclocal.1 $(srcdir)/automake.1: - f=`echo $@ | sed 's|.*/||; s|\.1$$||; $(transform)'`; \ + $(AM_V_GEN)f=`echo $@ | sed 's|.*/||; s|\.1$$||; $(transform)'`; \ echo ".so man1/$$f-$(APIVERSION).1" > $@ $(srcdir)/aclocal-$(APIVERSION).1: $(srcdir)/../aclocal.in $(update_mans) aclocal-$(APIVERSION) @@ -809,7 +852,7 @@ $(srcdir)/automake-$(APIVERSION).1: $(srcdir)/../automake.in # aclocal-$(APIVERSION) and automake-$(APIVERSION) are generated by # configure in tests/. $(srcdir)/amhello-1.0.tar.gz: $(amhello_sources) $(top_srcdir)/configure.ac - PATH="`pwd`/../tests$(PATH_SEPARATOR)$$PATH" && \ + $(AM_V_GEN)PATH="`pwd`/../tests$(PATH_SEPARATOR)$$PATH" && \ export PATH && \ cd $(srcdir)/amhello && \ ACLOCAL=aclocal-$(APIVERSION) AUTOMAKE=automake-$(APIVERSION) \ diff --git a/doc/automake.texi b/doc/automake.texi index 66c5a7e..bbb74d3 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -315,7 +315,7 @@ Support for Test Suites Miscellaneous Rules -* Tags:: Interfacing to etags and mkid +* Tags:: Interfacing to cscope, etags and mkid * Suffixes:: Handling new file extensions * Multilibs:: Support for multilibs. @@ -8451,6 +8451,11 @@ frequently smaller than gzipped archives. Generate a gzip tar archive of the distribution. @trindex dist-gzip +@item @code{dist-lzip} +Generate an @samp{lzip} tar archive of the distribution. @command{lzip} +archives are frequently smaller than @command{bzip2}-compressed archives. +@trindex dist-lzip + @item @code{dist-lzma} Generate an @samp{lzma} tar archive of the distribution. @command{lzma} archives are frequently smaller than @command{bzip2}-compressed archives. @@ -9001,6 +9006,12 @@ Cause @command{dejagnu}-specific rules to be generated. @xref{DejaGnu Tests}. Hook @code{dist-bzip2} to @code{dist}. @trindex dist-bzip2 +@item @option{dist-lzip} +@cindex Option, @option{dist-lzip} +@opindex dist-lzip +Hook @code{dist-lzip} to @code{dist}. +@trindex dist-lzip + @item @option{dist-lzma} @cindex Option, @option{dist-lzma} @opindex dist-lzma @@ -9273,7 +9284,8 @@ In order to use this option with C sources, you should add These three mutually exclusive options select the tar format to use when generating tarballs with @samp{make dist}. (The tar file created is then compressed according to the set of @option{no-dist-gzip}, -@option{dist-bzip2}, @option{dist-xz} and @option{dist-tarZ} options in use.) +@option{dist-bzip2}, @option{dist-lzip}, @option{dist-tarZ} and +@option{dist-xz} options in use.) These options must be passed as arguments to @code{AM_INIT_AUTOMAKE} (@pxref{Macros}) because they can require additional configure checks. @@ -9345,7 +9357,7 @@ the @code{AM_INIT_AUTOMAKE} macro in @file{configure.ac}. There are a few rules and variables that didn't fit anywhere else. @menu -* Tags:: Interfacing to etags and mkid +* Tags:: Interfacing to cscope, etags and mkid * Suffixes:: Handling new file extensions * Multilibs:: Support for multilibs. @end menu @@ -9407,6 +9419,14 @@ Automake will also generate an @code{ID} rule that will run directory-by-directory basis. @trindex id +Similarly, the @code{cscope} rule will create a list of all the source +files in the tree and run @command{cscope} to build an inverted index +database. The variable @code{CSCOPE} is the name of the program to invoke +(by default @command{cscope}); @code{CSCOPEFLAGS} and +@code{CSCOPE_ARGS} can be used by the user to pass additional flags and +file names respectively, while @code{AM_CSCOPEFLAGS} can be used by the +@file{Makefile.am}. + Finally, Automake also emits rules to support the @uref{http://www.gnu.org/software/global/, GNU Global Tags program}. The @code{GTAGS} rule runs Global Tags and puts the @@ -12947,4 +12967,4 @@ parentheses is the number of generated test cases. @c LocalWords: LTALLOCA MALLOC malloc memcmp strdup alloca libcompat xyz DFOO @c LocalWords: unprefixed buildable preprocessed DBAZ DDATADIR WARNINGCFLAGS @c LocalWords: LIBFOOCFLAGS LIBFOOLDFLAGS ftable testSubDir obj LIBTOOLFLAGS -@c LocalWords: barexec Pinard's automatize initialize lzma xz +@c LocalWords: barexec Pinard's automatize initialize lzip lzma xz cscope diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm index eb208c3..57948bd 100644 --- a/lib/Automake/ChannelDefs.pm +++ b/lib/Automake/ChannelDefs.pm @@ -44,7 +44,7 @@ Automake::ChannelDefs - channel definitions for Automake and helper functions verb ($MESSAGE, [%OPTIONS]); switch_warning ($CATEGORY); parse_WARNINGS (); - parse_warning ($OPTION, $ARGUMENT); + parse_warnings ($OPTION, $ARGUMENT); Automake::ChannelDefs::set_strictness ($STRICTNESS_NAME); =head1 DESCRIPTION @@ -163,6 +163,10 @@ register_channel 'verb', type => 'debug', silent => 1, uniq_part => UP_NONE, ordered => 0; register_channel 'note', type => 'debug', silent => 0; +setup_channel_type 'warning', header => 'warning: '; +setup_channel_type 'error', header => 'error: '; +setup_channel_type 'fatal', header => 'error: '; + =head2 FUNCTIONS =over 4 @@ -308,7 +312,7 @@ sub parse_WARNINGS () } } -=item C +=item C Parse the argument of C<--warning=CATEGORY> or C<-WCATEGORY>. @@ -365,7 +369,7 @@ sub set_strictness ($) } else { - prog_error "level `$name' not recognized\n"; + prog_error "level `$name' not recognized"; } } @@ -381,6 +385,8 @@ Written by Alexandre Duret-Lutz EFE. =cut +1; + ### Setup "GNU" style for perl-mode and cperl-mode. ## Local Variables: ## perl-indent-level: 2 diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm index b4908c0..aeed4db 100644 --- a/lib/Automake/Channels.pm +++ b/lib/Automake/Channels.pm @@ -164,7 +164,7 @@ functions. The possible keys, with their default value are: The type of the channel. One of C<'debug'>, C<'warning'>, C<'error'>, or C<'fatal'>. Fatal messages abort the program when they are output. Error messages update the exit status. Debug and warning messages are -harmless, except that warnings can be treated as errors of +harmless, except that warnings are treated as errors if C<$warnings_are_errors> is set. =item C 1> @@ -204,10 +204,14 @@ C, and C constants above. =item C
''> A string to prepend to each message emitted through this channel. +With partial messages, only the first part will have C
+prepended. =item C