diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2009-05-23 22:06:07 +0200 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2009-05-23 22:06:07 +0200 |
| commit | 32e88686a445c06126ef473460d9762d19d5ae8d (patch) | |
| tree | 06e28d7c4cc547b72c72661a1930bd454759aafb /lib/Automake/Options.pm | |
| parent | 639f95c3acd69e47fd2fb43edeb8103c253026fe (diff) | |
| download | automake-32e88686a445c06126ef473460d9762d19d5ae8d.tar.gz | |
Clarify how to enable `silent-rules' and other global options.
* doc/automake.texi (Options): When introducing options, be more
careful to note that not all of them can be specified in
AUTOMAKE_OPTIONS statements, and that some do not make sense in
subdirectories. Note more prominently that `silent-rules' can
only be specified in configure.ac.
* lib/Automake/Options.pm (_process_option_list): Improve error
message for `silent-rules', `tar-v7', `tar-ustar', `tar-pax'
options specified in Makefile.am files.
Report by Bruno Haible.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Diffstat (limited to 'lib/Automake/Options.pm')
| -rw-r--r-- | lib/Automake/Options.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm index d1044148e..cacc7d2e1 100644 --- a/lib/Automake/Options.pm +++ b/lib/Automake/Options.pm @@ -279,13 +279,15 @@ sub _process_option_list (\%$@) elsif ($_ eq 'silent-rules') { error ($where, - "option `$_' must be an argument of AM_INIT_AUTOMAKE") + "option `$_' can only be used as argument to AM_INIT_AUTOMAKE\n" + . "but not in AUTOMAKE_OPTIONS makefile statements") if $where->get !~ /^configure\./; } elsif ($_ eq 'tar-v7' || $_ eq 'tar-ustar' || $_ eq 'tar-pax') { error ($where, - "option `$_' must be an argument of AM_INIT_AUTOMAKE") + "option `$_' can only be used as argument to AM_INIT_AUTOMAKE\n" + . "but not in AUTOMAKE_OPTIONS makefile statements") if $where->get !~ /^configure\./; for my $opt ('tar-v7', 'tar-ustar', 'tar-pax') { |