From: Han-Wen Nienhuys Date: Mon, 2 Jan 2006 22:40:51 +0000 (+0000) Subject: * configure.in (NCSB_DIR): --enable-ncsb-dir X-Git-Tag: release/2.7.27~21 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=736b46cb67d7ece3daf697ca742ecc9adab89754;p=lilypond.git * configure.in (NCSB_DIR): --enable-ncsb-dir (LINK_GXX_STATICALLY): denko. * configure.in (LINK_GXX_STATICALLY): --enable-ncsb-path option. use locate to find c059033l.pfb. --- diff --git a/configure.in b/configure.in index 34d9437082..5cb956ec69 100644 --- a/configure.in +++ b/configure.in @@ -121,12 +121,15 @@ AC_MSG_CHECKING([New Century Schoolbook PFB files]) if test "$NCSB_DIR" = "unknown"; then which locate >& /dev/null if test "$?" = "0"; then - ## sort to give precedence to /usr/ - NCSB_DIR=`locate c059033l.pfb | sort -r | head -1` - if test "$NCSB_DIR" = ""; 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 - NCSB_DIR=`dirname "$NCSB_DIR"` else AC_MSG_WARN(Could not find locate(1). Use --enable-ncsb-path to set path to c059033l.pfb) fi