* mf/GNUmakefile (FC_FIND): new function. Find ncsb using

$(FCMATCH), only if $(NCSB_DIR) not set.

* configure.in (LINK_GXX_STATICALLY): only warn if $NCSB_DIR set.

* config.make.in (DOCUMENTATION): set FCMATCH

* autogen.sh (srcdir): don't set --with-ncsb-dir.

diff --git a/ChangeLog b/ChangeLog
index af785a623dfb68faba1b82b059300024dc47f6ac..0c508f81019b6506a2d590e555ac566ba0262a1f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-05-03  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * mf/GNUmakefile (FC_FIND): new function. Find ncsb using
+       $(FCMATCH), only if $(NCSB_DIR) not set.
+
+       * configure.in (LINK_GXX_STATICALLY): only warn if $NCSB_DIR set.
+
+       * config.make.in (DOCUMENTATION): set FCMATCH
+
+       * autogen.sh (srcdir): don't set --with-ncsb-dir.
+
 2006-05-03  Graham Percival  <gpermus@gmail.com>
 
        * Documentation/user/ various: final round of reorg.

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

diff --git a/config.make.in b/config.make.in
index 9da7a9d1ef546a8d1fc85dbd3c71766d56c72e5e..e3ed8fba4c847881361d009607bc25e22e0bee5c 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -107,6 +107,7 @@ DEFS = @DEFS@
 DOCUMENTATION = @DOCUMENTATION@
 DOTEXE = @DOTEXE@
 FIND = @FIND@
+FCMATCH = @FCMATCH@
 FLEX = @FLEX@
 FLEXLEXER_FILE = @FLEXLEXER_FILE@
 FONTFORGE = @FONTFORGE@

diff --git a/configure.in b/configure.in
index f04530aa984de99235dbf9fa7bdc714ddeed5a75..0093d0a64c35f0c2f354fbed39876c8b8da608e2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -37,7 +37,7 @@ AC_ARG_ENABLE(gui,
 AC_ARG_WITH(ncsb-dir,
     [  --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,
@@ -80,6 +80,7 @@ STEPMAKE_PYTHON_DEVEL(REQUIRED)
 STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.15)
 
 STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.19)
+STEPMAKE_PROGS(FCMATCH, fc-match, OPTIONAL, 2.1.0)
 STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
 
 AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h])
@@ -104,10 +105,14 @@ if test "$reloc_b" = "yes"; then
 fi
 
 AC_MSG_CHECKING([New Century Schoolbook PFB files])
-if  test ! -f "$NCSB_DIR/c059016l.pfb"; then
-    AC_MSG_WARN($NCSB_DIR does not contain c059033l.pfb. Use --with-ncsb-dir)
+
+if test "$NCSB_DIR" != "" ;  then
+  if  test ! -f "$NCSB_DIR/c059016l.pfb"; then
+      AC_MSG_WARN($NCSB_DIR does not contain c059033l.pfb. Use --with-ncsb-dir)
+  fi
 fi
 
+
 AC_MSG_RESULT($NCSB_DIR)
 AC_SUBST(NCSB_DIR)
 

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 79b52f91f60bf411e0c058b1587a9a7bfa8261fe..1864fbb36a142191cd579c6caf8ee4f6817cb6a8 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -30,8 +30,17 @@ OTF_TABLES = $(STAFF_SIZES:%=$(outdir)/feta%.otf-table)\
 FETA_FONTS = $(FETA_MF_FILES:.mf=)
 SVG_FILES = $(OTF_FILES:%.otf=%.svg) $(ALL_FONTS:%=$(outdir)/%.svg)
 
+FC_FIND=$(shell $(FCMATCH) --verbose 'Century Schoolbook L:style=$(1)' | grep 'file:' | sed 's/.*"\([^"]*\)".*/\1/g')
+
+ifeq ($(NCSB_DIR),)
+NCSB_SOURCE_FILES=$(call FC_FIND,Roman) \
+       $(call FC_FIND,Italic) \
+       $(call FC_FIND,Bold Italic) \
+       $(call FC_FIND,Bold)
+else
+NCSB_SOURCE_FILES=$(addsuffix .pfb,$(addprefix $(NCSB_DIR),c059013l c059016l c059033l c059036l))
+endif
 
-NCSB_SOURCE_FILES=c059013l c059016l c059033l c059036l
 NCSB_OTFS=$(addprefix $(outdir)/,CenturySchL-Ital.otf CenturySchL-BoldItal.otf CenturySchL-Roma.otf CenturySchL-Bold.otf)
 NCSB_INSTALL_DIR=$(local_lilypond_datadir)/fonts/otf
 
@@ -162,7 +171,7 @@ $(outdir)/%.enc.in: %.enc
        cp $< $@
 
 
-$(NCSB_OTFS): $(addsuffix .pfb,$(addprefix $(NCSB_DIR)/,$(NCSB_SOURCE_FILES))) $(buildscript-dir)/pfx2ttf.fontforge
-       $(foreach i,$(NCSB_SOURCE_FILES), \
+$(NCSB_OTFS): $(NCSB_SOURCE_FILES)  $(buildscript-dir)/pfx2ttf.fontforge
+       $(foreach i, $(basename $(NCSB_SOURCE_FILES)), \
                $(FONTFORGE) -script $(buildscript-dir)/pfx2ttf.fontforge \
-                       $(NCSB_DIR)/$(i).pfb $(NCSB_DIR)/$(i).afm $(outdir)/ && ) true
+                       $(i).pfb $(i).afm $(outdir)/ && ) true