]> git.donarmstrong.com Git - lilypond.git/commitdiff
[config] Use fc-list.
authorWerner Lemberg <wl@gnu.org>
Thu, 27 Aug 2009 13:33:19 +0000 (15:33 +0200)
committerPatrick McCarty <pnorcks@gmail.com>
Wed, 16 Sep 2009 18:35:53 +0000 (11:35 -0700)
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)

configure.in

index e2118d95f598ca016eaa350497cf727da45950c5..7c2c6c2de9013082f68d35df3313aa413ab053cb 100644 (file)
@@ -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