libtoolize: ignore trailing junk on scriptversion line.

* libtoolize.m4sh (func_install_update): Ignore semi-colon or
comment-sign and all following characters when parsing a
`scriptversion' line in one of the auxiliary scripts; recent
Automake-provided script have a stylized comment to induce
Emacs to use UTC.
Exposed by the `libtoolize config files serial update' test.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 71fc948ff8e8ce5b13cc91b60c2ce6b63dbac74d..330d2228e03432eb90e2853d9e16ebfe276a98a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-05-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       libtoolize: ignore trailing junk on scriptversion line.
+       * libtoolize.m4sh (func_install_update): Ignore semi-colon or
+       comment-sign and all following characters when parsing a
+       `scriptversion' line in one of the auxiliary scripts; recent
+       Automake-provided script have a stylized comment to induce
+       Emacs to use UTC.
+       Exposed by the `libtoolize config files serial update' test.
+
+
 2008-09-07  Gary V. Vaughan  <gary@gnu.org>
 
        Fix typo in Makefile.maint.

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 42e07df74d622dbe6608d425dde3b0c9a9ffdcaf..75e2d23f69c53eb15ce7bd6455e964ae22083923 100644 (file)
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -1017,6 +1017,7 @@ func_install_update ()
     $opt_debug
     my_sed_install='
        /^scriptversion='\''*[0-9][1-9.-]*'\''*/ {
+           s,[#;].*,,
            s,^scriptversion='\''*\([0-9.-]*\)'\''*,\1,
            s/-/./g
            p