From a3ee15ee652ba15dd03bda1547991d618c63434a Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 27 Jun 2005 11:05:32 +0000
Subject: [PATCH] * Documentation/topdocs/INSTALL.texi (Top): remove EC fonts
 requirement.

* configure.in (reloc_b): make fontconfig REQUIRED.
---
 ChangeLog                          |  8 ++++++++
 Documentation/topdocs/INSTALL.texi | 31 +++++++-----------------------
 configure.in                       |  2 +-
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d873fba9c8..854d12b63b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,17 @@
+2005-06-27  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* Documentation/topdocs/INSTALL.texi (Top): remove EC fonts requirement.
+
+	* configure.in (reloc_b): make fontconfig REQUIRED.
+
 2005-06-27  Heikki Junes <hjunes@cc.hut.fi>
 
 	* po/fi.po: add latest translations.
 
 2005-06-27  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* ChangeLog: recode utf-8
+
 	* Documentation/pictures/lilypond.xpm (Module): edited photo as
 	logo.
 
diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index db1a748b5d..aacf932b43 100644
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -54,8 +54,8 @@ For information on packaging, see @uref{http://lilypond.org/devel}.
 
 @subsection Precompiled binary packages
 
-Check out @uref{http://lilypond.org/download} for up to date information on
-binary packages for your platform.
+Check out @uref{http://lilypond.org/web/install/} for up to date
+information on binary packages for your platform.
 
 
 @section Requirements
@@ -70,9 +70,9 @@ FOO-devel, libFOO-dev or FOO-dev package too.
 
 @itemize
 
-@item @uref{http://fontforge.sf.net/,FontForge} 20041211 or newer.
+@item @uref{http://fontforge.sf.net/,FontForge} 20050530 or newer.
 
-@item @uref{http://www.xs4all.nl/~hanwen/mftrace/,mftrace} (1.1.0 or
+@item @uref{http://www.xs4all.nl/~hanwen/mftrace/,mftrace} (1.1.9 or
 newer),
 
 You will need to install some additional packages to get mftrace to
@@ -82,20 +82,10 @@ work.
 (version 1.6.5 or newer).  If you are installing binary packages, you
 may need to install guile-devel or guile-dev or libguile-dev too.
 
-@item @TeX{}.
-
-@TeX{} is used as an optional output backend.
-
-Also, @TeX{}'s libkpathsea is used to find the fonts (@file{.mf},
-@file{.afm}, @file{.tfm}).  Make sure you have tetex 1.0 or newer
-(1.0.6 is known to work).  If you are installing binary packages, you
-may need to install tetex-devel, tetex-dev or libkpathsea-dev too.
-
-
-@item @uref{ftp://ftp.gnu.org/gnu/texinfo/,Texinfo} (version 4.7 or newer).
+@item @uref{ftp://ftp.gnu.org/gnu/texinfo/,Texinfo} (version 4.8 or newer).
 
 @item
- @uref{http://gcc.gnu.org/, The GNU c++ compiler} (version 3.1 or
+ @uref{http://gcc.gnu.org/, The GNU c++ compiler} (version 3.3 or
 newer).  EGCS and 2.x are known to cause crashes.
 
 @item @uref{http://www.python.org,Python} (version 2.1 or newer).
@@ -117,6 +107,7 @@ software
 @itemize @bullet
 
 @item @uref{http://www.freetype.org/,Freetype} (version 2).
+@item @uref{http://www.freetype.org/,FontConfig} (version 2.2).
 @item @uref{http://www.pango.org/,Pango} (version 1.6 or newer).
 @item @uref{http://www.gnu.org/software/guile/guile.html,GUILE}
 (version 1.6.5 or newer).
@@ -140,7 +131,6 @@ make web
 Building the website requires some additional tools and packages
 
 @itemize @bullet
-@item @uref{http://lilypond.org/download/fonts,ec-fonts-mftraced}
 @item The @uref{http://netpbm.sourceforge.net/,netpbm utilities}
 @item ImageMagick
 @item International fonts (see input/regression/utf-8.ly for hints
@@ -189,13 +179,6 @@ points into your home directory, e.g.
 @end example
 @end quotation
 
-@ignore
-In this case, you have to insert the contents of
-@code{buildscripts/out/lilypond-login} or
-@code{buildscripts/out/lilypond-profile} into your start up scripts by
-hand.
-@end ignore
-
 
 @subsection Configuring for multiple platforms
 
diff --git a/configure.in b/configure.in
index faa182f2e4..98890053fd 100644
--- a/configure.in
+++ b/configure.in
@@ -88,7 +88,7 @@ fi # $reloc_b
 STEPMAKE_FREETYPE2(freetype2, REQUIRED, 0)
 #STEPMAKE_PANGO(pango, REQUIRED, 1.6.0)
 STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0)
-STEPMAKE_FONTCONFIG(fontconfig, OPTIONAL, 2.2.0)
+STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.2.0)
 
 STEPMAKE_WINDOWS
 
-- 
2.39.5