X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=66799abd3b43e994ea58eb32f29c440228e87f44;hb=41839ed7390861d2a3f3fa31c5fc93a28599d99e;hp=b2fc7f4be7cfa6b7e845e56e8e901cef327d4155;hpb=313d8aee251fb0aa89dfc3b23abeb869fdd1355a;p=lilypond.git

diff --git a/configure.in b/configure.in
index b2fc7f4be7..66799abd3b 100644
--- a/configure.in
+++ b/configure.in
@@ -62,13 +62,14 @@ STEPMAKE_COMPILE
 AC_CHECK_PROG(FCLIST, fc-list, fc-list)
 AC_MSG_CHECKING([New Century Schoolbook PFB files])
 AC_SUBST(NCSB_SOURCE_FILES)
+AC_SUBST(NCSB_DIR)
+UNCHECKED_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
       STEPMAKE_WARN($NCSB_DIR does not contain $f.pfb.)
     else
-      NCSB_SOURCE_FILES="$NCSB_DIR/$f.pfb $NCSB_SOURCE_FILES"
+      UNCHECKED_NCSB_SOURCE_FILES="$NCSB_DIR/$f.pfb $UNCHECKED_NCSB_SOURCE_FILES"
     fi
   done
 else
@@ -76,16 +77,25 @@ else
     for style in Roman Italic "Bold Italic" Bold; do
       NCSB_FILE=`$FCLIST "Century Schoolbook L:style=$style:foundry=urw:fontformat=Type 1" file \
                 | head -n 1`
-      NCSB_FILE=`echo $NCSB_FILE | sed 's/^\(.*\):$/\1/g'`
+      NCSB_FILE=`echo $NCSB_FILE | sed 's/\(:.*\)$//g'`
       NCSB_FILE=`$PYTHON "$srcdir/scripts/auxiliar/readlink.py" $NCSB_FILE`
-      NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES"
+      UNCHECKED_NCSB_SOURCE_FILES="$NCSB_FILE $UNCHECKED_NCSB_SOURCE_FILES"
     done
+    NCSB_DIR=`AS_DIRNAME($NCSB_FILE)`
   else
     AC_MSG_RESULT(not found)
     echo "Can't find Century Schoolbook files. Install FontConfig's fc-list,"
     echo "or use --with-ncsb-dir"
   fi
 fi
+NCSB_SOURCE_FILES=""
+for f in $UNCHECKED_NCSB_SOURCE_FILES; do
+  if test "`grep Cyrillic "$f"`" = ""; then
+    STEPMAKE_WARN($f does not have Cyrillic characters.)
+  else
+    NCSB_SOURCE_FILES="$f $NCSB_SOURCE_FILES"
+  fi
+done
 AC_MSG_RESULT($NCSB_SOURCE_FILES)
 
 AC_LANG([C++])
@@ -210,7 +220,7 @@ STEPMAKE_PERL(OPTIONAL)
 
 STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
 STEPMAKE_PROGS(TEXI2HTML, texi2html, OPTIONAL, 1.82)
-STEPMAKE_PROGS(DBLATEX, dblatex, OPTIONAL)
+STEPMAKE_PROGS(DBLATEX, dblatex, OPTIONAL, 0.1.4)
 STEPMAKE_PROGS(PDFLATEX, pdflatex, OPTIONAL)
 STEPMAKE_PROGS(NETPBM, pngtopnm, OPTIONAL)
 STEPMAKE_PROGS(IMAGEMAGICK, convert, OPTIONAL)