Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev...

diff --combined configure.in
index 325dfe2ddd2757a66f55f2da0840e667e54826a7,1f3040a93f1c1469a9f34349e8c07756d32a8daf..2a4350be741064afa25c45b8c1f368cd856e60e3
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -126,14 -126,15 +126,16 @@@ AC_MSG_RESULT(Must have patched GUILE r
  CPPFLAGS="$save_CPPFLAGS"
  
  
 -STEPMAKE_MAKEINFO(REQUIRED, 4.11)
 +# We check for makeinfo below, too. Really duplicate that check?
 +## STEPMAKE_MAKEINFO(REQUIRED, 4.11)
  STEPMAKE_PYTHON_DEVEL(REQUIRED)
  
  STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.15)
  
  STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
  
+ STEPMAKE_PATH_PROG(T1ASM, t1asm, REQUIRED)
+ 
  AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h fpu_control.h])
  AC_LANG_PUSH(C++)
  AC_CHECK_HEADERS([sstream boost/lambda/lambda.hpp])
@@@ -175,7 -176,6 +177,7 @@@ STEPMAKE_GUILE(OPTIONAL
  STEPMAKE_PERL(OPTIONAL)
  
  STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
 +STEPMAKE_PROGS(TEXI2HTML, texi2html, REQUIRED, 1.79)
  
  AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")