From: Werner Lemberg <wl@gnu.org>
Date: Thu, 27 Aug 2009 13:33:19 +0000 (+0200)
Subject: [config] Use fc-list.
X-Git-Tag: release/2.12.3-1~6
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=90875da23e480d263aecd479d5454b816d47dd8b;p=lilypond.git

[config] Use fc-list.

In case there are different Century fonts available on the system (for
example, in both PFB and OTF format), fc-match only lists the first match
which can be the non-PFB one, while fc-list lists them all.
(cherry picked from commit 7ba0a94a28b3f5f156bfd65f9a77c5eb0a604b8f)
---

diff --git a/configure.in b/configure.in
index e2118d95f5..7c2c6c2de9 100644
--- a/configure.in
+++ b/configure.in
@@ -58,7 +58,7 @@ AC_SUBST(LINK_GXX_STATICALLY)
 # must come before any header checks
 STEPMAKE_COMPILE
 
-AC_CHECK_PROG(FCMATCH, fc-match, fc-match)
+AC_CHECK_PROG(FCLIST, fc-list, fc-list)
 AC_MSG_CHECKING([New Century Schoolbook PFB files])
 AC_SUBST(NCSB_SOURCE_FILES)
 if test "$NCSB_DIR" != "" ;  then
@@ -71,9 +71,9 @@ if test "$NCSB_DIR" != "" ;  then
     fi
   done
 else
-  if test "$FCMATCH" != ""; then
+  if test "$FCLIST" != ""; then
     for style in Roman Italic "Bold Italic" Bold; do
-      NCSB_FILE=`$FCMATCH --verbose "Century Schoolbook L:style=$style:foundry=urw" \
+      NCSB_FILE=`$FCLIST --verbose "Century Schoolbook L:style=$style:foundry=urw" \
                 | grep 'file:' \
                 | grep -v "\.@<:@ot@:>@tf"`
 
@@ -83,7 +83,7 @@ else
     done
   else
     AC_MSG_RESULT(not found)
-    echo "Can't find Century Schoolbook files. Install FontConfig's fc-match,"
+    echo "Can't find Century Schoolbook files. Install FontConfig's fc-list,"
     echo "or use --with-ncsb-dir"
   fi
 fi