(LINK_GXX_STATICALLY): remove locate() call.

diff --git a/ChangeLog b/ChangeLog
index 620923537a7b7c5818d0f5b2e78936c427e4028b..5ab363e9813340d21b85899c806bc8514812b5ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-01  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * configure.in (LINK_GXX_STATICALLY): remove locate() call.
+
 2006-04-30  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * python/convertrules.py (conv): indent 4 for python files.
@@ -14,6 +18,8 @@
 
 2006-04-27  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * mf/GNUmakefile (MFTRACE_FLAGS): add $(outdir) to $(ENCODING_FILE) 
+
        * scm/framework-ps.scm (output-framework): remove PageMedia
 
 2006-04-27  Graham Percival  <gpermus@gmail.com>

diff --git a/VERSION b/VERSION
index 94c00a4cecab7fcadf2ed6e2202aea7094ca1976..c6046fa0f2226167e2961ce9ff5215e77e8c473c 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=9
-PATCH_LEVEL=2
+PATCH_LEVEL=3
 MY_PATCH_LEVEL=
 

diff --git a/configure.in b/configure.in
index 9323c37602c58aaea8ee3ca041e8f15157bdd6e9..42eeda511c34842d022f8ee25aaf75555fb6d8f0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -36,8 +36,7 @@ AC_ARG_ENABLE(gui,
 
 NCSB_DIR=unknown
 AC_ARG_WITH(ncsb-dir,
-[  --with-ncsb-dir=DIR     location of Century Schoolbook fonts
-                            Default: detect with locate(1)],
+[  --with-ncsb-dir=DIR     location of Century Schoolbook fonts.],
     [NCSB_DIR=$withval])
 
 reloc_b=no
@@ -106,23 +105,10 @@ 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
+    AC_MSG_WARN(Use --enable-ncsb-path to set path)
 fi
 
+
 AC_MSG_RESULT($NCSB_DIR)
 AC_SUBST(NCSB_DIR)