* mf/GNUmakefile (FC_FIND): new function. Find ncsb using

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index f04530aa984de99235dbf9fa7bdc714ddeed5a75..0093d0a64c35f0c2f354fbed39876c8b8da608e2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -37,7 +37,7 @@ AC_ARG_ENABLE(gui,
 AC_ARG_WITH(ncsb-dir,
     [  --with-ncsb-dir=DIR     location of Century Schoolbook fonts.],
     [NCSB_DIR=$withval],
-    [NCSB_DIR=/usr/share/fonts/default/Type1])
+    )
 
 reloc_b=no
 AC_ARG_ENABLE(relocation,
@@ -80,6 +80,7 @@ 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,10 +105,14 @@ if test "$reloc_b" = "yes"; then
 fi
 
 AC_MSG_CHECKING([New Century Schoolbook PFB files])
-if  test ! -f "$NCSB_DIR/c059016l.pfb"; then
-    AC_MSG_WARN($NCSB_DIR does not contain c059033l.pfb. Use --with-ncsb-dir)
+
+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)
+  fi
 fi
 
+
 AC_MSG_RESULT($NCSB_DIR)
 AC_SUBST(NCSB_DIR)