Mercurial > octave-nkf
changeset 10347:dcee31e49f86
update bootstrap script from gnulib/build-aux/bootstrap
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 22 Feb 2010 14:59:55 -0500 |
| parents | 65d5776379c3 |
| children | df1df5f0c236 |
| files | ChangeLog bootstrap |
| diffstat | 2 files changed, 18 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Feb 21 18:04:59 2010 +0000 +++ b/ChangeLog Mon Feb 22 14:59:55 2010 -0500 @@ -1,3 +1,7 @@ +2010-02-22 John W. Eaton <jwe@octave.org> + + * boostrap: Update from gnulib/build-aux/bootstrap. + 2010-02-21 Michael Goffioul <michael.goffioul@gmail.com> * configure.ac: Define NOMINMAX under MSVC.
--- a/bootstrap Sun Feb 21 18:04:59 2010 +0000 +++ b/bootstrap Mon Feb 22 14:59:55 2010 -0500 @@ -2,7 +2,7 @@ # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2009 Free Software Foundation, Inc. +# Copyright (C) 2003-2010 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -188,8 +188,8 @@ eval "export $find_tool_envvar" } -# Find sha1sum, named gsha1sum on MacPorts. -find_tool SHA1SUM sha1sum gsha1sum +# Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6. +find_tool SHA1SUM sha1sum gsha1sum shasum # Override the default configuration, if necessary. # Make sure that bootstrap.conf is sourced from the current directory @@ -314,10 +314,20 @@ $app --version >/dev/null 2>&1 || return 1 $app --version 2>&1 | - sed -n 's/[^0-9.]*\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/p + sed -n '# extract version within line + s/.*[v ]\{1,\}\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/ + t done + + # extract version at start of line + s/^\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/ t done + d + :done + #the following essentially does s/5.005/5.5/ + s/\.0*\([1-9]\)/.\1/g + p q' }