Ralf Wildenhues [Sun, 25 Apr 2010 16:26:14 +0000 (18:26 +0200)]
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.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 25 Apr 2010 16:44:53 +0000 (18:44 +0200)]
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.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 25 Apr 2010 16:44:41 +0000 (18:44 +0200)]
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.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 25 Apr 2010 16:49:18 +0000 (18:49 +0200)]
Merge branch 'maint' into foo
Ralf Wildenhues [Sun, 25 Apr 2010 15:19:54 +0000 (17:19 +0200)]
Fix typo in manual.
* doc/automake.texi (Simple Tests using parallel-tests): Add
missing closing parenthesis.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 25 Apr 2010 15:19:13 +0000 (17:19 +0200)]
Fix leftover call to removed function macros_dump.
* automake.in (read_main_am_file): Call variables_dump, not
macros_dump. Print actual error before list of variables.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Thu, 22 Apr 2010 20:34:29 +0000 (22:34 +0200)]
Minor improvements in comments of silent3.test.
* tests/silent3.test: Tell to keep it in sync with `silent9.test'
too.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 25 Apr 2010 09:42:23 +0000 (11:42 +0200)]
testsuite: ensure verbose printing of captured output.
* tests/acloca14.test, tests/acloca18.test, tests/aclocal.test,
tests/fort2.test, tests/help.test, tests/missing3.test,
tests/missing6.test: Print captured stdout or stderr before
grepping it.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Thu, 8 Apr 2010 15:40:02 +0000 (17:40 +0200)]
Make badopt.test stricter (by enabling `set -e').
* tests/badopt.test: Add call to `set -e'. Due to this change,
an unexpected failure in the call to `$ACLOCAL' (whose outcome
was previously unchecked) would cause the whole test to fail.
Also, bumped the copyright years.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Tue, 20 Apr 2010 19:02:15 +0000 (21:02 +0200)]
Make test for configure.in vs. configure.ac stricter.
* tests/configure.test: Use a configure.in file that provokes
an automake error, to ensure configure.ac is preferred.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Fri, 9 Apr 2010 16:24:34 +0000 (18:24 +0200)]
Use `set -e' in confsub.test (avoid false negatives).
* tests/confsub.test: Enable shell `errexit' flag, and related
changes (this helps avoiding some possible minor false negatives).
Also, bumped copyright years.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Tue, 20 Apr 2010 09:26:28 +0000 (11:26 +0200)]
Typofix in older changelog entry.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Tue, 20 Apr 2010 05:47:11 +0000 (07:47 +0200)]
Merge branch 'maint'
Ralf Wildenhues [Tue, 20 Apr 2010 05:43:59 +0000 (07:43 +0200)]
Fix -Werror handling for presence of configure.in and configure.ac.
* lib/Automake/Variable.pm (Automake::Variable): Do not initialize
$configure_ac at the global level, before command-line arguments
have been parsed.
(require_variables): Initialize it here.
* tests/configure.test: New test.
* tests/Makefile.am: Update.
Report by Stefano Lattarini.
Stefano Lattarini [Fri, 9 Apr 2010 14:33:43 +0000 (16:33 +0200)]
Avoid possible false negatives in confh5.test.
* tests/confh5.test: Enable shell `errexit' flag, and bumped
copyright years. Due to this change, any unexpected failure
in calls to $ACLOCAL, $AUTOMAKE, $AUTOCONF or $AUTOHEADER, or
a failure in grepping expected text in output files should now
cause the whole test to fail.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sat, 17 Apr 2010 13:51:11 +0000 (15:51 +0200)]
Fix botched ChangeLog entry.
Stefano Lattarini [Sat, 17 Apr 2010 13:40:35 +0000 (15:40 +0200)]
Fix typo in POD documentation of Automake::Channels.
* lib/Automake/Channels.pm: Fixed typo in POD documentation:
@<...> was used instead of C<...>.
Stefano Lattarini [Wed, 14 Apr 2010 11:52:51 +0000 (13:52 +0200)]
Refactor tests on Automake TESTS color output.
* tests/color.test: Tests using the expect program moved out to...
* tests/color2.test: ... this new file.
* tests/Makefile.am (TESTS): Extended accordingly.
Stefano Lattarini [Sun, 11 Apr 2010 20:34:18 +0000 (22:34 +0200)]
Fix typos in comments in test confh5.test
* tests/confh5.test: Fix a couple of typos in comments.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Thu, 8 Apr 2010 16:30:29 +0000 (18:30 +0200)]
Avoid possible false negatives in canon-name.test.
* tests/canon-name.test: Enable shell `errexit' flag. Improve
test description.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 11 Apr 2010 20:00:09 +0000 (22:00 +0200)]
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.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 11 Apr 2010 19:30:34 +0000 (21:30 +0200)]
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.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 11 Apr 2010 19:04:13 +0000 (21:04 +0200)]
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.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 11 Apr 2010 18:49:38 +0000 (20:49 +0200)]
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.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 11 Apr 2010 18:31:19 +0000 (20:31 +0200)]
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.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 11 Apr 2010 18:04:01 +0000 (20:04 +0200)]
Merge branch 'maint'
Ralf Wildenhues [Sun, 11 Apr 2010 17:56:21 +0000 (19:56 +0200)]
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
treated afterwards by the same thread, causing inconsistent
and unstable exit status values.
* lib/Automake/Channels.pm (dup_channel_setup)
(drop_channel_setup): Save and restore the setting of
$warnings_are_errors.
* tests/werror3.test: New test.
* tests/Makefile.am: Adjust.
* NEWS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sun, 11 Apr 2010 17:53:35 +0000 (19:53 +0200)]
Bugfix in confh5.test w.r.t. Solaris/Heirloom Sh.
* tests/confh5.test: In the generated Makefile.am: do not use
`test ! -e FILE' to check for the non-existence of a file, since
that is not supported by Solarish/Heirloom Sh.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Thu, 8 Apr 2010 23:27:23 +0000 (01:27 +0200)]
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.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Thu, 8 Apr 2010 08:54:16 +0000 (10:54 +0200)]
Make test `aclocal3.test' stricter.
* tests/aclocal3.test: Add call to `set -e'. Fail if $ACLOCAL
succeds unexpectedly.
Make test `aclocal3.test' stricter.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Wed, 31 Mar 2010 21:41:01 +0000 (23:41 +0200)]
Check that symlinks are resolved by `make dist'.
* tests/distlinks.test: New test.
* tests/Makefile.am (TESTS): Updated accordingly.
Suggested by observations from Ralf Wildenhues.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 11 Apr 2010 17:43:20 +0000 (19:43 +0200)]
Use -9 for maximum xz compression with dist-xz.
* lib/am/distdir.am (dist-xz, dist, dist-all): Pass -9 to xz.
* NEWS, THANKS: Update.
Report by Pavel Sanda.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sun, 7 Mar 2010 14:48:10 +0000 (15:48 +0100)]
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.
Ralf Wildenhues [Sun, 4 Apr 2010 06:44:53 +0000 (08:44 +0200)]
Merge branch 'maint'
Stefano Lattarini [Tue, 30 Mar 2010 15:36:13 +0000 (17:36 +0200)]
Avoid an unportable use of `$status' shell variable.
* Makefile.am (path-check): Don't use the `$status' shell variable
in the target's rules, as it's special in Zsh (equivalent to `$?',
and readonly).
Stefano Lattarini [Tue, 30 Mar 2010 15:12:27 +0000 (17:12 +0200)]
Avoid another use of `chmod -R'.
* Makefile.am (path-check): To be safe, do not use `chmod -R' on
$(distdir) before removing it (as Solaris `chmod -R' touches
symlink targets). Instead, use the cleanup strategy used in
distdir.am (which is also employed in tests/defs.in).
Ralf Wildenhues [Sun, 28 Mar 2010 16:06:22 +0000 (18:06 +0200)]
Merge branch 'maint'
Ralf Wildenhues [Sun, 28 Mar 2010 15:56:50 +0000 (17:56 +0200)]
Remove uses of @acronym and @sc.
* doc/automake.texi (Public Macros, Limitations on File Names):
Remove all usage of @acronym and @sc in the manual.
Suggested by Karl Berry.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Karl Berry [Sat, 13 Mar 2010 11:18:54 +0000 (12:18 +0100)]
GNU hello uses fdl.texi, not gpl.texi.
* doc/automake.texi (Texinfo): Adjust example to upstream
change.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 13 Mar 2010 10:42:17 +0000 (11:42 +0100)]
Fix ChangeLog entry.
Ralf Wildenhues [Sat, 6 Mar 2010 08:35:46 +0000 (09:35 +0100)]
Merge branch 'maint'
Ralf Wildenhues [Sat, 6 Mar 2010 08:14:06 +0000 (09:14 +0100)]
Formatting cleanups in macro comments.
* automake.in, lib/Automake/Channels.pm,
lib/Automake/FileUtils.pm, lib/Automake/Options.pm,
lib/Automake/Variable.pm, lib/Automake/XFile.pm,
m4/options.m4, m4/substnot.m4: Fix macro comment format.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Fri, 5 Mar 2010 20:29:38 +0000 (21:29 +0100)]
Merge branch 'maint'
Stefano Lattarini [Thu, 4 Mar 2010 19:22:17 +0000 (20:22 +0100)]
Avoid generation of `tests/defs-p' file
* tests/defs.in: In the generated `configure.in' snippet: call
`AM_INIT_AUTOMAKE' with the `parallel-tests' option if the shell
variable `parallel_tests' is set to `yes'.
* tests/Makefile.am (defs-p): Target removed.
(check_SCRIPTS): Removed `defs-p'.
(clean-local-check): Do not unlink `defs-p' anymore.
($(parallel_tests)): Transformation rules for the test scripts
adjusted.
* tests/gen-parallel-tests: Selection rules for the test
scripts adjusted.
* tests/parallel-tests.test: Set `$parallel_tests' to `yes'
then include `./defs' (rather than simply including `./defs-p').
* tests/parallel-tests2.test: Likewise.
* tests/parallel-tests3.test: Likewise.
* tests/parallel-tests4.test: Likewise.
* tests/parallel-tests5.test: Likewise.
* tests/parallel-tests6.test: Likewise.
* tests/parallel-tests7.test: Likewise.
* tests/parallel-tests8.test: Likewise.
* tests/parallel-tests9.test: Likewise.
* tests/parallel-tests10.test: Likewise.
* tests/README (Section "Writing Test Cases", subsection "Do"):
Adjusted the parts referring to tests checking `parallel-tests'
behaviour. Some other minor related improvements.
* tests/.gitignore (defs-p): Removed.
Stefano Lattarini [Thu, 4 Mar 2010 20:09:13 +0000 (21:09 +0100)]
Remove redundant unset of variable TESTS from some test scripts.
* tests/color.test: Do not unset the `TESTS' variable, as it's
already unset in the `defs' file.
* tests/check5.test: Likewise.
* tests/check8.test: Likewise.
* tests/check9.test: Likewise.
* tests/check10.test: Likewise.
* tests/check11.test: Likewise.
* tests/parallel-tests.test: Likewise.
* tests/parallel-tests3.test: Likewise.
* tests/parallel-tests4.test: Likewise.
* tests/parallel-tests5.test: Likewise.
* tests/parallel-tests6.test: Likewise.
* tests/parallel-tests7.test: Likewise.
Stefano Lattarini [Thu, 4 Mar 2010 02:32:35 +0000 (03:32 +0100)]
Fix typo in ChangeLog entry.
Ralf Wildenhues [Mon, 1 Mar 2010 19:43:25 +0000 (20:43 +0100)]
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.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Wed, 24 Feb 2010 18:56:26 +0000 (19:56 +0100)]
Merge branch 'lzip-support'
* lzip-support:
Add lzip compression support.
Antonio Diaz Diaz [Wed, 24 Feb 2010 18:41:59 +0000 (19:41 +0100)]
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.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Mon, 22 Feb 2010 21:16:34 +0000 (22:16 +0100)]
Merge branch 'maint'
Karl Berry [Mon, 22 Feb 2010 21:08:43 +0000 (22:08 +0100)]
Improve help message of mdate-sh.
* mdate-sh: mention actual output format in help message.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Mon, 22 Feb 2010 17:53:51 +0000 (18:53 +0100)]
Deprecate dist-lzma in favor of dist-xz.
* doc/automake.texi (The Types of Distributions, Options):
Adjust text to reflect renaming of lzma to xz.
* NEWS: Update.
Missing deprecation noted by Antonio Diaz Diaz.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sat, 20 Feb 2010 16:38:19 +0000 (17:38 +0100)]
Add tests about support of wildcards in EXTRA_DIST.
* tests/extra10.test: New test, check basic support of wildcards
in EXTRA_DIST.
* tests/extra11.test: New test, check more complex usage of
wildcards in EXTRA_DIST.
* tests/extra11.test: New test, check usage of wildcards in
EXTRA_DIST when $builddir != $srcdir.
* tests/Makefile.am (TESTS): Updated accordingly.
Necessity of these new tests suggested by Braden McDaniel
and Ralf Wildenhues.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Mon, 8 Feb 2010 06:33:03 +0000 (07:33 +0100)]
Merge branch 'maint'
Simon Josefsson [Mon, 8 Feb 2010 06:32:20 +0000 (07:32 +0100)]
Fix copyright statement in gnupload script.
* lib/gnupload: Fix copyright statement.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 6 Feb 2010 19:48:26 +0000 (20:48 +0100)]
Merge branch 'maint'
Dmitry V. Levin [Sat, 30 Jan 2010 19:21:19 +0000 (22:21 +0300)]
Fix exit status of signal handlers in shell scripts.
The value of `$?' on entrance to signal handlers in shell scripts
cannot be relied upon, so set the exit code explicitly to
128 + SIG<SIGNAL>.
* lib/am/check.am (am__check_pre): Use `exit 143' in signal handler.
* lib/elisp-comp: Likewise.
* lib/install-sh: Likewise.
* lib/ylwrap: Likewise. Also, fix script to trap signal 13, not 3.
* NEWS, THANKS: Update.
Bug report, analysis, and initial patch by Dmitry V. Levin.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Karl Berry [Sat, 6 Feb 2010 17:27:55 +0000 (18:27 +0100)]
Improve gnupload usage text.
* gnupload (usage): Shorten to make more likely to fit on a tty
line. Mention CMD in the synopsis. With ..., plural is implied.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 6 Feb 2010 17:21:52 +0000 (18:21 +0100)]
Use --email with gendocs.sh.
* HACKING: Set bug reporting address in gendocs.sh command.
Christos Kontas [Sat, 23 Jan 2010 21:23:08 +0000 (23:23 +0200)]
Fix some typos in the manual
* doc/automake.texi (Nested Packages, Rebuilding): Fix typos.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 24 Jan 2010 11:37:36 +0000 (12:37 +0100)]
Merge branch 'je-silent'
* je-silent:
Fix silent-rules output for disabled dependency tracking.
Ralf Wildenhues [Sun, 24 Jan 2010 11:36:47 +0000 (12:36 +0100)]
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 <ldv@altlinux.org>.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 17 Jan 2010 13:22:56 +0000 (14:22 +0100)]
Merge branch 'maint'
Stefano Lattarini [Sun, 17 Jan 2010 13:20:15 +0000 (14:20 +0100)]
Slighty improve tests acoutbs.test and acoutbs2.test.
* tests/acoutbs2.test: Enable `errexit' shell flag. Check that
autoconf and configure work, that the file `zot' is created by
configure, and that no file containing a backslash in its name is
created.
* tests/acoutbs.test: Likewise, plus updated copyright years.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sun, 17 Jan 2010 13:18:39 +0000 (14:18 +0100)]
Fix test acoutbs2.test.
* tests/acoutbs2: In the generated configure.in: add proper calls
to AC_INIT and AM_INIT_AUTOMAKE, and remove explicit definition of
PACKAGE and VERSION. Add a call to aclocal before calling automake.
Updated copyright years.
* tests/Makefile.am (XFAIL_TESTS): Removed acoutbs2.test.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sun, 17 Jan 2010 13:15:15 +0000 (14:15 +0100)]
Add forgotten test scripts to $(TESTS).
* tests/Makefile.am (TESTS): Added test scripts present on the
filesystem, which were erroneously left out from $(TESTS):
acoutbs2.test, badopt.test, extra2.test.
(XFAIL_TESTS): Added acoutbs2.test.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 17 Jan 2010 12:48:16 +0000 (13:48 +0100)]
Sync auxiliary files from upstream.
* INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub:
Sync from upstream.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 17 Jan 2010 11:08:50 +0000 (12:08 +0100)]
Merge branch 'maint'
Ralf Wildenhues [Sun, 17 Jan 2010 11:08:19 +0000 (12:08 +0100)]
Bump copyright years.
* aclocal.in (write_aclocal, version): Bump copyright years.
* automake.in (gen_copyright, version): Likewise.
* doc/automake.texi: Likewise.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 17 Jan 2010 11:06:44 +0000 (12:06 +0100)]
Merge branch 'maint'
* maint:
Rotate ChangeLog.
This is a faked merge, to ensure that the ChangeLog.09 file
represents the contents from master, not from maint.
Ralf Wildenhues [Sun, 17 Jan 2010 11:03:48 +0000 (12:03 +0100)]
Rotate ChangeLog.
* ChangeLog.09: New file, rotated from ...
* ChangeLog: ... here.
* Makefile.am (EXTRA_DIST): Distribute ChangeLog.09.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 17 Jan 2010 10:30:57 +0000 (11:30 +0100)]
Merge branch 'maint'
Ralf Wildenhues [Tue, 29 Dec 2009 18:42:41 +0000 (19:42 +0100)]
Fix and complete copyright notices in Makefile.am files.
* Makefile.am: Use single-`#' comment for copyright notice, so
that it also appears in the generated Makefile.in file.
* doc/Makefile.am: Likewise.
* doc/amhello/Makefile.am: Likewise.
* doc/amhello/src/Makefile.am: Likewise.
* lib/Automake/Makefile.am: Likewise.
* lib/Automake/tests/Makefile.am: Likewise.
* lib/Makefile.am: Likewise.
* lib/am/Makefile.am: Likewise.
* m4/Makefile.am: Likewise.
* tests/Makefile.am: Add copyright notice.
Report of missing copyright notice by Stefano Lattarini.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sun, 27 Dec 2009 14:52:38 +0000 (15:52 +0100)]
Fixed typo in Makefile.am (extra semicolon removed)
* Makefile.am (sc_diff_automake_in_automake): Removed an extra
semicolon in target's rules, which prevented a stdout redirection
from working.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Mon, 21 Dec 2009 21:24:37 +0000 (22:24 +0100)]
Merge branch 'maint'
Julien Danjou [Mon, 21 Dec 2009 21:24:02 +0000 (22:24 +0100)]
Add support for newer python version
* m4/python.m4 (AM_PATH_PYTHON): Add python3.1 to
_AM_PYTHON_INTERPRETER_LIST.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Karl Berry [Mon, 21 Dec 2009 21:22:31 +0000 (22:22 +0100)]
mention ncftpput in gnupload --help
* lib/gnupload: Mention ncftpput in `--help' output.
Report by Bruce Korb.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 6 Dec 2009 15:25:04 +0000 (16:25 +0100)]
Merge branch 'maint'
Ralf Wildenhues [Sun, 6 Dec 2009 15:23:47 +0000 (16:23 +0100)]
Update NEWS.
* NEWS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 5 Dec 2009 14:11:07 +0000 (15:11 +0100)]
Merge branch 'maint'
Ralf Wildenhues [Sat, 5 Dec 2009 14:10:11 +0000 (15:10 +0100)]
Regenerate files with Autoconf 2.65.
Antonio Diaz Diaz [Sat, 5 Dec 2009 13:45:30 +0000 (14:45 +0100)]
Replace unlzma, gunzip, bunzip2 with pack tool -d invocation.
* lib/am/distdir.am (distcheck): Use lzma -d, gzip -d, bzip2 -d,
instead of the respective un$tool invocation, to avoid depending
on another tool.
* THANKS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 5 Dec 2009 13:39:15 +0000 (14:39 +0100)]
Use $DJDIR rather than $DJGPP to detect running on DJGPP.
* automake.in (Language): Use $ENV{'DJDIR'} for the
$ENV{'SHELL'} override.
* bootstrap: Use $DJDIR for setting BOOTSTRAP_SHELL, to fix
bootstrapping under MinGW when $DJGPP has been set.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 5 Dec 2009 13:28:58 +0000 (14:28 +0100)]
Merge branch 'jk-silent'
* jk-silent:
Fix requirements of silent8.test.
Ralf Wildenhues [Sat, 5 Dec 2009 13:28:20 +0000 (14:28 +0100)]
Fix requirements of silent8.test.
* tests/silent8.test: Require makeinfo --html, tex, texi2dvi -o,
dvips.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 5 Dec 2009 13:13:43 +0000 (14:13 +0100)]
Do not rely on Perl symlink status, for MSYS perl.
* automake.in (require_file_internal): Ensure presence of
symlink target file; MSYS perl symlink doesn't return an error
status when the file could not be created (copied, on this
system). Fixes symlink.test failure.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Fri, 4 Dec 2009 14:47:23 +0000 (15:47 +0100)]
Avoid Solaris sh `set -e' bug in vala4.test.
* tests/vala4.test: New variable $cwd, holding the full path of the
current directory. Use it instead of `pwd` command substitution,
to avoid Heirloom/Solaris Sh bug with `set -e'.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Fri, 4 Dec 2009 17:15:57 +0000 (18:15 +0100)]
Remove executable bit from automake.in
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.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Fri, 4 Dec 2009 17:40:50 +0000 (18:40 +0100)]
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.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Mon, 30 Nov 2009 21:38:23 +0000 (22:38 +0100)]
Merge branch 'maint'
Jim Meyering [Sat, 28 Nov 2009 20:05:33 +0000 (21:05 +0100)]
do not put world-writable directories in distribution tarballs
* lib/am/distdir.am (distdir): Do not make all directories
group- or world-writable. Instead, use 755.
* tests/subpkg4.test (test-distdir-is-readable): Check for new,
more restricted permissions.
Ralf Wildenhues [Sun, 29 Nov 2009 21:27:48 +0000 (22:27 +0100)]
Merge branch 'maint'
Karl Berry [Sun, 29 Nov 2009 20:48:13 +0000 (21:48 +0100)]
Rewrite `gnupload --help' examples.
* lib/gnupload: Use GNU style version numbers, a generic package
name, and more useful examples.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Jim Meyering [Sun, 29 Nov 2009 19:35:03 +0000 (20:35 +0100)]
avoid a warning from perl-5.11
* lib/Automake/Wrap.pm (_tab_length): Remove useless use of tr's
"/d" modifier.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 15 Nov 2009 19:32:29 +0000 (20:32 +0100)]
Merge branch 'perl-coverage'
* perl-coverage:
Coverage for corner cases in derive_suffix.
Coverage for user-provided _LINK variables.
Coverage: warn about substitutions that need EXTRA_PRIMARY.
Coverage: warn about configure substitution in EXTRA_PRIMARY.
Coverage for syntax errors with conditionals in included fragments.
Coverage: diagnose variables with forbidden dist_ prefix.
Coverage for conditional `else' and `endif' arguments.
Ralf Wildenhues [Sat, 14 Nov 2009 20:58:34 +0000 (21:58 +0100)]
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.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 14 Nov 2009 20:58:01 +0000 (21:58 +0100)]
Coverage for user-provided _LINK variables.
* tests/link_override.test: New test.
* tests/Makefile.am: Adjust.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 14 Nov 2009 20:57:37 +0000 (21:57 +0100)]
Coverage: warn about substitutions that need EXTRA_PRIMARY.
* tests/extra9.test: New test.
* tests/Makefile.am: Adjust.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 14 Nov 2009 20:57:11 +0000 (21:57 +0100)]
Coverage: warn about configure substitution in EXTRA_PRIMARY.
* tests/subst5.test: New test.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 14 Nov 2009 20:56:49 +0000 (21:56 +0100)]
Coverage for syntax errors with conditionals in included fragments.
* tests/condinc2.test: Amend test.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
projects / platform / upstream / automake.git / log