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

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 42eeda511c34842d022f8ee25aaf75555fb6d8f0..0093d0a64c35f0c2f354fbed39876c8b8da608e2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -34,10 +34,10 @@ AC_ARG_ENABLE(gui,
     [gui_b=$enableval])
 
 
-NCSB_DIR=unknown
 AC_ARG_WITH(ncsb-dir,
-[  --with-ncsb-dir=DIR     location of Century Schoolbook fonts.],
-    [NCSB_DIR=$withval])
+    [  --with-ncsb-dir=DIR     location of Century Schoolbook fonts.],
+    [NCSB_DIR=$withval],
+    )
 
 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,8 +105,11 @@ if test "$reloc_b" = "yes"; then
 fi
 
 AC_MSG_CHECKING([New Century Schoolbook PFB files])
-if test "$NCSB_DIR" = "unknown"; then
-    AC_MSG_WARN(Use --enable-ncsb-path to set path)
+
+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