*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 8cbfafbeb578f83d3622e3efd86f19f7edb78757..dfe07ee89713495e99c84ebf23da243627867f5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-01  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * stepmake/aclocal.m4: revert version detection change.
+
 2006-06-01  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * stepmake/aclocal.m4: Robustification for (gcc) version detection.

diff --git a/lily/ledger-line-spanner.cc b/lily/ledger-line-spanner.cc
index 907c95985f7f015c331ada15718d21f5fb771c4c..bf7444dea0ec73b0a08b9841ffbe691c825c2128 100644 (file)
--- a/lily/ledger-line-spanner.cc
+++ b/lily/ledger-line-spanner.cc
@@ -119,7 +119,10 @@ Ledger_line_spanner::set_spacing_rods (SCM smob)
   // find size of note heads.
   Grob *staff = Staff_symbol_referencer::get_staff_symbol (me);
   if (!staff)
-    return SCM_EOL;
+    {
+      me->suicide ();
+      return SCM_EOL;
+    }
 
   Real min_length_fraction
     = robust_scm2double (me->get_property ("minimum-length-fraction"), 0.15);

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 482c73a3cb65a9920ba6803e6f374251438c83d7..9f418fbad497203853a25285cb3c9c49ff519f92 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -32,8 +32,13 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
     ## FIXME: what systems still do not have $() in /bin/sh?
     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]*\).*/\1/' \
-         -e 's/\([^0-9]*\|^\) //' -e 's/[^0-9]*$//'\`\"
+       | sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/' \
+          -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
+
+## 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\}' \