diff options
author | Glenn Morris <[email protected]> | 2014-05-02 13:40:09 -0400 |
---|---|---|
committer | Glenn Morris <[email protected]> | 2014-05-02 13:40:09 -0400 |
commit | 5253ea1dcb59177969a5c8b144bef4d3e84ee3fe (patch) | |
tree | 4a6e30a3cfaf3b397e2034760219af1002329d7b /autogen.sh | |
parent | 0e5c3cad74e1abf04f94feae9cc172131f303fd9 (diff) |
autogen.sh: minor tweaks
* autogen.sh (get_version): Handle no leading whitespace.
(check_version, main): Handle program names with hyphens.
Diffstat (limited to 'autogen.sh')
-rwxr-xr-x | autogen.sh | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/autogen.sh b/autogen.sh index 880f21f0fe..255a4d75ba 100755 --- a/autogen.sh +++ b/autogen.sh @@ -50,7 +50,7 @@ automake_min=`sed -n 's/^ *AM_INIT_AUTOMAKE(\([0-9\.]*\)).*/\1/p' configure.ac` get_version () { ## Remove eg "./autogen.sh: line 50: autoconf: command not found". - $1 --version 2>&1 | sed -e '/not found/d' -n -e '1 s/.* \([1-9][0-9\.]*\).*/\1/p' + $1 --version 2>&1 | sed -e '/not found/d' -e 's/.* //' -n -e '1 s/\([0-9][0-9\.]*\).*/\1/p' } ## $1 = version string, eg "2.59" @@ -76,7 +76,7 @@ minor_version () check_version () { ## Respect eg $AUTOMAKE if it is set, like autoreconf does. - uprog=`echo $1 | sed 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + uprog=`echo $1 | sed -e 's/-/_/g' -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` eval uprog=\$${uprog} @@ -114,7 +114,9 @@ missing= for prog in $progs; do - eval min=\$${prog}_min + sprog=`echo "$prog" | sed 's/-/_/g'` + + eval min=\$${sprog}_min echo "Checking for $prog (need at least version $min)..." @@ -133,7 +135,7 @@ for prog in $progs; do if [ $retval -ne 0 ]; then missing="$missing $prog" - eval ${prog}_why=\""$stat"\" + eval ${sprog}_why=\""$stat"\" fi done @@ -147,7 +149,9 @@ Building Emacs from Bzr requires the following specialized programs: EOF for prog in $progs; do - eval min=\$${prog}_min + sprog=`echo "$prog" | sed 's/-/_/g'` + + eval min=\$${sprog}_min echo "$prog (minimum version $min)" done @@ -159,7 +163,9 @@ Your system seems to be missing the following tool(s): EOF for prog in $missing; do - eval why=\$${prog}_why + sprog=`echo "$prog" | sed 's/-/_/g'` + + eval why=\$${sprog}_why echo "$prog ($why)" done |