From 33c6cf0164f0df1d13806471170e76e76f509463 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 1 May 2006 10:36:07 +0000 Subject: [PATCH] (conf_flags): set sensible default for with-ncsb-dir --- ChangeLog | 6 +++++- autogen.sh | 2 ++ configure.in | 11 +++++------ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef954b13d8..00bc21cd23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-05-01 Han-Wen Nienhuys + + * autogen.sh (conf_flags): set sensible default for with-ncsb-dir + 2006-05-01 Joe Neeman * scm/lily-library.scm: Fix guile 1.6 compatibility in inf? and nan? @@ -21,7 +25,7 @@ 2006-04-28 Graham Percival - * 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 diff --git a/autogen.sh b/autogen.sh index 2fd8bebd5a..9fc81d4919 100755 --- 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 42eeda511c..f04530aa98 100644 --- 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) -- 2.39.5