projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup after gl_FUNC_READLINK, for gl_FUNC_SYMLINK test
[gnulib.git]
/
build-aux
/
bootstrap
diff --git
a/build-aux/bootstrap
b/build-aux/bootstrap
index
7c4882d
..
7781446
100755
(executable)
--- a/
build-aux/bootstrap
+++ b/
build-aux/bootstrap
@@
-2,7
+2,7
@@
# Bootstrap this package from checked-out sources.
# Bootstrap this package from checked-out sources.
-# Copyright (C) 2003-20
09
Free Software Foundation, Inc.
+# Copyright (C) 2003-20
10
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
# 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
@@
-311,20
+311,23
@@
sort_ver() { # sort -V is not generally available
get_version() {
app=$1
get_version() {
app=$1
- # perl 5.11's --version output does not fit the mold,
- # handle perl as a special case.
- if test "_$app" = _perl; then
- perl -le 'print $]' || return 1
- return 0
- fi
-
$app --version >/dev/null 2>&1 || return 1
$app --version 2>&1 |
$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
t done
+
d
d
+
:done
:done
+ #the following essentially does s/5.005/5.5/
+ s/\.0*\([1-9]\)/.\1/g
+ p
q'
}
q'
}