From 3c4efaf7d120eae1a68588dd8d298d3a9e3ab9e7 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 15 Jan 1999 14:56:05 +0100
Subject: [PATCH] release: 1.1.22

---
 Documentation/links.yo           |   2 +-
 Documentation/topdocs/INSTALL.yo |   2 +-
 INSTALL.txt                      |   2 +-
 NEWS                             |   5 +
 VERSION                          |   4 +-
 configure                        | 193 ++++++++++-----------
 input/GNUmakefile                |   2 +-
 input/bugs/oeps.ly               | 277 -------------------------------
 lily/beam-engraver.cc            |  14 +-
 make/out/lelievijver.lsm         |   8 +-
 make/out/lilypond.lsm            |   8 +-
 make/out/lilypond.spec           |   4 +-
 stepmake/configure               |  41 ++---
 stepmake/make/out/stepmake.lsm   |   8 +-
 stepmake/make/out/stepmake.spec  |   4 +-
 15 files changed, 139 insertions(+), 435 deletions(-)
 delete mode 100644 input/bugs/oeps.ly

diff --git a/Documentation/links.yo b/Documentation/links.yo
index 4cb12d3c4b..b829b76be3 100644
--- a/Documentation/links.yo
+++ b/Documentation/links.yo
@@ -29,7 +29,7 @@ dit(lurl(http://www.zib.de/Visual/software/doc++/index.html))
 dit(lurl(http://www.xs4all.nl/~jantien/yodl/index.html))
     LilyPond documentation is in Yodl.  You'll need a recent
     development version from 
-    lurl(ftp://pcnov095.win.tue.nl/pub/yodl/development).
+    lurl(ftp://ftp.lilypond.org/pub/yodl/development).
 dit(lurl(http://www.iat.unc.edu/technology/music/music.html))
     An enormous collection of music related URLs
 dit(lurl(http://www.ram.org/ramblings/philosophy/fmp.html))
diff --git a/Documentation/topdocs/INSTALL.yo b/Documentation/topdocs/INSTALL.yo
index 287ce94b84..d963065b21 100644
--- a/Documentation/topdocs/INSTALL.yo
+++ b/Documentation/topdocs/INSTALL.yo
@@ -81,7 +81,7 @@ it()Python (version 1.5 or newer).  Check out
 lurl(ftp://ftp.python.org) or lurl(ftp://ftp.cwi.nl/pub/python).
 
 it()Yodl.  All documentation will be in Yodl. (1.30.17)
-lurl(ftp://pcnov095.win.tue.nl/pub/yodl)
+lurl(ftp://ftp.lilypond.org/pub/yodl)
     lurl(http://www.cs.uu.nl/~hanwen/yodl)
 it()Texinfo. (version 3.12 or newer)
 
diff --git a/INSTALL.txt b/INSTALL.txt
index 68b87c0215..1e13825347 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -136,7 +136,7 @@ o    Python   (version   1.5   or   newer).     Check    out
 
 
 o    Yodl.   All  documentation  will  be in Yodl. (1.30.17)
-     ftp://pcnov095.win.tue.nl/pub/yodl
+     ftp://ftp.lilypond.org/pub/yodl
      http://www.cs.uu.nl/~hanwen/yodl
 
 
diff --git a/NEWS b/NEWS
index 16b1c5fd35..ecef189c2c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+pl 22
+	- fixed "already have a Beam" error
+
 pl 21.jcn2
 	- gnossienne: hmm, how to 
 	  * undisplay bars
@@ -6,11 +9,13 @@ pl 21.jcn2
 
 pl 21.jcn1
 	- gnossienne-4.ly (start of)
+
 pl 20.jcn2
 	- mutopia fixes; see preludes-1.ly for cross-staff beams and slurs
 	- bf: broken interstaff slur
 	- sm66: check for gmake
 
+*******
 pl 20.jcn1
 	- interstaff slurs v0: preludes-1.ly
 	- warnings for silly interbeam settings
diff --git a/VERSION b/VERSION
index 5dd96385e4..a5e5c807b5 100644
--- a/VERSION
+++ b/VERSION
@@ -1,8 +1,8 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
-PATCH_LEVEL=21
-MY_PATCH_LEVEL=jcn2
+PATCH_LEVEL=22
+MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/configure b/configure
index a2d42deb41..f536f8621a 100755
--- a/configure
+++ b/configure
@@ -777,7 +777,7 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-    for ac_prog in make
+    for ac_prog in make gmake
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -847,13 +847,12 @@ test -n "$FIND" || FIND="error"
 
 
 
-
     for ac_prog in tar
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:857: checking for $ac_word" >&5
+echo "configure:856: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -887,7 +886,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:891: checking for $ac_word" >&5
+echo "configure:890: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_BASH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -920,7 +919,7 @@ test -n "$BASH" || BASH="/bin/sh"
     # Extract the first word of "${PYTHON:-python}", so it can be a program name with args.
 set dummy ${PYTHON:-python}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:924: checking for $ac_word" >&5
+echo "configure:923: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -951,18 +950,8 @@ fi
 
     
 
-
-    
-	result="`echo \"$MAKE\" | grep echo`"
-	if test "x$MAKE" = "xerror" -o "x$result" != "x"; then
-		
-    echo "configure: warning: can\'t find GNU make. You should install GNU make" 1>&2
-    warn_b=yes
-
-	fi
-
     if test $MAKE != "error" ; then
-	$MAKE -v| grep GNU > /dev/null
+	$MAKE -v 2> /dev/null | grep GNU > /dev/null
 	if test "$?" = 1
 	then
 		
@@ -1159,7 +1148,7 @@ EOF
     # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1163: checking for $ac_word" >&5
+echo "configure:1152: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1188,7 +1177,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1192: checking for $ac_word" >&5
+echo "configure:1181: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1236,7 +1225,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1240: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1229: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1246,11 +1235,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
 cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 1250 "configure"
+#line 1239 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1270,12 +1259,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1274: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1263: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1279: checking whether we are using GNU C" >&5
+echo "configure:1268: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1284,7 +1273,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1299,7 +1288,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1303: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1292: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1358,7 +1347,7 @@ EOF
 fi
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:1362: checking how to run the C++ preprocessor" >&5
+echo "configure:1351: checking how to run the C++ preprocessor" >&5
 if test -z "$CXXCPP"; then
 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1371,12 +1360,12 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
-#line 1375 "configure"
+#line 1364 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1380: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1407,7 +1396,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1411: checking for $ac_word" >&5
+echo "configure:1400: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1438,7 +1427,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1442: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1431: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1448,11 +1437,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L
 cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 1452 "configure"
+#line 1441 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1472,12 +1461,12 @@ if test $ac_cv_prog_cxx_works = no; then
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1476: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1465: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1481: checking whether we are using GNU C++" >&5
+echo "configure:1470: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1486,7 +1475,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1479: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -1501,7 +1490,7 @@ if test $ac_cv_prog_gxx = yes; then
   ac_save_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS=
   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1505: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1494: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1531,17 +1520,17 @@ fi
 
     ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6
-echo "configure:1535: checking for FlexLexer.h" >&5
+echo "configure:1524: checking for FlexLexer.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1540 "configure"
+#line 1529 "configure"
 #include "confdefs.h"
 #include <FlexLexer.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1545: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1592,12 +1581,12 @@ fi
 
 
     echo $ac_n "checking whether explicit instantiation is needed""... $ac_c" 1>&6
-echo "configure:1596: checking whether explicit instantiation is needed" >&5
+echo "configure:1585: checking whether explicit instantiation is needed" >&5
 if eval "test \"`echo '$''{'lily_cv_need_explicit_instantiation'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1601 "configure"
+#line 1590 "configure"
 #include "confdefs.h"
 
     template <class T> struct foo { static int baz; };
@@ -1607,7 +1596,7 @@ int main() {
  return foo<int>::baz; 
 ; return 0; }
 EOF
-if { (eval echo configure:1611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   lily_cv_need_explicit_instantiation=no
 else
@@ -1634,7 +1623,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1638: checking for $ac_word" >&5
+echo "configure:1627: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1676,7 +1665,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1680: checking for $ac_word" >&5
+echo "configure:1669: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1710,7 +1699,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1714: checking for $ac_word" >&5
+echo "configure:1703: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1777,7 +1766,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1781: checking for $ac_word" >&5
+echo "configure:1770: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1809,7 +1798,7 @@ test -n "$AR" || AR="error"
     # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1813: checking for $ac_word" >&5
+echo "configure:1802: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1864,7 +1853,7 @@ fi
 
 
     echo $ac_n "checking language""... $ac_c" 1>&6
-echo "configure:1868: checking language" >&5    
+echo "configure:1857: checking language" >&5    
     case "$language" in
       En* | en* | Am* | am* | US* | us*)
 	    lang=English;;
@@ -1900,7 +1889,7 @@ EOF
 
 
     echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:1904: checking for gettext in -lintl" >&5
+echo "configure:1893: checking for gettext in -lintl" >&5
 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1908,7 +1897,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1912 "configure"
+#line 1901 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -1922,7 +1911,7 @@ int main() {
 gettext()
 ; return 0; }
 EOF
-if { (eval echo configure:1926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1952,12 +1941,12 @@ fi
     for ac_func in gettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1956: checking for $ac_func" >&5
+echo "configure:1945: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1961 "configure"
+#line 1950 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1983,7 +1972,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2015,7 +2004,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2019: checking for $ac_word" >&5
+echo "configure:2008: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2045,7 +2034,7 @@ done
 test -n "$MSGFMT" || MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh "
 
     echo $ac_n "checking whether msgfmt accepts -o""... $ac_c" 1>&6
-echo "configure:2049: checking whether msgfmt accepts -o" >&5
+echo "configure:2038: checking whether msgfmt accepts -o" >&5
     msgfmt_output="`msgfmt -o bla 2>&1 | grep usage`"
     if test "$msgfmt_output" = ""; then
 	echo "$ac_t""yes" 1>&6
@@ -2072,7 +2061,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2076: checking for $ac_word" >&5
+echo "configure:2065: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_METAFONT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2107,7 +2096,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2111: checking for $ac_word" >&5
+echo "configure:2100: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MFONT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2144,7 +2133,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2148: checking for $ac_word" >&5
+echo "configure:2137: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_METAPOST'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2179,7 +2168,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2183: checking for $ac_word" >&5
+echo "configure:2172: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MPOST'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2222,7 +2211,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2226: checking for $ac_word" >&5
+echo "configure:2215: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIPROFF'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2256,7 +2245,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2260: checking for $ac_word" >&5
+echo "configure:2249: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2290,7 +2279,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2294: checking for $ac_word" >&5
+echo "configure:2283: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2HTML'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2324,7 +2313,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2328: checking for $ac_word" >&5
+echo "configure:2317: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2LATEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2357,7 +2346,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2361: checking for $ac_word" >&5
+echo "configure:2350: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2MAN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2391,7 +2380,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2395: checking for $ac_word" >&5
+echo "configure:2384: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2MSLESS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2425,7 +2414,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2429: checking for $ac_word" >&5
+echo "configure:2418: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2TEXINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2459,7 +2448,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2463: checking for $ac_word" >&5
+echo "configure:2452: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2TXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2516,7 +2505,7 @@ test -n "$YODL2TXT" || YODL2TXT="-echo no yodl"
 
     # gh_scm2doubles,gh_doubles2scm are new in 1.3
     echo $ac_n "checking for gh_scm2doubles in -lguile""... $ac_c" 1>&6
-echo "configure:2520: checking for gh_scm2doubles in -lguile" >&5
+echo "configure:2509: checking for gh_scm2doubles in -lguile" >&5
 ac_lib_var=`echo guile'_'gh_scm2doubles | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2524,7 +2513,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lguile  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2528 "configure"
+#line 2517 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -2538,7 +2527,7 @@ int main() {
 gh_scm2doubles()
 ; return 0; }
 EOF
-if { (eval echo configure:2542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2562,7 +2551,7 @@ else
   echo "$ac_t""no" 1>&6
 \
       echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
-echo "configure:2566: checking for readline in -lreadline" >&5
+echo "configure:2555: checking for readline in -lreadline" >&5
 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2570,7 +2559,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lreadline  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2574 "configure"
+#line 2563 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -2584,7 +2573,7 @@ int main() {
 readline()
 ; return 0; }
 EOF
-if { (eval echo configure:2588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2612,7 +2601,7 @@ else
 fi
  \
       echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:2616: checking for dlopen in -ldl" >&5
+echo "configure:2605: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2620,7 +2609,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2624 "configure"
+#line 2613 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -2634,7 +2623,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:2638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2662,7 +2651,7 @@ else
 fi
  \
       echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:2666: checking for socket in -lsocket" >&5
+echo "configure:2655: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2670,7 +2659,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2674 "configure"
+#line 2663 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -2684,7 +2673,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:2688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2712,7 +2701,7 @@ else
 fi
 \
       echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:2716: checking for tgetent in -ltermcap" >&5
+echo "configure:2705: checking for tgetent in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2720,7 +2709,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2724 "configure"
+#line 2713 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -2734,7 +2723,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:2738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2762,7 +2751,7 @@ else
 fi
 \
       echo $ac_n "checking for fabs in -lm""... $ac_c" 1>&6
-echo "configure:2766: checking for fabs in -lm" >&5
+echo "configure:2755: checking for fabs in -lm" >&5
 ac_lib_var=`echo m'_'fabs | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2770,7 +2759,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2774 "configure"
+#line 2763 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -2784,7 +2773,7 @@ int main() {
 fabs()
 ; return 0; }
 EOF
-if { (eval echo configure:2788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2812,7 +2801,7 @@ else
 fi
 \
       echo $ac_n "checking for gh_doubles2scm in -lguile""... $ac_c" 1>&6
-echo "configure:2816: checking for gh_doubles2scm in -lguile" >&5
+echo "configure:2805: checking for gh_doubles2scm in -lguile" >&5
 ac_lib_var=`echo guile'_'gh_doubles2scm | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2820,7 +2809,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lguile  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2824 "configure"
+#line 2813 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -2834,7 +2823,7 @@ int main() {
 gh_doubles2scm()
 ; return 0; }
 EOF
-if { (eval echo configure:2838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2877,7 +2866,7 @@ CXXFLAGS="$CXXFLAGS -fhandle-signatures"
 
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:2881: checking for 8-bit clean memcmp" >&5
+echo "configure:2870: checking for 8-bit clean memcmp" >&5
 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2885,7 +2874,7 @@ else
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2889 "configure"
+#line 2878 "configure"
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
@@ -2898,7 +2887,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:2902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_memcmp_clean=yes
 else
@@ -2916,12 +2905,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o"
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:2920: checking for vprintf" >&5
+echo "configure:2909: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2925 "configure"
+#line 2914 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -2947,7 +2936,7 @@ vprintf();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -2971,12 +2960,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:2975: checking for _doprnt" >&5
+echo "configure:2964: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2980 "configure"
+#line 2969 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -3002,7 +2991,7 @@ _doprnt();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -3029,12 +3018,12 @@ fi
 for ac_func in memmem snprintf vsnprintf gettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3033: checking for $ac_func" >&5
+echo "configure:3022: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3038 "configure"
+#line 3027 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3060,7 +3049,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3099,7 +3088,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3103: checking for $ac_word" >&5
+echo "configure:3092: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
diff --git a/input/GNUmakefile b/input/GNUmakefile
index 753f5e1b87..26dc6aee1a 100644
--- a/input/GNUmakefile
+++ b/input/GNUmakefile
@@ -4,7 +4,7 @@ depth = ..
 
 SUBDIRS=test bugs
 
-examples=praeludium-fuga-E  twinkle-pop
+examples=praeludium-fuga-E  twinkle-pop star-spangled-banner
 flexamples=
 
 LOCALSTEPMAKE_TEMPLATES=mutopia
diff --git a/input/bugs/oeps.ly b/input/bugs/oeps.ly
deleted file mode 100644
index 2d90ea8816..0000000000
--- a/input/bugs/oeps.ly
+++ /dev/null
@@ -1,277 +0,0 @@
-
-\header{
-filename="Sinfonia.ly";
-title="Sinfonia";
-subtitle="G major";
-composer="Leopold Mozart";
-arranger="(1719-1787)";
-copyright="public domain";
-enteredby="Maarten Storm";
-}
-
-
-global = \notes{
-	\key G;
-	\time 2/4;
-	s2*4 \break 
-	s2*5 \break
-	s2*5 \break
-	s2*5 \break
-	s2*5 \break
-	s2*5 \break
-	s2*5 \break
-	s2*5 \break
-	s2*5 \break
-	s2*5 \break
-	s2*6 \bar ":|"; \break
-	\bar "|:"; s2*6
-	s2*5 \break
-	s2*5 \break
-	s2*5 \break
-	s2*5 \break
-
-}
-
-tempi = \notes{
-	\property Voice.textstyle = "large"
-        s8^"Allegro"
-	
-}
-
-dynamics = \notes{
-%	\type Voice=i
-}
-
-
-violinoi = \notes \relative c'{
-	\type Voice=i
-	\clef "violin";
-	[<g8 d' b' g'> g'' g g] | [g16 a b a] [g a b a] |
-	[<g,,8 d' b' g'> g'' g g] | [g16 a b a] [g a b a] |
-%5	
-	[<g,,8 d' b' g'> g'' g g] | [g16 d c b] [a g fis g] |
-	[e' fis g fis] [g e d c] | [b c d c] [d b a g] |
-	[e' fis g fis] [g e d c] | [b c d c] [d b a g] |
-%11	
-	[fis g a b] [c a g fis] | [g a b c] [d b a g] |
-	[a b c d] [e c b a] | [b c d c] [d b a g] |
-%15	
-	[fis g a g] [fis e d c] | [b a g8] r4 |
-	[<g8 d' b' g'> g'' g g] | \times 2/3 {[g8 d c] [b a g] |
-	[g'8\p d c] [b a g] |  
-%20	
-	[f'\f d c] [b a g]} | 
-	[<c,8 e c' e> e' e e] | <c,2 e c' e> |
-        [<a8 e' cis' a'> a'' a a] |
-	\times 2/3 {[a8 e d] [cis b a] | [a'\p e d] [cis b a] |
-%26	
-	[g'\f e d] [cis b a]} | [<d,8 a' fis'> fis' fis fis] |
-	<d,2 a' fis'> | \times 2/3 {[b'8 c d] [e fis g] |
-	[g fis g] [b, a g] | [a b cis] [d e fis] |
-%32
-	[fis e fis] [a, g fis] | [g a b] [cis d e] |
-	[e d e] [g, fis e]}
-%35
-	[fis16 d e d] [e d e d] | [g d e d] [e d e d] |
-	[a' d, e d] [e d e d] | [b' d, e d] [e d e d] |
-	[cis' a b a] [b a b a] | [d a b a] [b a b a] |
-	[e' a, b a] [a b a b] | [fis' a, b a] [a b a b] |
-%43
-	\times 2/3 {[g'8 b a] [g fis e] | [a d, cis] [d cis d] |
-	[g, b a] [g fis e] | [a d, cis] [d cis d]} |
-%47 
-	[b''16 g fis e] [a fis e d] | [g e d cis] [fis d cis b] | gis,2 |
-%50
-	a4 g'! | [fis16 fis e d] e4 | d d' | r8 r16 gis,16 a4 |
-	r8 [fis g! a] | d,2 
-	[d'8\p e f a,] | [gis a] r4 | 
-	\times 2/3 {[f8\f e d] [c b a]} | [gis a] r4 |
-%60
-	[c'8\p d e g,?] | [fis g] r4 |
-	\times 2/3 {[d8\f a' c] [b a b]} | [b a] r4 |
-%64 : reprise
-	[<g,8 d' b' g'> g'' g g] | [g16 a b a] [g a b a] |
-        [<g,,8 d' b' g'> g'' g g] | [g16 a b a] [g a b a] |
-        [<g,,8 d' b' g'> g'' g g] | [g16 d c b] [a g fis g] |
-%70        
-	[e' fis g fis] [g e d c] | [b c d c] [d b a g] |
-        [fis g a g] [fis e d c] | [b a g8] r4 |
-        [<g8 d' b' g'> g'' g g] | \times 2/3 {[g8 d c] [b a g] |
-	[f\f d c] [b a g]} | [e' c] r4 |
-%78	
-	[<a8 e' cis' a'> a'' a a] |
-        \times 2/3 {[a8 e d] [cis b a] | 
-        [g e d] [cis b a]} | [fis' d] r4 |	
-}
-
-violinoii = \notes \relative c'{
-	\type Voice=i
-	\clef "violin";
-	[<g8 d' b' g'> g'' g g] | [b,16 c d c] [b c d c] |
-	[<g,8 d' b' g'> g'' g g] | [b,16 c d c] [b c d c] |
-%5
-	[<g,8 d' b' g'> g'' g g] | [g16 d c b] [a g fis g] |
-	[e' fis g fis] [g e d c] | [b c d c] [d b a g] |
-	[e' fis g fis] [g e d c] | [b c d c] [d b a g] |
-%11	
-	[fis g a b] [c a g fis] | [g a b c] [d b a g] |
-        [a b c d] [e c b a] | [b c d c] [d b a g] |
-%15
-        [fis g a g] [fis e d c] | [b a g8] r4 |
-	[<g8 d' b' g'> g'' g g] | \times 2/3 {[g8 d c] [b a g] |
-	[g'8\p d c] [b a g] | [f'\f d c] [b a g]} |
-%21
-	[<c,8 e c' e> e' e e] | <c,2 e c' e> |
-	[<a8 e' cis' a'> a'' a a] |
-	\times 2/3 {[a8 e d] [cis b a] | [a'\p e d] [cis b a] |
-%26   
-        [g'\f e d] [cis b a]} | [<d, a' fis'> fis' fis fis] |
-        <d,2 a' fis'> | \times 2/3 {[b'8 c d] [e fis g] |
-        [g fis g] [b, a g] | [a b cis] [d e fis] |
-%32
-        [fis e fis] [a, g fis] | [g a b] [cis d e] |
-        [e d e] [g, fis e]}
-%35
-        [fis16 d e d] [e d e d] | [g d e d] [e d e d] |
-        [a' d, e d] [e d e d] | [b' d, e d] [e d e d] |
-        [cis' a b a] [b a b a] | [d a b a] [b a b a] |
-        [e' a, b a] [a b a b] | [fis' a, b a] [a b a b] |
-%43
-        \times 2/3 {[g'8 b a] [g fis e] | [a d, cis] [d cis d] |
-        [g, b a] [g fis e] | [a d, cis] [d cis d]} |
-%47
-        [b''16 g fis e] [a fis e d] | [g e d cis] [fis d cis b] | gis,2 |
-%50
-        a4 g'! | [fis16 fis e d] e4 | d d' | r8 r16 g,16 a4 |
-        r8 [fis g! a] | d,2
-	f4\p r8 f | [e-. ~ e-.] r4 |
-	\times 2/3 {[f8\f e d] [c b a]} | [gis a] r4 |
-%60
-	e'4\p r8 e | [d-. ~ d-.] r4 |
-	\times 2/3 {[d8\f a' c] [b a b]} | [b a] r4 |
-%64 : reprise
-	[<g,8 d' b' g'> g'' g g] | [b,16 c d c] [b c d c] |
-        [<g,8 d' b' g'> g'' g g] | [b,16 c d c] [b c d c] |
-        [<g,8 d' b' g'> g'' g g] | [g16 d c b] [a g fis g] |
-%70        
-	[e' fis g fis] [g e d c] | [b c d c] [d b a g] |
-        [fis g a g] [fis e d c] | [b a g8] r4 |
-        [<g8 d' b' g'> g'' g g] | \times 2/3 {[g8 d c] [b a g] |
-	[f\f d c] [b a g]} | [e' c] r4 |
-%78
-        [<a8 e' cis' a'> a'' a a] |
-        \times 2/3 {[a8 e d] [cis b a] | 
-        [g e d] [cis b a]} | [fis' d] r4 |
-
-}
-
-viola = \notes \relative c'{
-	\type Voice=i
-	\clef "alto";
-	[b16 c d c] [b c d c] | [b8 b b b] | 
-	[b16 c d c] [b c d c] | [b8 b b b] |
-%5
-	[b16 c d c] [b c d c] | b4 r |
-	r8 [e g a] | [d, b b d] | [g, e' g a] |
-%10
-	[d, b d e] | [a, fis'16 g] [a fis e d] |
-	[d8 d d d] | r [a' a a] | [d, b d e] |
-	[a, d d a] | [g16 g' fis e] [d c b a] |
-	[g b d c] [b c d c] | b4 r | d d | d d |
-%21
-	[e16 f? g f] [e f g f] | [g8 e e d] |
-	[cis16 d e d] [cis d e d] | cis4 r | 
-%25
-	e\p e | e\f e | [fis16 g a g] [fis g a g] | 
-	[fis8 fis a a] | d4 b | b g' | cis,? a |
-	a fis' b, g' | a a, |
-%35
-	[a8 fis' fis fis] | r [g g g] | r [a a a] |
-	r [b, b b] | r [cis cis cis] | r [d d d] | r [e e e] |
-	r [fis fis fis] |
-%43
-	\times 2/3 {[e g fis] | [e fis g]} | fis4 r |
-	\times 2/3 {[e8 g fis] | [e fis g]} | fis4 r |
-%47
-	[d8 g d fis] | r [e a, d] | r b [b cis16 d] |
-	[e8 d e cis] | [d d d cis] | d4 d' | r8 r16 gis, a4 |
-	r8 [fis8 g! a] | d,2  
-	[d8\p d d d] | [d c!] r4 |
-	\times 2/3 {[f8\f e d] [c b a]} | [gis a] r4 |
-%60
-	[c8\p c c c] | [c b] r4 | [a8 fis e g] | [g fis] r4 |
-%64 : reprise
-	[b,16 c d c] [b c d c] | [b8 b b b] |
-        [b16 c d c] [b c d c] | [b8 b b b] |
-%68
-        [b16 c d c] [b c d c] | b4 r |
-	r8 [e g a] | [d b] r e | [a, a a a] |
-%73
-	[g16 b c d] [e fis g a] | [b c d c] [b c d c] | b4 r |
-	d, d | g, r | [cis16 d e d] [cis d e d] | cis 4 r | 
-%80
-	e4 e | [a,8 fis'16 g] [fis8 d] |
-}
-
-bassocontinuo = \notes \relative c'{
-	\type Voice=i
-	\clef "bass";
-	[g16 a b a] [g a b a] | [g8 g, g g'] |
-	[g16 a b a] [g a b a] | [g8 g, g g'] | 
-%5
-	[g16 a b a] [g a b a] | [g8 g,] r4 |
-	[c'8 c,] [e_"6" fis_"6"_"5" | [g g g b,_"6"] |
-	[c c] [e_"6" fis_"6"_"5" | [g g b_"6" c] |
-%11
-	[d d d c_"2"] | [b_"6" b b b] | [fis_"6"_"5" fis fis fis] |
-	[g g b_"6" c] | [d fis,_"6"_"5" fis fis] | [g16 g fis e] [d c b a] |
-%17
-	[g g' b a] [g a b a] | g4 r | b, b | b b |
-%21
-	[c16 d e d] [c d e d] | [c8 e' c a] | [a16 b cis b] [a b cis b] 
-	a4 r | cis, cis | cis cis |
-%27
-	[d16 e fis e] [d e fis e] | [d8 d fis fis] | g4 g | 
-	e e | fis fis | d d | e e | cis cis |
-%35
-	d2:8 | e2:8 | fis2:8 | g2:8 | a2:8 | b2:8 | [cis8 cis,? cis cis] |
-	d2:8 | cis4 cis | d r | cis cis | d r |
-%47
-	g8 r fis r | e r d r | r [e e d] | [cis b cis a] | [d fis g a] |
-	d,4 d' | r8 r16 gis, a4 | r8 [fis g! a] | d,2 
-	r2 | r |
-	\times 2/3 {[f8\f e d] [c b a]} | [gis a] r4 |
-%60
-	r2 | r |
-	[f'8 d g g,] | [d' d'] [d16 c b a] |
-%64 : reprise
-	[g16 a b a] [g a b a] | [g8 g, g g'] |
-        [g16 a b a] [g a b a] | [g8 g, g g'] |
-%68
-        [g16 a b a] [g a b a] | g4 r |
-	[c8 c,] [e fis] | [g g b c] | [e fis fis fis] |
-%73
-	[g16 g, a b] [c d e fis] | [g a b a] [g a b a] | g4 r |
-	b, b | [c8 c'16 d] [e d cis b] | [a b cis b] [a b cis b] |
-%79
-	a4 r | cis,4 cis | [d8 d'16 e] [d8 b] |	
-
-}
-
-
-\score{
-        \type StaffGroup <
-                \type Staff = i < \tempi \global \dynamics \violinoi >
-                \type Staff = ii < \global \dynamics \violinoii >
-                \type Staff = iii < \global \dynamics \viola >
-                \type Staff = iv < \global \dynamics \bassocontinuo >
-        >
-        \paper{
-                %\translator { \OrchestralScoreContext }
-        }
-        \midi{ \tempo 4 = 100; }
-}
-
-
-
-
diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index 44fb146c47..ebd09d3dff 100644
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -31,14 +31,6 @@ Beam_engraver::do_try_music (Music *m)
     {
       Direction d =c->spantype_;
 
-      /*
-	Perhaps not print warnings ?
-       */
-      if (d == START && beam_p_)
-	{
-	  m->warning ("Already have a Beam");
-	  return false;
-	}
       if (d == STOP && !beam_p_)
 	{
 	  m->warning ("No Beam to end");
@@ -67,6 +59,12 @@ Beam_engraver::do_process_requests ()
   
   if (reqs_drul_[START])
     {
+      if (beam_p_)
+	{
+	  reqs_drul_[START]->warning ("Already have a Beam");
+	  return;
+	}
+
       beam_p_ = new Beam;
       grouping_p_ = new Rhythmic_grouping;
 
diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm
index 3d42f5d763..98b7003d56 100644
--- a/make/out/lelievijver.lsm
+++ b/make/out/lelievijver.lsm
@@ -1,15 +1,15 @@
 Begin3
 Titel: LilyPond
-Versie: 1.1.21
-Inschrijf datum: 12JAN99
+Versie: 1.1.22
+Inschrijf datum: 15JAN99
 Beschrijving: @FLAPTEKST@
 Trefwoorden: muziek typezetten midi notatie
 Auteur: hanwen@stack.nl (Han-Wen Nienhuys)
 	janneke@gnu.org (Jan Nieuwenhuizen)
 Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys)
 Voornaamste plek: sunsite.unc.edu /pub/Linux/apps
-	770k lilypond-1.1.21.tar.gz 
+	770k lilypond-1.1.22.tar.gz 
 Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
-	770k lilypond-1.1.21.tar.gz 
+	770k lilypond-1.1.22.tar.gz 
 Copi-eer voorwaarden: GPL
 End
diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm
index 1830b4f212..43e910639a 100644
--- a/make/out/lilypond.lsm
+++ b/make/out/lilypond.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title: LilyPond
-Version: 1.1.21
-Entered-date: 12JAN99
+Version: 1.1.22
+Entered-date: 15JAN99
 Description: 
 LilyPond is the GNU Project music typesetter.  This program can print
 beautiful sheet music from a music definition file.  It can also play
@@ -14,8 +14,8 @@ Author: hanwen@cs.ruu.nl (Han-Wen Nienhuys)
 	janneke@gnu.org (Jan Nieuwenhuizen)
 Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys)
 Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert
-	770k lilypond-1.1.21.tar.gz 
+	770k lilypond-1.1.22.tar.gz 
 Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
-	770k lilypond-1.1.21.tar.gz 
+	770k lilypond-1.1.22.tar.gz 
 Copying-policy: GPL
 End
diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec
index f9c64572b6..fe2e201984 100644
--- a/make/out/lilypond.spec
+++ b/make/out/lilypond.spec
@@ -1,9 +1,9 @@
 Name: lilypond
-Version: 1.1.21
+Version: 1.1.22
 Release: 1
 Copyright: GPL
 Group: Applications/Publishing
-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.21.tar.gz
+Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.22.tar.gz
 Summary: A program for printing sheet music.
 URL: http://www.cs.uu.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@cs.uu.nl>
diff --git a/stepmake/configure b/stepmake/configure
index aa4f52daf2..40327a0452 100755
--- a/stepmake/configure
+++ b/stepmake/configure
@@ -765,7 +765,7 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-    for ac_prog in make
+    for ac_prog in make gmake
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -835,13 +835,12 @@ test -n "$FIND" || FIND="error"
 
 
 
-
     for ac_prog in tar
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:845: checking for $ac_word" >&5
+echo "configure:844: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -875,7 +874,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:879: checking for $ac_word" >&5
+echo "configure:878: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_BASH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -908,7 +907,7 @@ test -n "$BASH" || BASH="/bin/sh"
     # Extract the first word of "${PYTHON:-python}", so it can be a program name with args.
 set dummy ${PYTHON:-python}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:912: checking for $ac_word" >&5
+echo "configure:911: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -939,18 +938,8 @@ fi
 
     
 
-
-    
-	result="`echo \"$MAKE\" | grep echo`"
-	if test "x$MAKE" = "xerror" -o "x$result" != "x"; then
-		
-    echo "configure: warning: can\'t find GNU make. You should install GNU make" 1>&2
-    warn_b=yes
-
-	fi
-
     if test $MAKE != "error" ; then
-	$MAKE -v| grep GNU > /dev/null
+	$MAKE -v 2> /dev/null | grep GNU > /dev/null
 	if test "$?" = 1
 	then
 		
@@ -1081,7 +1070,7 @@ fi
 
 
     echo $ac_n "checking language""... $ac_c" 1>&6
-echo "configure:1085: checking language" >&5    
+echo "configure:1074: checking language" >&5    
     case "$language" in
       En* | en* | Am* | am* | US* | us*)
 	    lang=English;;
@@ -1114,7 +1103,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1118: checking for $ac_word" >&5
+echo "configure:1107: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIPROFF'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1148,7 +1137,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1152: checking for $ac_word" >&5
+echo "configure:1141: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1182,7 +1171,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1186: checking for $ac_word" >&5
+echo "configure:1175: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2HTML'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1216,7 +1205,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1220: checking for $ac_word" >&5
+echo "configure:1209: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2LATEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1249,7 +1238,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1253: checking for $ac_word" >&5
+echo "configure:1242: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2MAN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1283,7 +1272,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1287: checking for $ac_word" >&5
+echo "configure:1276: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2MSLESS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1317,7 +1306,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1321: checking for $ac_word" >&5
+echo "configure:1310: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2TEXINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1351,7 +1340,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1355: checking for $ac_word" >&5
+echo "configure:1344: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2TXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1409,7 +1398,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1413: checking for $ac_word" >&5
+echo "configure:1402: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
diff --git a/stepmake/make/out/stepmake.lsm b/stepmake/make/out/stepmake.lsm
index 32ddad4262..50d8ef093b 100644
--- a/stepmake/make/out/stepmake.lsm
+++ b/stepmake/make/out/stepmake.lsm
@@ -1,15 +1,15 @@
 Begin3
 Title: StepMake
-Version: 0.1.65
-Entered-date: 06JAN99
+Version: 0.1.66
+Entered-date: 15JAN99
 Description: 
 Keywords: music notation typesetting midi fonts engraving
 Author: janneke@gnu.org (Jan Nieuwenhuizen)
 	hanwen@cs.ruu.nl (Han-Wen Nienhuys)
 Maintained-by: janneke@gnu.org (Jan Nieuwenhuizen)
 Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert
-	40k stepmake-0.1.65.tar.gz 
+	40k stepmake-0.1.66.tar.gz 
 Original-site: pcnov095.win.tue.nl /pub/lilypond/development/
-	40k stepmake-0.1.65.tar.gz 
+	40k stepmake-0.1.66.tar.gz 
 Copying-policy: GPL
 End
diff --git a/stepmake/make/out/stepmake.spec b/stepmake/make/out/stepmake.spec
index 1af7ba5fa7..aca0071a1e 100644
--- a/stepmake/make/out/stepmake.spec
+++ b/stepmake/make/out/stepmake.spec
@@ -1,9 +1,9 @@
 Name: stepmake
-Version: 0.1.65
+Version: 0.1.66
 Release: 1
 Copyright: GPL
 Group: Development
-Source0: pcnov095.win.tue.nl:/pub/lilypond/development/stepmake-0.1.65.tar.gz
+Source0: pcnov095.win.tue.nl:/pub/lilypond/development/stepmake-0.1.66.tar.gz
 Summary: generic make package
 Packager: janneke@gnu.org (Jan Nieuwenhuizen)
 Buildroot: /tmp/stepmake-install
-- 
2.39.5