Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 00f3e75e5ce380fdfe71a3290a28a53209ad1681..16cb3c3f211afbae5d9021ca509a2fc2bb33343c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -73,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=`$PYTHON buildscripts/readlink.py $NCSB_FILE`
+      NCSB_FILE=`$PYTHON "$srcdir/buildscripts/readlink.py" $NCSB_FILE`
       NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES"
     done
   else
@@ -88,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
@@ -159,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