Merge remote-tracking branch 'origin/master' into translation

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 7e1ecd1d4f17c2123397992fd60e19e92ffd985c..954db04cadbe844acba4d4c0512a62faa03a989c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -168,8 +168,7 @@ CPPFLAGS="$save_CPPFLAGS"
 
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
-STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20100501)
-STEPMAKE_PATH_PROG(FONTFORGE, fontforge, OPTIONAL, 20110222)
+STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20110222)
 
 STEPMAKE_PATH_PROG(T1ASM, t1asm, REQUIRED)
 
@@ -236,6 +235,15 @@ if test "$TEX_EPSF" = ""; then
 else
     AC_MSG_RESULT($TEX_EPSF)
 fi
+AC_MSG_CHECKING(for Cyrillic characters support in TeX)
+TEX_FIKPARM=`kpsewhich -format=mf fikparm`
+if test "$TEX_FIKPARM" = ""; then
+    AC_MSG_RESULT(not found)
+    STEPMAKE_ADD_ENTRY($DOCUMENTATION_REQUIRED,
+['lh CTAN package (texlive-lang-cyrillic or texlive-texmf-fonts)'])
+else
+    AC_MSG_RESULT(yes)
+fi
 STEPMAKE_PROGS(NETPBM, pngtopnm, $DOCUMENTATION_REQUIRED)
 STEPMAKE_PROGS(IMAGEMAGICK, convert, $DOCUMENTATION_REQUIRED)
 # this name avoids a conflict with ZIP in stepmake/aclocal.m4