(conf_flags): set sensible default for with-ncsb-dir

diff --git a/ChangeLog b/ChangeLog
index ef954b13d844e2dd4bf1a7d8ad530cb4d11cf4cb..00bc21cd232012416bc7793340b6fdb23b487088 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-01  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * autogen.sh (conf_flags): set sensible default for with-ncsb-dir
+
 2006-05-01  Joe Neeman  <joeneeman@gmail.com>
 
        * scm/lily-library.scm: Fix guile 1.6 compatibility in inf? and nan?
@@ -21,7 +25,7 @@
 
 2006-04-28  Graham Percival  <gpermus@gmail.com>
 
-       * Documentaiton/user/ various: major new sections in the
+       * Documentation/user/ various: major new sections in the
        Learning manual, slight reorg elsewhere.
 
 2006-04-27  Han-Wen Nienhuys  <hanwen@lilypond.org>

diff --git a/autogen.sh b/autogen.sh
index 2fd8bebd5a533bcaf7e9b932c0b0bf4fd6e5919d..9fc81d4919f70d2b0bf02ad9d4aa62533e1e1df5 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -50,6 +50,8 @@ do
 done
 
 #conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
+conf_flags="--with-ncsb-dir=/usr/share/fonts/default/Type1/"
+
 if test -n "$NOCONFIGURE"; then
     echo Skipping configure process.
     exit 0

diff --git a/configure.in b/configure.in
index 42eeda511c34842d022f8ee25aaf75555fb6d8f0..f04530aa984de99235dbf9fa7bdc714ddeed5a75 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -34,10 +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.],
-    [NCSB_DIR=$withval])
+    [  --with-ncsb-dir=DIR     location of Century Schoolbook fonts.],
+    [NCSB_DIR=$withval],
+    [NCSB_DIR=/usr/share/fonts/default/Type1])
 
 reloc_b=no
 AC_ARG_ENABLE(relocation,
@@ -104,11 +104,10 @@ if test "$reloc_b" = "yes"; then
 fi
 
 AC_MSG_CHECKING([New Century Schoolbook PFB files])
-if test "$NCSB_DIR" = "unknown"; then
-    AC_MSG_WARN(Use --enable-ncsb-path to set path)
+if  test ! -f "$NCSB_DIR/c059016l.pfb"; then
+    AC_MSG_WARN($NCSB_DIR does not contain c059033l.pfb. Use --with-ncsb-dir)
 fi
 
-
 AC_MSG_RESULT($NCSB_DIR)
 AC_SUBST(NCSB_DIR)