diff options
| author | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2006-08-09 10:06:37 +0000 |
|---|---|---|
| committer | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2006-08-09 10:06:37 +0000 |
| commit | 38fe57357a2f46b4b2bc34f127c4e19feb694477 (patch) | |
| tree | efe3c5c88eb171248f19c46c9fdf7ae706eb5f9f /stepmake | |
| parent | 20e46cadd3f9e5afb48cfabe50e725bdb6613a0b (diff) | |
* stepmake/aclocal.m4: version check patch (thanks MWD)
* ly/music-functions-init.ly: robustness. Don't crash if
currentBarNumber is not a number.
Diffstat (limited to 'stepmake')
| -rw-r--r-- | stepmake/aclocal.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 96959c09f7..813b830977 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -32,7 +32,7 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [ ## for compatibility reasons. ## grab the first version number in --version output. - eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep ' [0-9][0-9]*\.[0-9]' \ + eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '\(^\| \)[0-9][0-9]*\.[0-9]' \ | head -n 1 \ | tr ' ' '\n' | grep '[0-9]\.[0-9]' | head -n 1 | sed 's/\([0-9.]*\).*/\1/g'\`\" |