From d4b3a0de879e0566dacab4d4c50157cdd0438ade Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:58:31 +0000
Subject: [PATCH] lilypond-0.1.16

---
 Documentation/other-packages.pod | 9 +++++----
 configure.in                     | 8 ++++++--
 lily/main.cc                     | 6 +++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Documentation/other-packages.pod b/Documentation/other-packages.pod
index 49c2e7dbe4..c0acbb555e 100644
--- a/Documentation/other-packages.pod
+++ b/Documentation/other-packages.pod
@@ -59,7 +59,7 @@ After quarrels,  MusiXTeX has been split into two branches:
 Daniel Taupin's now maintains the branch that still carries 
 the name MusiXTeX.
 
-=item OpusTeX, http://www.inf.ethz.ch/people/achermann/opustex
+=item OpusTeX, http://www.inf.ethz.ch/personal/achermann/
 
 Andreas Egler's branch is called MusiXTeX.
 
@@ -117,6 +117,10 @@ Notation editor for W95 and Mac
 Notation editor on Acorn machines.  Their developers call it ``best
 notation program available''.
 
+=item Ikarus,
+
+The music-engraving system described by [Wanske]
+
 =item Finale
 
 =item Score
@@ -142,11 +146,8 @@ batch program (like LilyPond).  It is aimed at publishers. Its history
 is more than fifteen years and Amadeus has been running under
 different Unix clones.  It uses MIDI-keyboard input
 
-
-
 =back
 
-
 =head2 Unknown
 
 =item MusE
diff --git a/configure.in b/configure.in
index e3e93c03bd..2e0c385e87 100644
--- a/configure.in
+++ b/configure.in
@@ -62,10 +62,10 @@ AC_ARG_ENABLE(tex-dir,
     [TEXDIR=$enableval],
     [TEXDIR=auto] )
 
-AC_JUNK_ARGS( AC_ARG_ENABLE(mf-dir,
+AC_ARG_ENABLE(mf-dir,
      [  mf-dir=DIR             set the directory to put LilyPond MetaFont files in. (obsolete)],
      [MFDIR=$enableval],
-     [MFDIR=auto] ))
+     [MFDIR=auto])
 
 AC_ARG_ENABLE(out-dir,
     [  out-dir                 set the directory for machine generated files. Default out or out-HOST],
@@ -153,6 +153,10 @@ if test "x$TEXPREFIX" = xauto ; then
 else
  find_texprefix=$TEXPREFIX
 fi
+
+if test "x$MFDIR" = xauto; then
+    AC_MF_SUBDIR(MFDIR)
+fi
     
 if test "x$TEXDIR" = xauto ; then
     AC_TEX_SUBDIR(TEXDIR)
diff --git a/lily/main.cc b/lily/main.cc
index efba1f0c29..4727f337d6 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -106,12 +106,12 @@ static File_path path;
 void
 do_one_file (String init_str, String file_str)
 {
-  if (init_str && "" == path.find (init_str)) 
+  if (init_str.length_i () && path.find (init_str).empty_b ()) 
     {
       error ("Can not find `" + init_str +"\'");
       return ;
     }
-  if (file_str && !path.find (file_str))
+  if (file_str.length_i () && path.find (file_str).empty_b ())
     {
       error ("Can not find `" + file_str + "'");
       return ;
@@ -216,7 +216,7 @@ destill_inname (String &name_str_r)
 	  split_path (name_str_r,a,b,c,d);
 
 	  // add extension if not present.
-	  if (!d) 
+	  if (d.empty_b ()) 
 	    d = ".ly";
 	  name_str_r = a+b+c+d;
 	}
-- 
2.39.5