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.7b~91 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4c14adc49a89beccbecb6177c8fae4d13040b9d;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 4e3ceb2fc..862860ad9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +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. + 2009-05-02 Ralf Wildenhues Skip localization test when setlocale is not functional. diff --git a/libtoolize.m4sh b/libtoolize.m4sh index 27f17a754..bff700a5c 100644 --- a/libtoolize.m4sh +++ b/libtoolize.m4sh @@ -1021,6 +1021,7 @@ func_install_update () $opt_debug my_sed_install=' /^scriptversion='\''*[0-9][1-9.-]*'\''*/ { + s,[#;].*,, s,^scriptversion='\''*\([0-9.-]*\)'\''*,\1, s/-/./g p