diff options
| author | Alexandre Duret-Lutz <adl@gnu.org> | 2005-02-06 10:22:29 +0000 |
|---|---|---|
| committer | Alexandre Duret-Lutz <adl@gnu.org> | 2005-02-06 10:22:29 +0000 |
| commit | a2ca2620963958dbca3bb24ae87e96eefaf1014c (patch) | |
| tree | b83a1c8a6da2cc4a0bb8f24f9b96f7e593b73c08 /aclocal.in | |
| parent | 30df17be3b928539aa757ff87b1ff9ea3b66e853 (diff) | |
| download | automake-a2ca2620963958dbca3bb24ae87e96eefaf1014c.tar.gz | |
* aclocal.in ($serial_line_rx): Allow trailing garbage after the
serial number.
(scan_file): Explicitly mark the "ill-formed serial" message
as a warning.
* doc/automake.texi (aclocal options, Local Macros): Link to...
(Serials): ... this new section.
Diffstat (limited to 'aclocal.in')
| -rw-r--r-- | aclocal.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/aclocal.in b/aclocal.in index a071cfdcd..5667cd1df 100644 --- a/aclocal.in +++ b/aclocal.in @@ -132,7 +132,7 @@ my $ac_require_rx = "AC_REQUIRE\\((?:\\[([^]]+)\\]|([^],)\n]+))\\)"; my $m4_include_rx = "(?:m4_)?s?include\\((?:\\[([^]]+)\\]|([^],)\n]+))\\)"; # Match a serial number -my $serial_line_rx = '^#\s*serial\s*(.*?)\s*$'; +my $serial_line_rx = '^#\s*serial\s*(\S*)'; my $serial_number_rx = '^\d+(?:\.\d+)*$'; ################################################################ @@ -421,8 +421,8 @@ sub scan_file ($$$) if ($number !~ /$serial_number_rx/go) { msg ('syntax', "$file:$.", - "malformed serial number `$number', " - . "expecting only digits and dots"); + "warning: ill-formed serial number `$number', " + . "expecting a version string with only digits and dots"); } elsif ($defun_seen) { |