X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=16cb3c3f211afbae5d9021ca509a2fc2bb33343c;hb=c750e9b0ef41267a9b6be0300c880047f48b9353;hp=ce169f0d668b57ac6a886b98f121889a7fe33349;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git diff --git a/configure.in b/configure.in index ce169f0d66..16cb3c3f21 100644 --- a/configure.in +++ b/configure.in @@ -53,6 +53,8 @@ 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) @@ -71,7 +73,7 @@ else NCSB_FILE=`$FCMATCH --verbose "Century Schoolbook L:style=$style" | grep 'file:'` NCSB_FILE=`echo $NCSB_FILE | sed 's/^.*"\(.*\)".*$/\1/g'` - NCSB_FILE=`readlink -f $NCSB_FILE` + NCSB_FILE=`$PYTHON "$srcdir/buildscripts/readlink.py" $NCSB_FILE` NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES" done else @@ -86,6 +88,7 @@ AC_MSG_RESULT($NCSB_SOURCE_FILES) STEPMAKE_PYTHON(REQUIRED, 2.4) STEPMAKE_GCC(REQUIRED, 4.0) + STEPMAKE_CXX(REQUIRED) STEPMAKE_GXX(REQUIRED, 4.0) STEPMAKE_CXXTEMPLATE @@ -157,10 +160,11 @@ STEPMAKE_PERL(OPTIONAL) # makeinfo should avoid bug reports; if people want to build lily # without the docs, they can find this comment and use an older # makeinfo--but hopefully won't report makeinfo problems. -STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.7) +STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.8) AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}") + # Gather requirements and generate output. STEPMAKE_END