X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=954db04cadbe844acba4d4c0512a62faa03a989c;hb=13da8b2;hp=3a9eec962828c606429d0f00aadde334b99ba6d9;hpb=6c323bc1bb27a79f687f5f3f3ed6b105aad24caa;p=lilypond.git

diff --git a/configure.in b/configure.in
index 3a9eec9628..954db04cad 100644
--- a/configure.in
+++ b/configure.in
@@ -81,12 +81,14 @@ else
     AC_MSG_RESULT(not found)
     echo "Can't find Century Schoolbook files. Install FontConfig's fc-list,"
     echo "or use --with-ncsb-dir"
+    STEPMAKE_ADD_ENTRY(REQUIRED,International New Century Schoolbook fonts)
   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.)
+    STEPMAKE_ADD_ENTRY(REQUIRED,International New Century Schoolbook fonts)
   else
     NCSB_SOURCE_FILES="$f $NCSB_SOURCE_FILES"
   fi
@@ -166,10 +168,7 @@ CPPFLAGS="$save_CPPFLAGS"
 
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
-STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.60)
-
-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)
 
@@ -205,24 +204,51 @@ STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10)
 
 STEPMAKE_WINDOWS
 
-## Optional tools for building documentation, website, extra fonts.
-
 # guile executable for some scripts
 STEPMAKE_GUILE(OPTIONAL)
 
 # perl for help2man.
 STEPMAKE_PERL(OPTIONAL)
 
+## Optional tools for building documentation, website, extra fonts.
+if test "$DOCUMENTATION" = "yes"; then
+  DOCUMENTATION_REQUIRED=REQUIRED
+else
+  DOCUMENTATION_REQUIRED=OPTIONAL
+fi
+
+STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, $DOCUMENTATION_REQUIRED, 8.60)
+
 STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
-STEPMAKE_PROGS(TEXI2HTML, texi2html, OPTIONAL, 1.82)
-STEPMAKE_PROGS(DBLATEX, dblatex, OPTIONAL, 0.1.4)
-STEPMAKE_PROGS(PDFLATEX, pdflatex, OPTIONAL)
-STEPMAKE_PROGS(NETPBM, pngtopnm, OPTIONAL)
-STEPMAKE_PROGS(IMAGEMAGICK, convert, OPTIONAL)
+STEPMAKE_PROGS(TEXI2HTML, texi2html, $DOCUMENTATION_REQUIRED, 1.82)
+STEPMAKE_PROGS(DBLATEX, dblatex, $DOCUMENTATION_REQUIRED, 0.1.4)
+STEPMAKE_PROGS(BIBTEX, bibtex, $DOCUMENTATION_REQUIRED)
+STEPMAKE_PROGS(PDFLATEX, pdflatex, $DOCUMENTATION_REQUIRED)
+STEPMAKE_PROGS(PDFTEX, pdfetex pdftex etex, $DOCUMENTATION_REQUIRED)
+STEPMAKE_PROGS(TEXI2PDF, texi2pdf, $DOCUMENTATION_REQUIRED)
+STEPMAKE_PROGS(TEXINDEX, texindex, $DOCUMENTATION_REQUIRED)
+AC_MSG_CHECKING(for epsf.tex)
+TEX_EPSF=`kpsewhich tex epsf`
+if test "$TEX_EPSF" = ""; then
+    AC_MSG_RESULT(not found)
+    STEPMAKE_ADD_ENTRY($DOCUMENTATION_REQUIRED,epsf.tex)
+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
-STEPMAKE_PROGS(ZIPDOC, zip, OPTIONAL)
-STEPMAKE_PROGS(RSYNC, rsync, OPTIONAL)
-
+STEPMAKE_PROGS(ZIPDOC, zip, $DOCUMENTATION_REQUIRED)
+STEPMAKE_PROGS(RSYNC, rsync, $DOCUMENTATION_REQUIRED)
 
 AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")