lilypond-0.1.54

diff --git a/aclocal.m4 b/aclocal.m4
index de8271571a70f16d3b557ae3c2f8b7a762004088..3997befc4e7e563609029be1bbe2d42e4f75fd5f 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,14 @@
-dnl aclocal.m4 generated automatically by aclocal 1.2
+dnl aclocal.m4 generated automatically by aclocal 1.2f
+
+dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+dnl This Makefile.in is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
 
 
 AC_DEFUN(AC_JUNK_ARGS, [
@@ -109,8 +119,8 @@ fi
 ifelse([$3],,
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
-AM_SANITY_CHECK
-AC_ARG_PROGRAM
+AC_REQUIRE([AM_SANITY_CHECK])
+AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
 AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
@@ -118,7 +128,7 @@ AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
 AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_PROG_MAKE_SET])
+AC_REQUIRE([AC_PROG_MAKE_SET])])
 
 
 # serial 1
@@ -145,10 +155,21 @@ echo timestamp > conftestfile
 # directory).
 if (
    set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$@" = "X"; then
+   if test "[$]*" = "X"; then
       # -L didn't work.
       set X `ls -t $srcdir/configure conftestfile`
    fi
+   if test "[$]*" != "X $srcdir/configure conftestfile" \
+      && test "[$]*" != "X conftestfile $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
    test "[$]2" = conftestfile
    )
 then

diff --git a/lily/include/staff-side.hh b/lily/include/staff-side.hh
index 1720722284c0c0edcaff7f258d853ca72b5d3ab1..226c70411c1f01c5cda21a4ac8ffdf4f5e3085b8 100644 (file)
--- a/lily/include/staff-side.hh
+++ b/lily/include/staff-side.hh
@@ -27,9 +27,6 @@ public:
   Direction dir_;
   Interval sym_int_;
     
-  /// follow the support inside the staff?
-  bool inside_staff_b_;
-
   Real y_;
 
 

diff --git a/lily/script.cc b/lily/script.cc
index f5333cea467b70c69ab3847c3d913be080a2127d..4e57c3ddf5297f4df21dc9db07622e051edc4b35 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -42,7 +42,6 @@ Script::set_stem (Stem*st_l)
 Script::Script()
 {
   specs_l_ = 0;
-  inside_staff_b_ = false;
   stem_l_ = 0;
   dir_ =  CENTER;
 }