X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=489457146a90d9116001906651e926bb3575d993;hb=a3e8e2496e7488def52b7589cbd305bc003cf11a;hp=9323c37602c58aaea8ee3ca041e8f15157bdd6e9;hpb=0f5b6ddedfee2912f850d0afd86600ecd4ab5a93;p=lilypond.git

diff --git a/configure.in b/configure.in
index 9323c37602..489457146a 100644
--- a/configure.in
+++ b/configure.in
@@ -34,11 +34,10 @@ AC_ARG_ENABLE(gui,
     [gui_b=$enableval])
 
 
-NCSB_DIR=unknown
 AC_ARG_WITH(ncsb-dir,
-[  --with-ncsb-dir=DIR     location of Century Schoolbook fonts
-                            Default: detect with locate(1)],
-    [NCSB_DIR=$withval])
+    [  --with-ncsb-dir=DIR     location of Century Schoolbook fonts.],
+    [NCSB_DIR=$withval],
+    [NCSB_DIR=""])
 
 reloc_b=no
 AC_ARG_ENABLE(relocation,
@@ -54,7 +53,40 @@ 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)
@@ -104,27 +136,6 @@ if test "$reloc_b" = "yes"; then
     AC_DEFINE(ARGV0_RELOCATION)
 fi
 
-AC_MSG_CHECKING([New Century Schoolbook PFB files])
-if test "$NCSB_DIR" = "unknown"; then
-  # use `type' command rather than external program `which'
-  type locate >& /dev/null
-  if test "$?" = "0"; then
-      for d in `locate c059033l.pfb `; do
-	  if test -f `dirname "$d"`/c059033l.afm ; then
-	      NCSB_DIR=`dirname "$d"`
-	      break 
-	  fi
-      done
-      if test "$NCSB_DIR" = "unknown";  then
-	  AC_MSG_WARN(Could not find c059033l.pfb. Use --enable-ncsb-path to set path)
-      fi
-  else
-     AC_MSG_WARN(Could not find locate(1). Use --enable-ncsb-path to set path to c059033l.pfb)
-  fi
-fi
-
-AC_MSG_RESULT($NCSB_DIR)
-AC_SUBST(NCSB_DIR)
 
 HOST_ARCH=`$CC -dumpmachine`
 AC_SUBST(HOST_ARCH)