Remove traces of mftrace.

diff --git a/Documentation/user/install.itely b/Documentation/user/install.itely
index 52d3a18f87950f27e8a562a64938ddc4b89a3a3f..4821926c83157c83cf1a53acaa75b55db2b2cab5 100644 (file)
--- a/Documentation/user/install.itely
+++ b/Documentation/user/install.itely
@@ -124,10 +124,6 @@ FOO-devel, libFOO-dev or FOO-dev package too.
 X11 and Ghostscript, and are named @file{c059033l.pfb}
 @file{c059036l.pfb}, @file{c059013l.pfb} and @file{c059016l.pfb}
 
-@item @uref{http://www.xs4all.nl/~hanwen/mftrace/,mftrace} (1.1.19 or
-newer); you may need to install some additional packages to get mftrace
-to work.
-
 @item @uref{http://www.gnu.org/software/guile/guile.html,GUILE} (version
 1.8.2 or newer).  If you are installing binary packages, you may need to
 install guile-devel or guile-dev or libguile-dev too.

diff --git a/SConstruct b/SConstruct
index 92afa9568b07b6d6bfbc0099a8f27d1334257af4..6ec14e2274343aaa9aea12cab07c8a56fa1947be 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -134,7 +134,6 @@ config_vars = [
     'LIBS',
     'LINKFLAGS',
     'MF',
-    'MFTRACE',
     'PERL',
     'PYTHON',
     'SH',
@@ -434,8 +433,6 @@ def configure (target, source, env):
     test_program (required, 'guile-config', '1.8', 'GUILE development',
             'libguile-dev or guile-devel')
     test_program (required, 'mf', '0.0', 'Metafont', 'tetex-bin')
-    test_program (required, 'mftrace', '1.1.19',
-              'mftrace (http://xs4all.nl/~hanwen/mftrace)', 'mftrace')
     test_program (required, 'python', '2.1', 'Python (www.python.org)',
               'python')
     # Silly, and breaks with /bin/sh == dash

diff --git a/config.make.in b/config.make.in
index 7a7c8d5aeefab4cf56c3e30628ccd5c57595c4e1..4d714c3d3f235e62ac8b87bb9635df4f0ce5f808 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -128,7 +128,6 @@ LN_S = @LN_S@
 MAKEINFO_PROGRAM = @MAKEINFO@
 METAFONT = @METAFONT@ -progname=mf
 MFMODE = @MFMODE@
-MFTRACE = @MFTRACE@
 MSGFMT = @MSGFMT@
 PAPERSIZE=a4
 PATHSEP = @PATHSEP@

diff --git a/configure.in b/configure.in
index 4292dfc92d52b2af58e149eece8a0c4c83c05a81..129ebcb6d4b456bdf86dc3bb549d63e9f1277f91 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -133,7 +133,6 @@ STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
 STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.15)
 
-STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.19)
 STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
 
 AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h])

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index c7ad15586898eeea117916cf05d779cd75925232..74d2bc265d4105f541519c4468c1ebcfc06360f2 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -6,8 +6,6 @@ LOCALSTEPMAKE_TEMPLATES=lilypond
 include $(depth)/make/stepmake.make
 
 
-MFTRACE_FLAGS=  --simplify
-
 EXTRA_DIST_FILES += README mf2pt1.mp
 
 # We don't use $(MF_FILES), because there's more .mf cruft here
@@ -38,9 +36,6 @@ LISP_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.lisp)
 ENC_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.enc)
 TFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tfm)
 
-ENCODING_FILE=$(findstring $(<F:.mf=.enc), $(FETA_MF_FILES:.mf=.enc))
-MFTRACE_FLAGS=$(if $(ENCODING_FILE),--encoding $(outdir)/$(ENCODING_FILE),) --no-afm
-
 $(outdir)/aybabtu.otf-table: $(BRACES:%=$(outdir)/feta-braces-%.otf-table)
        cat $^ > $@