*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 4e2963f6b4a6a81f6a48546f8de63ccad5734af7..872388ba4e28adcf93c5692b31f2a3da623e8cfb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,12 @@
 
 2006-05-04  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * mf/GNUmakefile (depth): remove FC_FIND.
+
+       * config.make.in (NCSB_SOURCE_FILES): subst NCSB_SOURCE_FILES
+
+       * configure.in (LINK_GXX_STATICALLY): call fc-match from within configure.
+
        * scm/framework-ps.scm (write-preamble): new function.
        (write-preamble): load mac fonts via fondu, even if gs-font-load
        is set.

diff --git a/config.make.in b/config.make.in
index e3ed8fba4c847881361d009607bc25e22e0bee5c..8ecbc70b9802130e1fcfcb82e02b97f8126807ce 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -89,7 +89,7 @@ webdir = $(lilypond_docdir)/html
 vimdir = $(lilypond_datadir)/vim
 
 
-NCSB_DIR = @NCSB_DIR@
+NCSB_SOURCE_FILES = @NCSB_SOURCE_FILES@
 
 ################################################################
 ## PROGRAMS

diff --git a/configure.in b/configure.in
index 0093d0a64c35f0c2f354fbed39876c8b8da608e2..7d2307a134861e2f4d57b2118b5fd282aaf2a4b8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -80,7 +80,6 @@ STEPMAKE_PYTHON_DEVEL(REQUIRED)
 STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.15)
 
 STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.19)
-STEPMAKE_PROGS(FCMATCH, fc-match, OPTIONAL, 2.1.0)
 STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
 
 AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h])
@@ -104,17 +103,32 @@ if test "$reloc_b" = "yes"; then
     AC_DEFINE(ARGV0_RELOCATION)
 fi
 
+AC_CHECK_PROG(FCMATCH, fc-match, fc-match)
 AC_MSG_CHECKING([New Century Schoolbook PFB files])
-
+AC_SUBST(NCSB_SOURCE_FILES)
 if test "$NCSB_DIR" != "" ;  then
-  if  test ! -f "$NCSB_DIR/c059016l.pfb"; then
-      AC_MSG_WARN($NCSB_DIR does not contain c059033l.pfb. Use --with-ncsb-dir)
+  NCSB_SOURCE_FILES=""
+  for f in c059013l c059016l c059033l c059036l; do
+    if test ! -f "$NCSB_DIR/$f.pfb"; then
+      AC_MSG_WARN($NCSB_DIR does not contain $f.pfb.)
+    else
+      NCSB_SOURCE_FILES="$NCSB_DIR/$f.pfb $NCSB_SOURCE_FILES"
+    fi
+  done
+else
+  if test "$FCMATCH" != ""; then
+    echo $FCMATCH
+    for style in Roman Italic "Bold Italic" Bold; do
+      NCSB_FILE=`$FCMATCH --verbose 'Century Schoolbook L:style=$(1)' | grep 'file:' | sed 's/.*"\([^"]*\)".*/\1/g'`
+      NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES"
+    done
+  else
+    AC_MSG_RESULT(not found)
+    echo "Can't find Century Schoolbook files. Install FontConfig's fc-match,"
+    echo "or use --with-ncsb-dir"
   fi
 fi
-
-
-AC_MSG_RESULT($NCSB_DIR)
-AC_SUBST(NCSB_DIR)
+AC_MSG_RESULT($NCSB_SOURCE_FILES)
 
 HOST_ARCH=`$CC -dumpmachine`
 AC_SUBST(HOST_ARCH)