robuster version detection.

diff --git a/ChangeLog b/ChangeLog
index 41cd8012c4467c53ee3ed7b7e31e069c9a046994..c172852516ca1e41d93f9b250b4ce0012148fe18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2006-06-01  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
-       * stepmake/aclocal.m4: revert version detection.
+       * stepmake/aclocal.m4: robuster version detection.
 
        * buildscripts/output-distance.py
        (ComparisonData.create_html_result_page): copy only if file

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 73cb599d53f7b80a2ef7ab8697489ff014ec785c..c3d41f612876775958d33ba4fd05e507d24eeaf0 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -26,18 +26,12 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
     ## -V: Workaround for python
 
     changequote(<<, >>)#dnl
-    ## Assume and hunt for dotted version multiplet.
-    ## use eval trickery, because we cannot use multi-level $() instead of ``
-    ## for compatibility reasons.
-    ## FIXME: what systems still do not have $() in /bin/sh?
+
+    ## grab the first version number in  --version output.
     eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\.[0-9]' \
         | head -n 1 \
-       | sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/' \
-          -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
+       | tr ' ' '\n' | grep '[0-9]\.[0-9]' | head -n 1 | sed 's/\([0-9.]*\).*/\1/g'\`\"
 
-## apparently breaks on darwin,  
-#              | sed -e 's/\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/' \
-#        -e 's/\([^0-9]*\|^\) //' -e 's/[^0-9]*$//'\`\"
     if test -z "$_ver"; then
         ## If empty, try date [fontforge]
         eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\{6,8\}' \