From: Ralf Wildenhues Date: Tue, 5 May 2009 05:39:16 +0000 (+0200) Subject: libtoolize: ignore trailing junk on scriptversion line. X-Git-Tag: v2.2.6b~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c920a14ab7040428e51629a391efbd85073258d0;p=thirdparty%2Flibtool.git 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 --- diff --git a/ChangeLog b/ChangeLog index 71fc948ff..330d2228e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2009-05-05 Ralf Wildenhues + + 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 Fix typo in Makefile.maint. diff --git a/libtoolize.m4sh b/libtoolize.m4sh index 42e07df74..75e2d23f6 100644 --- 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