X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=325dfe2ddd2757a66f55f2da0840e667e54826a7;hb=edf17353d89f4f6bd831466262402bb9151a26ca;hp=b15a0b0de07d26044bd63cf1c294ced47a96dbc7;hpb=70cdb3118765db18800ab76ea62b9c187e9acd52;p=lilypond.git diff --git a/configure.in b/configure.in index b15a0b0de0..325dfe2ddd 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,14 +126,15 @@ AC_MSG_RESULT(Must have patched GUILE rational support. See INSTALL.txt)) 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) -AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h]) +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++) @@ -176,6 +175,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}")