lilypond-1.5.31

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index a2e4043133ca5695df36776b563aa0965aba5e63..ac353fb528948079917066d9078f77881ae336fe 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -116,13 +116,13 @@ on the FTP site.
 You need the following packages to compile Lilypond.
 
 @itemize
-@item A reasonably new C++ compiler:  EGCS 1.1, GCC 2.95.2 or
+@item A reasonably new version of the GNU C++ compiler:  EGCS 1.1, GCC 2.95.2 or
 newer. Check out @uref{ftp://ftp.gnu.org/gnu/gcc/, the gcc site}.
 
-@item  Python (version 1.5 or newer; not 2.1.x)
+@item Python (version 1.5 or newer; not 2.1.x)
 Check out @uref{http://www.python.org, the python website}.
 
-@item  GUILE 1.4 or newer,  check out
+@item GUILE 1.4 or newer,  check out
 @uref{http://www.gnu.org/software/guile/guile.html,the GUILE webpage}.
 Version 1.4 is recommended for better performance.
 
@@ -171,20 +171,8 @@ configure something like:
 
 
 @item pktrace, [OPTIONAL], needed for generating PostScript Type1
-fonts. Get it from  @uref{http://www.cs.uu.nl/~hanwen/pktrace/}
-
-@item autotrace-0.27a, [OPTIONAL], needed for generating PostScript Type1
-fonts. @uref{http://autotrace.sourceforge.net}.
- 
-@item MetaPost [OPTIONAL] needed for generating PostScript Type3 fonts. Please
-note that tetex-0.4pl8 (included with Red Hat 5.x) does not include
-@file{mfplain.mp}, which is needed for producing the scalable font
-files.
-
-If you don't have MetaPost and don't want to use PostScript output, then
-edit @file{mf/GNUmakefile}, removing the line saying @code{PFA_FILES=}.
-
-
+fonts. Get it from  @uref{http://www.cs.uu.nl/~hanwen/pktrace/}.  You
+will need to install some additional packages to get pktrace to work.
 
 @end itemize
 

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 3003cbd938eec27cd4eb075798847334cab0a441..f305ef7b5ab275bf36ac16d38fe74943be070461 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -480,10 +480,12 @@ AC_DEFUN(AC_STEPMAKE_LEXYACC, [
     AC_CHECK_SEARCH_RESULT($BISON, bison,  Please install Bison, 1.25 or newer)
     AC_CHECK_SEARCH_RESULT($FLEX,  flex, Please install Flex, 2.5 or newer)
 
+
+## Urg. We should fix this configure test. -- so clumsy
     if test $BISON != "error"; then
-       bison_version=`$BISON --version | sed 's/^.*version 1.//g'`
-       if test `echo $bison_version | sed 's/\..*$//g'` -lt 25; then
-           AC_STEPMAKE_WARN(Your bison is a bit old (1.$bison_version). You might have to install 1.25)
+       bison_version=`$BISON --version | head -1 | sed 's/^.* 1\.//g'`
+       if test $bison_version -lt 25; then
+           AC_STEPMAKE_WARN(The bison installed might be too old (1.$bison_version). You might have to install 1.25)
        fi      
     fi
 
@@ -691,25 +693,12 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [
        METAFONT=$MFONT
     fi
 
-    AC_CHECK_PROGS(METAPOST, mp, no)
-    if test "x$METAPOST" = "xno"; then
-       AC_CHECK_PROGS(MPOST, mpost, -echo no mp or mpost)
-
-       METAPOST=$MPOST
-    fi
-
     AC_CHECK_PROGS(INIMETAFONT, inimf, no)
     if test "x$INIMETAFONT" = "xno"; then
        AC_CHECK_PROGS(INIMFONT, inimfont, -echo no inimf or inimfont)
        INIMETAFONT=$INIMFONT
     fi
 
-    AC_CHECK_PROGS(INIMETAPOST, inimp, no)
-    if test "x$INIMETAPOST" = "xno"; then
-       AC_CHECK_PROGS(INIMPOST, inimpost, -echo no inimp or inimpost)
-       INIMETAPOST=$INIMPOST
-    fi
-
     AC_MSG_CHECKING(for working metafont mode)
     modelist='ljfour lj4 lj3 lj2 ljet laserjet'
     for MFMODE in $modelist; do
@@ -720,30 +709,11 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [
     done
     AC_MSG_RESULT($MFMODE)
 
-    AC_MSG_CHECKING(for mfplain.mp)
-    #
-    # For now let people define these in their environments
-    #
-    : ${MFPLAIN_MP=`kpsewhich --format mp mfplain.mp`}
-    AC_MSG_RESULT($MFPLAIN_MP)
-
-    AC_MSG_CHECKING(for inimetapost flags)
-    if test  ${INIMETAPOST} = "inimp" ; then
-       : ${INIMETAPOST_FLAGS=''}
-    else
-       : ${INIMETAPOST_FLAGS='-interaction=nonstopmode'}
-    fi
-    AC_MSG_RESULT($INIMETAPOST_FLAGS)
-
     rm -f mfput.*
 
     AC_SUBST(METAFONT)
-    AC_SUBST(METAPOST)
     AC_SUBST(MFMODE)
     AC_SUBST(INIMETAFONT)
-    AC_SUBST(INIMETAPOST)
-    AC_SUBST(MFPLAIN_MP)
-    AC_SUBST(INIMETAPOST_FLAGS)
 ])
 
 AC_DEFUN(AC_STEPMAKE_WARN, [