(LINK_GXX_STATICALLY): --enable-ncsb-path option.

use locate to find c059033l.pfb.

diff --git a/ChangeLog b/ChangeLog
index d18c272a61b46d56a3f4786de092ad351536ede4..0a662571dbc1e5026a769d9d25d09128e7895300 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-02  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * configure.in (LINK_GXX_STATICALLY): --enable-ncsb-path option. 
+       use locate to find c059033l.pfb. 
+       
 2006-01-02  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/tie-formatting-problem.cc

diff --git a/config.make.in b/config.make.in
index 3d4295fbc763ca349e2f5d237c90ba7090266e3c..6d7dea2de82ef7e81513e33ec8d0ebccce296265 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -7,6 +7,10 @@ MISSING_REQUIRED = @REQUIRED@
 
 package-depth = @package_depth@
 
+################################################################
+## FLAGS
+################################################################
+
 FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GUILE_CFLAGS = @GUILE_CFLAGS@
@@ -31,6 +35,10 @@ PACKAGE = @PACKAGE@
 package = @package@
 PACKAGE_NAME = @PACKAGE_NAME@
 
+################################################################
+## FILESYSTEM
+################################################################
+
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
@@ -78,6 +86,13 @@ lilypond_omfdir = $(local_package_omfdir)
 webdir = $(lilypond_docdir)/html
 vimdir = $(lilypond_datadir)/vim
 
+
+NCSB_PATH = @NCSB_PATH@
+
+################################################################
+## PROGRAMS
+################################################################
+
 AR = @AR@
 BASH = @BASH@
 BISON = @BISON@
@@ -125,3 +140,4 @@ TAR = @TAR@
 WINDRES = @WINDRES@
 YACC = @YACC@
 ZIP = @ZIP@
+

diff --git a/configure.in b/configure.in
index 46b6feeb9079016d94eec25d8f8af971c2b275ab..f4667f77b70e5b1b17e3287bdc1d2a3b6a2a3237 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -33,6 +33,14 @@ AC_ARG_ENABLE(gui,
     [  --enable-gui            compile with experimental GNOME output module.  Default: off],
     [gui_b=$enableval])
 
+
+NCSB_PATH=unknown
+AC_ARG_ENABLE(gui,
+[  --enable-ncsb-path      set the path where Century Schoolbook fonts can be found.
+                            Default: detect with locate(1)],
+    [NCSB_PATH=$enableval])
+
+
 reloc_b=no
 AC_ARG_ENABLE(relocation,
     [  --enable-relocation     compile with dynamic relocation.  Default: off],
@@ -109,6 +117,23 @@ if test "$reloc_b" = "yes"; then
     AC_DEFINE(ARGV0_RELOCATION)
 fi
 
+AC_MSG_CHECKING([New Century Schoolbook PFB files])
+if test "$NCSB_PATH" = "unknown"; then
+  which locate >& /dev/null
+  if test "$?" = "0"; then
+      ## sort to give precedence to /usr/  
+      NCSB_PATH=`locate c059033l.pfb | sort -r | head -1`
+      if then "$NCSB_PATH" = "";
+         AC_MSG_WARN(Could not find c059033l.pfb. Use --enable-ncsb-path to set path)
+      fi
+      NCSB_PATH=`dirname "$NCSB_PATH"`
+  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_PATH)
+AC_SUBST(NCSB_PATH)
+
 STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0)
 #STEPMAKE_PANGO(pango, REQUIRED, 1.6.0)
 STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.2.0)

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 92586b0f20b51c904a75d1d4d77074beb0360af6..13ebabb5a49acd7910da8bd2ea5d01fc97f2efd9 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -36,7 +36,6 @@ SVG_FILES = $(OTF_FILES:%.otf=%.svg) $(ALL_FONTS:%=$(outdir)/%.svg)
 
 NCSB_SOURCE_FILES=c059013l c059016l c059033l c059036l
 NCSB_TTFS=$(addprefix $(outdir)/,CenturySchL-Ital.ttf CenturySchL-BoldItal.ttf CenturySchL-Roma.ttf CenturySchL-Bold.ttf)
-NCSB_PATH=/usr/share/fonts/default/Type1
 NCSB_INSTALL_DIR=$(local_lilypond_datadir)/fonts/otf
 
 LOG_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.log)