X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=ffd787f4c969ff412eca125682fa489b774b7356;hb=c1aed27c7fc6f9315d2d617e39a3dddabfae491a;hp=b9e427a66e88ef0cfc37ca1038890e20b73b9cc7;hpb=5a462e8c890f6ea8c7e027fa899f583c34b76d61;p=lilypond.git diff --git a/configure.in b/configure.in index b9e427a66e..ffd787f4c9 100644 --- a/configure.in +++ b/configure.in @@ -53,8 +53,6 @@ AC_SUBST(LINK_GXX_STATICALLY) # must come before any header checks STEPMAKE_COMPILE -# os.path.realpath() requires python 2.2 and unix -STEPMAKE_PYTHON(REQUIRED, 2.2) AC_CHECK_PROG(FCMATCH, fc-match, fc-match) AC_MSG_CHECKING([New Century Schoolbook PFB files]) AC_SUBST(NCSB_SOURCE_FILES) @@ -87,10 +85,10 @@ AC_MSG_RESULT($NCSB_SOURCE_FILES) STEPMAKE_PYTHON(REQUIRED, 2.4) -STEPMAKE_GCC(REQUIRED, 4.0) +STEPMAKE_GCC(REQUIRED, 3.4) STEPMAKE_CXX(REQUIRED) -STEPMAKE_GXX(REQUIRED, 4.0) +STEPMAKE_GXX(REQUIRED, 3.4) STEPMAKE_CXXTEMPLATE STEPMAKE_STL_DATA_METHOD STEPMAKE_LIB(REQUIRED) @@ -128,15 +126,15 @@ AC_MSG_RESULT(Must have patched GUILE rational support. See INSTALL.txt)) CPPFLAGS="$save_CPPFLAGS" -# 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) -AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h]) +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]) AC_LANG_POP(C++) @@ -177,7 +175,7 @@ STEPMAKE_GUILE(OPTIONAL) STEPMAKE_PERL(OPTIONAL) STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11) -STEPMAKE_PROGS(TEXI2HTML, texi2html, REQUIRED, 1.79) +STEPMAKE_PROGS(TEXI2HTML, texi2html, OPTIONAL, 1.79) AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")