From: John Mandereau <john.mandereau@gmail.com>
Date: Sun, 12 Aug 2012 09:26:04 +0000 (+0200)
Subject: Fix Issue 2529 "configure should error for any missing software"
X-Git-Tag: release/2.17.0-1~31
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cfa910f1c13ae760756692175a733db4e5a8899a;p=lilypond.git

Fix Issue 2529 "configure should error for any missing software"

This is not an optimal fix, as by the moment this change is committed,
GUB bypasses configure for enabling documentation build, so
developers/packagers who call "configure --disable-documentation" will
still get warnings about missing requirements for documentation
build. The issues this patch addresses are
* adding missing documentation build requirements,
* enforcing all documentation build requirements in case
documentation build is enabled in configure.
---

diff --git a/aclocal.m4 b/aclocal.m4
index 682b6b1bd1..0dcd5bd870 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -377,7 +377,7 @@ AC_DEFUN(STEPMAKE_END, [
     
     if test -n "$OPTIONAL"; then
 	echo
-        echo "WARNING: Please consider installing optional programs: $OPTIONAL"
+        echo "WARNING: Please consider installing optional programs or files: $OPTIONAL"
     fi
 
     if test -n "$REQUIRED"; then
diff --git a/configure.in b/configure.in
index 3a9eec9628..7e1ecd1d4f 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,8 +168,6 @@ 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)
 
@@ -205,24 +205,42 @@ 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
+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}")