Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 0093d0a64c35f0c2f354fbed39876c8b8da608e2..ce169f0d668b57ac6a886b98f121889a7fe33349 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=""])
 
 reloc_b=no
 AC_ARG_ENABLE(relocation,
@@ -53,7 +53,38 @@ AC_SUBST(LINK_GXX_STATICALLY)
 # must come before any header checks
 STEPMAKE_COMPILE
 
-STEPMAKE_PYTHON(REQUIRED, 2.3)
+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
+  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
+    for style in Roman Italic "Bold Italic" Bold; do
+      NCSB_FILE=`$FCMATCH --verbose "Century Schoolbook L:style=$style" | grep 'file:'`
+
+      NCSB_FILE=`echo $NCSB_FILE | sed 's/^.*"\(.*\)".*$/\1/g'`
+      NCSB_FILE=`readlink -f $NCSB_FILE`
+      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_SOURCE_FILES)
+
+
+
+STEPMAKE_PYTHON(REQUIRED, 2.4)
 STEPMAKE_GCC(REQUIRED, 4.0)
 STEPMAKE_CXX(REQUIRED)
 STEPMAKE_GXX(REQUIRED, 4.0)
@@ -80,7 +111,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 +134,6 @@ if test "$reloc_b" = "yes"; then
     AC_DEFINE(ARGV0_RELOCATION)
 fi
 
-AC_MSG_CHECKING([New Century Schoolbook PFB 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)
-  fi
-fi
-
-
-AC_MSG_RESULT($NCSB_DIR)
-AC_SUBST(NCSB_DIR)
 
 HOST_ARCH=`$CC -dumpmachine`
 AC_SUBST(HOST_ARCH)