From: Patrick McCarty <pnorcks@gmail.com>
Date: Sat, 8 May 2010 20:42:31 +0000 (-0700)
Subject: Build: Bump Fontconfig minimum version.
X-Git-Tag: release/2.13.21-1~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=43a0ef298350423a7b461523e900b63ad2c331db;p=lilypond.git

Build: Bump Fontconfig minimum version.

LilyPond currently uses an interface from Fontconfig that was
obsoleted in Fontconfig 2.3.96.  To prepare for a code cleanup (in
the next commit), bump Fontconfig to 2.4.0, the next stable
release following 2.3.96.
---

diff --git a/Documentation/included/compile.itexi b/Documentation/included/compile.itexi
index 7be0903b0b..81d82ddf25 100644
--- a/Documentation/included/compile.itexi
+++ b/Documentation/included/compile.itexi
@@ -69,7 +69,7 @@ software:
 @item @uref{http://www.dejavu-fonts.org/, DejaVu fonts} (normally
 installed by default)
 
-@item @uref{http://www.fontconfig.org/, FontConfig} (2.2 or newer)
+@item @uref{http://www.fontconfig.org/, FontConfig} (2.4.0 or newer)
 
 @item @uref{http://www.freetype.org/, Freetype} (2.1.10 or newer)
 
diff --git a/configure.in b/configure.in
index 51be105f6c..fcdaa58884 100644
--- a/configure.in
+++ b/configure.in
@@ -168,7 +168,7 @@ HOST_ARCH=`$CC -dumpmachine`
 AC_SUBST(HOST_ARCH)
 
 STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0)
-STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.2.0)
+STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.4.0)
 STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10)
 
 STEPMAKE_WINDOWS