X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=16cb3c3f211afbae5d9021ca509a2fc2bb33343c;hb=3ee5a5b2e566aa1638b4cb2d883e8e2b99c3fce5;hp=7d2307a134861e2f4d57b2118b5fd282aaf2a4b8;hpb=35382de43a91c018d422908bde1c58ecb97cc573;p=lilypond.git

diff --git a/configure.in b/configure.in
index 7d2307a134..16cb3c3f21 100644
--- a/configure.in
+++ b/configure.in
@@ -37,7 +37,7 @@ AC_ARG_ENABLE(gui,
 AC_ARG_WITH(ncsb-dir,
     [  --with-ncsb-dir=DIR     location of Century Schoolbook fonts.],
     [NCSB_DIR=$withval],
-    )
+    [NCSB_DIR=""])
 
 reloc_b=no
 AC_ARG_ENABLE(relocation,
@@ -53,8 +53,42 @@ AC_SUBST(LINK_GXX_STATICALLY)
 # must come before any header checks
 STEPMAKE_COMPILE
 
-STEPMAKE_PYTHON(REQUIRED, 2.3)
+# 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)
+if test "$NCSB_DIR" != "" ;  then
+  NCSB_SOURCE_FILES=""
+  for f in c059013l c059016l c059033l c059036l; do
+    if test ! -f "$NCSB_DIR/$f.pfb"; then
+      AC_MSG_WARN($NCSB_DIR does not contain $f.pfb.)
+    else
+      NCSB_SOURCE_FILES="$NCSB_DIR/$f.pfb $NCSB_SOURCE_FILES"
+    fi
+  done
+else
+  if test "$FCMATCH" != ""; then
+    for style in Roman Italic "Bold Italic" Bold; do
+      NCSB_FILE=`$FCMATCH --verbose "Century Schoolbook L:style=$style" | grep 'file:'`
+
+      NCSB_FILE=`echo $NCSB_FILE | sed 's/^.*"\(.*\)".*$/\1/g'`
+      NCSB_FILE=`$PYTHON "$srcdir/buildscripts/readlink.py" $NCSB_FILE`
+      NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES"
+    done
+  else
+    AC_MSG_RESULT(not found)
+    echo "Can't find Century Schoolbook files. Install FontConfig's fc-match,"
+    echo "or use --with-ncsb-dir"
+  fi
+fi
+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
@@ -103,32 +137,6 @@ if test "$reloc_b" = "yes"; then
     AC_DEFINE(ARGV0_RELOCATION)
 fi
 
-AC_CHECK_PROG(FCMATCH, fc-match, fc-match)
-AC_MSG_CHECKING([New Century Schoolbook PFB files])
-AC_SUBST(NCSB_SOURCE_FILES)
-if test "$NCSB_DIR" != "" ;  then
-  NCSB_SOURCE_FILES=""
-  for f in c059013l c059016l c059033l c059036l; do
-    if test ! -f "$NCSB_DIR/$f.pfb"; then
-      AC_MSG_WARN($NCSB_DIR does not contain $f.pfb.)
-    else
-      NCSB_SOURCE_FILES="$NCSB_DIR/$f.pfb $NCSB_SOURCE_FILES"
-    fi
-  done
-else
-  if test "$FCMATCH" != ""; then
-    echo $FCMATCH
-    for style in Roman Italic "Bold Italic" Bold; do
-      NCSB_FILE=`$FCMATCH --verbose 'Century Schoolbook L:style=$(1)' | grep 'file:' | sed 's/.*"\([^"]*\)".*/\1/g'`
-      NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES"
-    done
-  else
-    AC_MSG_RESULT(not found)
-    echo "Can't find Century Schoolbook files. Install FontConfig's fc-match,"
-    echo "or use --with-ncsb-dir"
-  fi
-fi
-AC_MSG_RESULT($NCSB_SOURCE_FILES)
 
 HOST_ARCH=`$CC -dumpmachine`
 AC_SUBST(HOST_ARCH)
@@ -152,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