remove obsolete ancient files

git-svn-id: svn://tug.org/texlive/trunk@21546 c570f23f-e606-0410-a88d-b1316a301751

11 files changed, 14 insertions, 2119 deletions

diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 12d5ea1ea62..ab18d1a4c26 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.in.orig, common.ac.orig, withenable.ac: Remove
+	ancient files.
+	* Makefile.am (EXTRA_DIST): Adapt.
+
 2011-02-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* man/Makefile.am: Use ../am/man1_links.am for manpage links.
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index a422beaf223..823cc3726bf 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/kpathsea/
 ##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
@@ -323,7 +323,3 @@ EXTRA_DIST += $(TESTS)
 ##
 EXTRA_DIST += mktex.cnf
 
-## Eventually delete these files
-##
-EXTRA_DIST += Makefile.in.orig common.ac.orig withenable.ac
-
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index 84f42357bde..436bf93db4c 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -357,8 +357,7 @@ top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
 SUBDIRS = . doc man
 EXTRA_DIST = BUGS PROJECTS putenv.c strcasecmp.c strtol.c strstr.c \
-	bsnl.awk $(TESTS) mktex.cnf Makefile.in.orig common.ac.orig \
-	withenable.ac
+	bsnl.awk $(TESTS) mktex.cnf
 INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir)/..
 AM_CFLAGS = $(WARNING_CFLAGS)
 lib_LTLIBRARIES = libkpathsea.la
diff --git a/Build/source/texk/kpathsea/Makefile.in.orig b/Build/source/texk/kpathsea/Makefile.in.orig
deleted file mode 100644
index 3fb569e9f1c..00000000000
--- a/Build/source/texk/kpathsea/Makefile.in.orig
+++ /dev/null
@@ -1,258 +0,0 @@
-# $Id$
-# @configure_input@
-# Makefile for kpathsea.  Public domain.
-version = @KPSEVERSION@
-
-# Add -DNO_DEBUG to disable debugging, for vanishingly better performance.
-
-kpse_include ../make/paths.mk
-kpse_include ../make/makevars.mk
-kpse_include ../make/common.mk
-kpse_include ../make/library.mk
-kpse_include ../make/programs.mk
-kpse_include ../make/texi.mk
-
-@MAINT@warn_more = -Wmissing-prototypes -Wwrite-strings -Wshadow
-@MAINT@MAKEINFO_FLAGS := $(MAKEINFO_FLAGS) --no-split
-
-# Install these header files (except acconfig.h).
-install_headers = *.h $(srcdir)/*.h
-
-# Put tex-file.o first, because it's what depends on the paths, and may
-# reduce frustration if the paths are wrong by doing it first.
-
-objects = tex-file.lo absolute.lo atou.lo cnf.lo concat.lo concat3.lo \
-concatn.lo db.lo debug.lo dir.lo elt-dirs.lo expand.lo extend-fname.lo \
-file-p.lo find-suffix.lo fn.lo fontmap.lo getopt.lo getopt1.lo hash.lo \
-kdefault.lo kpathsea.lo line.lo magstep.lo make-suffix.lo mingw32.lo path-elt.lo \
-pathsearch.lo proginit.lo progname.lo readable.lo rm-suffix.lo \
-str-list.lo str-llist.lo tex-glyph.lo tex-hush.lo tex-make.lo \
-tilde.lo truncate.lo uppercasify.lo variable.lo version.lo xbasename.lo \
-xcalloc.lo xdirname.lo xfopen.lo xfseek.lo xfseeko.lo xftell.lo xftello.lo xgetcwd.lo xmalloc.lo \
-xopendir.lo xputenv.lo xrealloc.lo xstat.lo xstrdup.lo $(liblobjs) $(malloc)
-liblobjs = @LTLIBOBJS@
-
-library = kpathsea
-
-# We want to compile almost everything with libtool ...
-KPATHSEA_CC = $(LIBTOOL) --mode=compile $(CC)
-.SUFFIXES: .lo
-.c.lo:
-	$(KPATHSEA_CC) $(ALL_CFLAGS) -DMAKE_KPSE_DLL -c $<
-
-default all: kpsewhich kpsestat kpseaccess kpsereadlink $(library).info manfiles
-
-kpsewhich: $(kpathsea) kpsewhich.o
-	$(kpathsea_link) kpsewhich.o $(LOADLIBES)
-
-kpsestat: kpsestat.o
-	$(link_command) kpsestat.o
-
-kpseaccess: access.o
-	$(link_command) access.o
-
-kpsereadlink: readlink.o
-	$(link_command) readlink.o
-
-$(kpathsea): $(objects)
-	$(kpathsea_link) -rpath $(libdir) -version-info @KPSE_LT_VERS@ $(objects)
-
-# First null out comments and leading/trailing whitespace, then remove
-# lines that define invalid C identifiers, then remove blank lines and
-# lines that define lowercase values (those are never path values). Each
-# line remaining looks like
-# <name> = <value>
-# (but = and surrounding spaces are optional, hence can't remove all spaces).
-# Change this to #ifndef DEFAULT_name@#define DEFAULT_name "value"@#endif,
-# then change the @'s to newlines (sed isn't good at multiline replacements).
-# 
-# No backslash-newline escapes in the long sed replacement because that
-# will turn into a space in the output.
-# 
-# We replace the $TEXMF* references with nonexisting directories.  These
-# are the compile-time defaults and are not useful in the native TL
-# builds; we rely completely on the self-location.  (Previously, the
-# random build-time paths would get included in the binaries, to
-# consequent confusion.)
-# 
-# We preserve the $SELFAUTO* references, since the selfauto-using
-# compile-time path for cnf files is how texmf.cnf gets found, which
-# determines everything else.
-# 
-# The definition of DEFAULT_TEXMF (and other variables)
-# that winds up in the final paths.h will not be used.
-#
-# We don't want to rewrite paths.h when we have only changed comments
-# in texmf.cnf that have no effect on paths.h, since that would cause
-# almost everything to be rebuilt.
-#
-# We also replace all semicolons with colons in the paths.
-# The path-splitting code should be changed to understand both.
-#
-$(kpathsea_dir)/paths.h: stamp-paths
-stamp-paths: $(srcdir)/texmf.cnf
-	echo "/* paths.h: Generated from texmf.cnf. */" >paths.tmp
-	sed -e 's/%.*//' -e 's/^[ 	]*//' -e 's/[ 	]*$$//' $(srcdir)/texmf.cnf \
-	| grep '^[ 	]*[A-Z0-9_]*[ 	=]' \
-	| sed '/^$$/d' \
-	| sed 's/^\([^ 	=]*\)[ 	]*=*[ 	]*\(.*\)/#ifndef DEFAULT_\1%#define DEFAULT_\1 "\2"%#endif/' \
-	| tr '%' '\012' \
-	| sed -e 's%\$$TEXMFCONFIG%/nonesuch/texmfconfig%g' \
-	      -e 's%\$$TEXMFDIST%/nonesuch/texmfdist%g' \
-	      -e 's%\$$TEXMFDOCDIR%/nonesuch/texmfdocdir%g' \
-	      -e 's%\$$TEXMFLOCAL%/nonesuch/texmflocal%g' \
-	      -e 's%\$$TEXMFMAIN%/nonesuch/texmfmain%g' \
-	      -e 's%\$$TEXMFSYSCONFIG%/nonesuch/texmfsysconfig%g' \
-	      -e 's%\$$TEXMFSYSVAR%/nonesuch/texmfsysvar%g' \
-	      -e 's%\$$TEXMFVAR%/nonesuch/texmfvar%g' \
-	      -e 's%\$$TEXMF%/nonesuch/texmf%g' \
-	      -e 's%\$$VARTEXFONTS%/nonesuch/vartexfonts%g' \
-	| sed -e 's%;%:%g' \
-	>>paths.tmp
-	@if cmp -s paths.h paths.tmp 2>/dev/null; then \
-	  echo "paths.h is unchanged"; \
-	else \
-	  echo "cp paths.tmp paths.h"; \
-	  cp paths.tmp paths.h; \
-	fi
-	rm -f paths.tmp
-	date >stamp-paths
-
-# Need an extra definition for this. Dependencies included below.
-tex-file.o:
-	$(KPATHSEA_CC) -DDEFAULT_FONT_SIZES='\"$(default_texsizes)\"' $(srcdir)/tex-file.c
-
-check: kpsewhich
-	./kpsewhich -expand-var '$$TEXMF'
-
-install: install-exec install-data
-uninstall: uninstall-exec uninstall-data
-
-install-exec: kpsewhich
-	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) $(scriptdir) \
-	  $(libdir) $(web2cdir)
-	if grep 'original mktexpk --' $(scriptdir)/mktexpk >/dev/null 2>&1\
-	   || test ! -r $(scriptdir)/mktexpk; then \
-	  $(INSTALL_SCRIPT) $(srcdir)/mktexpk $(scriptdir)/mktexpk; \
-	else true; fi
-	if grep 'original mktexmf --' $(scriptdir)/mktexmf >/dev/null 2>&1\
-	   || test ! -r $(scriptdir)/mktexmf; then \
-	  $(INSTALL_SCRIPT) $(srcdir)/mktexmf $(scriptdir)/mktexmf; \
-	else true; fi
-	if grep 'original mktextfm --' $(scriptdir)/mktextfm >/dev/null 2>&1\
-	   || test ! -r $(scriptdir)/mktextfm; then \
-	  $(INSTALL_SCRIPT) $(srcdir)/mktextfm $(scriptdir)/mktextfm; \
-	else true; fi
-	if grep 'original mktexlsr --' $(scriptdir)/mktexlsr >/dev/null 2>&1\
-	   || test ! -r $(scriptdir)/mktexlsr; then \
-	  $(INSTALL_SCRIPT) $(srcdir)/mktexlsr $(scriptdir)/mktexlsr; \
-	else true; fi
-	$(INSTALL_DATA) $(srcdir)/mktex.opt $(web2cdir)/mktex.opt
-	$(INSTALL_SCRIPT) $(srcdir)/mktexdir $(web2cdir)/mktexdir
-	$(INSTALL_DATA) $(srcdir)/mktexdir.opt $(web2cdir)/mktexdir.opt
-	$(INSTALL_SCRIPT) $(srcdir)/mktexnam $(web2cdir)/mktexnam
-	$(INSTALL_DATA) $(srcdir)/mktexnam.opt $(web2cdir)/mktexnam.opt
-	$(INSTALL_SCRIPT) $(srcdir)/mktexupd $(web2cdir)/mktexupd
-	$(INSTALL_LIBTOOL_LIBS) lib$(library).la $(libdir)
-	$(INSTALL_LIBTOOL_PROG) kpsewhich $(bindir)
-	$(INSTALL_PROGRAM) kpsestat $(bindir)
-	$(INSTALL_PROGRAM) kpseaccess $(bindir)
-	$(INSTALL_PROGRAM) kpsereadlink $(bindir)
-uninstall-exec:
-	$(UNINSTALL_LIBTOOL_LIBS) $(libdir)/lib$(library).la
-	$(UNINSTALL_LIBTOOL_PROG) $(bindir)/kpsewhich
-	$(UNINSTALL_PROGRAM) $(bindir)/kpsestat
-	$(UNINSTALL_PROGRAM) $(bindir)/kpseaccess
-	$(UNINSTALL_PROGRAM) $(bindir)/kpsereadlink
-
-install-data: $(srcdir)/texmf.cnf kpathsea.info install-man
-	$(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf) $(infodir) $(web2cdir)
-	if grep 'original texmf.cnf --' $(web2cdir)/texmf.cnf >/dev/null 2>&1 \
-	   || test ! -r $(web2cdir)/texmf.cnf; then \
-	  $(INSTALL_DATA) $(srcdir)/texmf.cnf $(web2cdir)/texmf.cnf; \
-	else true; fi
-# Info files.
-	$(INSTALL_DATA) $(srcdir)/kpathsea.i* $(infodir)/
-# Should we install the headers?  They are not just system-dependent,
-# which is bad enough, but even compiler-dependent.
-	$(SHELL) $(top_srcdir)/../mkinstalldirs $(includedir)/kpathsea
-	for f in $(install_headers); do \
-	  $(INSTALL_DATA) $$f $(includedir)/kpathsea/; done
-	rm -f $(includedir)/kpathsea/acconfig.h
-# Post.
-	$(POST_INSTALL)
-	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-	  install-info --info-dir=$(infodir) $(infodir)/kpathsea.info; \
-	else true; fi
-
-uninstall-data:
-	$(PRE_UNINSTALL)
-	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-	  install-info --delete --info-dir=$(infodir) $(infodir)/kpathsea.info; \
-	else true; fi
-	$(NORMAL_UNINSTALL)
-	rm -f $(infodir)/kpathsea.i*
-#	for f in $(install_headers); do rm -f $(includedir)/`basename $$f`; done
-
-# distdir is used by other distributions; they define $(distdir).
-distdir: doc $(library).dvi $(library).h
-	rm -rf $(distdir)
-	mkdir -p $(distdir)
-	ln $(ln_files) $(distdir)
-	touch *.info*
-	ln mktex* *.info* *.texi *.ftp $(library).aux $(library).cps $(distdir)
-	rm -f $(distdir)/*.1 $(distdir)/*.man
-	ln *.man $(distdir)
-	ln BUGS README.CONFIGURE HIER PROJECTS *.ac $(distdir)
-	touch kpathsea.h # to avoid .cps.h rule on Solaris
-	cd $(distdir) && rm -f paths.h
-
-# I don't use this, but other programmers want it.  acconfig.h is an
-# autoheader input file, not an includable C header. Bad name.
-$(library).h: always
-	rm -f $@
-	echo '/* This is a generated file */' >$@
-	echo '/* collecting all kpathsea headers. */' >>$@
-	echo '#include <kpathsea/config.h>' >>$@
-	ls -1 *.h \
-	  | grep -v '\(acconfig\|config\|kpathsea\|win32lib\)\.h' \
-	  | sed -e 's,^,#include <kpathsea/,' -e s',$$,>,' >>$@
-	touch -r `ls -1t *.h | tail +2 | head -1` $@ 
-always:
-.PHONY: always
-
-kpse_include ../make/config.mk
-
-info: $(library).info
-dvi: $(library).dvi
-
-$(library).info: bugs.texi hier.texi install.texi unixtex.texi
-
-@MAINT@INSTALL: install.texi
-@MAINT@	$(MAKEINFO) $(one_info) $(MAKEINFO_FLAGS) $< -o $@
-@MAINT@	$(top_srcdir)/../add-info-toc $@
-@MAINT@BUGS: bugs.texi
-@MAINT@	$(MAKEINFO) $(one_info) $(MAKEINFO_FLAGS) $< -o $@
-@MAINT@	$(top_srcdir)/../add-info-toc $@
-@MAINT@HIER: hier.texi
-@MAINT@	$(MAKEINFO) $(one_info) $(MAKEINFO_FLAGS) $< -o $@
-@MAINT@unixtex.ftp: unixtex.texi
-@MAINT@	$(MAKEINFO) $(one_info) $(MAKEINFO_FLAGS) $< -o $@
-@MAINT@doc: info HIER BUGS INSTALL unixtex.ftp
-
-kpse_include ../make/clean.mk
-
-mostlyclean::
-	rm -f kpsewhich kpsestat kpseaccess kpsereadlink *.lo
-	$(LIBTOOL) --mode=clean $(RM) lib$(library).la
-distclean::
-	rm -f paths.h stamp-paths
-
-# The manual pages
-manfiles = kpseaccess.1 kpsestat.1 kpsewhich.1 kpsereadlink.1 \
-           mktexlsr.1 mktexmf.1 mktextfm.1 mktexpk.1
-
-kpse_include ../make/man.mk
-
-kpse_include ../make/rdepend.mk
-kpse_include depend.mk
diff --git a/Build/source/texk/kpathsea/common.ac.orig b/Build/source/texk/kpathsea/common.ac.orig
deleted file mode 100644
index 79d0789f750..00000000000
--- a/Build/source/texk/kpathsea/common.ac.orig
+++ /dev/null
@@ -1,117 +0,0 @@
-dnl Public domain.
-dnl Originally written by Karl Berry
-dnl
-dnl Common Autoconf sinclude file for kpathsea-using programs.  (Have to
-dnl use the m4 `sinclude' builtin instead of `include', since Autoconf
-dnl disables `include'.)
-
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-
-sinclude(../libtool.m4)
-
-AC_PROG_LIBTOOL
-
-AC_SYS_LARGEFILE
-AC_FUNC_FSEEKO
-
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_FUNC_CLOSEDIR_VOID
-AC_CHECK_HEADERS([assert.h float.h limits.h memory.h pwd.h stdlib.h \
-                  string.h strings.h sys/param.h unistd.h])
-AC_CHECK_DECLS([putenv, strstr])
-
-dnl Libtool supporting objects that may be required on ancient broken system.
-AC_CHECK_FUNCS(putenv,, LTLIBOBJS="$LTLIBOBJS putenv.lo")
-AC_CHECK_FUNCS(strcasecmp,, LTLIBOBJS="$LTLIBOBJS strcasecmp.lo")
-AC_CHECK_FUNCS(strtol,, LTLIBOBJS="$LTLIBOBJS strtol.lo")
-AC_CHECK_FUNCS(strstr,, LTLIBOBJS="$LTLIBOBJS strstr.lo")
-AC_SUBST(LTLIBOBJS)
-
-AC_CHECK_FUNCS(bcmp bcopy bzero getcwd getwd index memcmp memcpy rindex strchr strrchr)
-
-AC_C_CONST
-
-# Check whether struct stat provides high-res time.
-AC_CHECK_MEMBERS([struct stat.st_mtim])
-
-# Check whether prototypes work.
-AC_MSG_CHECKING(whether the compiler accepts prototypes)
-AC_CACHE_VAL(kb_cv_c_prototypes,
-[AC_TRY_COMPILE([#include <stdarg.h>], [extern void foo(int i,...);],
-  kb_cv_c_prototypes=yes, kb_cv_c_prototypes=no)])dnl
-AC_MSG_RESULT($kb_cv_c_prototypes)
-if test "$kb_cv_c_prototypes" = yes; then
-  AC_DEFINE([HAVE_PROTOTYPES], 1,
-    [Define to 1 if your compiler understands prototypes.])
-fi
-
-# This is a GNU libc invention.
-AC_MSG_CHECKING([whether program_invocation_name is predefined])
-AC_CACHE_VAL([kb_cv_var_program_inv_name],
-[AC_TRY_LINK(,
-  [extern char *program_invocation_name; program_invocation_name = "love";],
-  [kb_cv_var_program_inv_name=yes], [kb_cv_var_program_inv_name=no])])dnl
-AC_MSG_RESULT([$kb_cv_var_program_inv_name])
-if test "$kb_cv_var_program_inv_name" = yes; then
-  AC_DEFINE([HAVE_PROGRAM_INVOCATION_NAME], 1,
-    [Define to 1 if you are using GNU libc or otherwise have global
-     variables `program_invocation_name' and `program_invocation_short_name'.])
-fi
-
-if test $ac_cv_func_getcwd = yes; then
-# We only need to run this if we have getcwd.
-AC_MSG_CHECKING([whether getcwd uses fork or vfork])
-AC_CACHE_VAL([kb_cv_func_getcwd_forks],
-[AC_TRY_RUN([
-int fork() { exit(1); }
-int vfork() { exit(1); }
-extern char *getcwd();
-char path[100];
-int main() {
-getcwd(path,100);
-return 0;
-}], [kb_cv_func_getcwd_forks=no], [kb_cv_func_getcwd_forks=yes],
-    [kb_cv_func_getcwd_forks=no])])dnl
-AC_MSG_RESULT([$kb_cv_func_getcwd_forks])
-if test $kb_cv_func_getcwd_forks = yes; then
-  AC_DEFINE([GETCWD_FORKS], 1,
-    [Define to 1 if getcwd is implemented using fork or vfork.  Let me know
-     if you have to add this by hand because configure failed to detect it.])
-fi
-fi
-
-# Common --with and --enable options.
-sinclude(../../texk/kpathsea/withenable.ac)
-
-# Implementation of those options.
-AC_DEFUN([_KPSE_DEFINE_MAKE_BY_DEFAULT],
-[if test "x$with_$1_default" = xyes; then
-  AC_DEFINE([MAKE_$2_BY_DEFAULT], 1,
-    [Define to 1 if you want to run $1 if $3  missing, and to 0 if you don't.])
-else
-  AC_DEFINE([MAKE_$2_BY_DEFAULT], 0)
-fi
-])# _KPSE_DEFINE_MAKE_BY_DEFAULT
-
-_KPSE_DEFINE_MAKE_BY_DEFAULT([mktexmf], [TEX_MF], [MF source])
-_KPSE_DEFINE_MAKE_BY_DEFAULT([mktexpk], [TEX_PK], [PK font])
-_KPSE_DEFINE_MAKE_BY_DEFAULT([mktextex], [TEX_TEX], [TeX source])
-_KPSE_DEFINE_MAKE_BY_DEFAULT([mktexfmt], [TEX_FMT], [format file])
-_KPSE_DEFINE_MAKE_BY_DEFAULT([mktextfm], [TEX_TFM], [TFM file])
-_KPSE_DEFINE_MAKE_BY_DEFAULT([mkocp], [OMEGA_OCP], [OCP file])
-_KPSE_DEFINE_MAKE_BY_DEFAULT([mkofm], [OMEGA_OFM], [OFM file])
-
-# Is libm present.  FIXME: do we need it at all?
-AC_CHECK_LIB(m, main)
-
-# If you're cross-compiling, these macros set up the variables in
-# ../make/cross.mk: BUILDCC, BUILDCFLAGS, BUILDCCLD etc.
-KPSE_CROSS_BUILD_VAR(CC, cc)
-KPSE_CROSS_BUILD_VAR(CFLAGS, $(BUILDXCFLAGS))
-KPSE_CROSS_BUILD_VAR(CPPFLAGS, $(BUILDXCPPFLAGS))
-KPSE_CROSS_BUILD_VAR(LDFLAGS, $(BUILDXLDFLAGS))
-KPSE_CROSS_BUILD_VAR(CCLD, $(BUILDCC))
diff --git a/Build/source/texk/kpathsea/withenable.ac b/Build/source/texk/kpathsea/withenable.ac
deleted file mode 100644
index 32b1b4e8b99..00000000000
--- a/Build/source/texk/kpathsea/withenable.ac
+++ /dev/null
@@ -1,86 +0,0 @@
-dnl withenable.ac: --with and --enable options.
-
-dnl --enable-maintainer-mode as implemented in automake.
-AM_MAINTAINER_MODE
-
-dnl These are standard among *NIX systems, but not when cross-compiling
-AC_DEFUN([CF_SUBST],
-[AC_MSG_CHECKING(for $1 (symbol $2))
-AC_CACHE_VAL(cf_cv_subst_$2,[
-test -z "[$]$2" && $2=$3
-cf_cv_subst_$2=[$]$2])
-$2=${cf_cv_subst_$2}
-AC_MSG_RESULT([$]$2)
-AC_SUBST($2)
-])dnl
-CF_SUBST(loader,LD,ld)
-CF_SUBST(archiver,AR,ar)
-CF_SUBST(archiver options,ARFLAGS,rc)
-
-AC_ARG_WITH([mktexmf-default],
-[  --without-mktexmf-default    do not run mktexmf if MF source missing],
-  , [with_mktexmf_default=yes])
-AC_ARG_WITH([mktexpk-default],
-[  --without-mktexpk-default    do not run mktexpk if PK font missing],
-  , [with_mktexpk_default=yes])
-AC_ARG_WITH([mktextfm-default],
-[  --without-mktextfm-default   do not run mktextfm if TFM file missing],
-   , [with_mktextfm_default=yes])
-AC_ARG_WITH([mkocp-default],
-[  --without-mkocp-default      do not run mkocp if OCP file missing],
-   , [with_mkocp_default=yes])
-AC_ARG_WITH([mkofm-default],
-[  --without-mkofm-default      do not run mkofm if OFM file missing],
-   , [with_mkofm_default=yes])
-AC_ARG_WITH([mktexfmt-default],
-[  --with-mktexfmt-default      run mktexfmt if format file missing])
-AC_ARG_WITH([mktextex-default],
-[  --with-mktextex-default      run mktextex if TeX source missing],
-  [with_mktextex_default=yes], [with_mktextex_default=no])
-
-dnl Check whether we can find a texmf tree.  Look at the most common spots.
-dnl Not a switch, but something that must be included everywhere, even at
-dnl at the top level, so putting it in common.ac is not enough.
-AC_MSG_CHECKING(where the main texmf tree is located)
-case $prefix in
-  */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
-esac
-texmfmain=
-if test "x$datadir" != 'x${prefix}/share'; then
-  # First case, datadir is defined...
-  eval p=\"$datadir\"
-  # Unconditionally set the directory, but...
-  texmfmain=`echo "$p/texmf" | sed 's,//*,/,g'`
-  # ... do complain if it wasn't found.
-  if test -d "$texmfmain"; then
-    AC_MSG_RESULT("$texmfmain")
-  else
-    true # be silent dnl AC_MSG_RESULT([not found])
-  fi
-else
-  # Second case, datadir is default...
-  if test "x$prefix" = "xNONE"; then
-    p="$ac_default_prefix"
-  else
-    eval p=\"$prefix\"
-  fi
-  for e in share/texmf lib/texmf texmf; do
-    if test -d "$p/$e"; then
-      texmfmain='${prefix}'/"$e"
-      break
-    fi
-  done
-  if test -z "$texmfmain" && test "x$prefix" = "xNONE"; then
-     # Still no texmfmain found, no prefix set, perhaps kpsewhich is
-     # installed and can help us out.
-     texmfmain=`kpsewhich --expand-path='$TEXMFMAIN'` 2>/dev/null
-  fi
-  texmfmain=`echo "$texmfmain" | sed 's,//*,/,g'`
-  if test -n "$texmfmain"; then
-    AC_MSG_RESULT("$texmfmain")
-  else
-    eval texmfmain="$datadir/texmf"
-    # (be silent) dnl AC_MSG_RESULT([not found])
-  fi
-fi
-AC_SUBST(texmfmain)
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 1c4b7962247..3e0135f1696 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.in.orig, configure.in.orig: Remove ancient files.
+	* Makefile.am (EXTRA_DIST): Adapt.
+
 2011-02-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am (install_exe_links, uninstall_exe_links): Hooks to
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index 17d212caf5f..7e112ade39c 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -223,7 +223,3 @@ uninstall-hook: $(uninstall_exe_links)
 	  rm -f $(DESTDIR)$(bindir)/$$link; \
 	done  
 
-## Eventually delete these files
-##
-EXTRA_DIST += Makefile.in.orig configure.in.orig
-
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 304ab85b43f..cfd0c2e0eba 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1461,7 +1461,7 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
 	synctexdir/synctex-e-rec.ch0 synctexdir/synctex-e-rec.ch1 \
 	synctexdir/synctex-pdf-rec.ch2 synctexdir/synctex-xe-mem.ch2 \
 	synctexdir/synctex-xe-rec.ch2 synctexdir/synctex-xe-rec.ch3 \
-	libmd5/md5.test Makefile.in.orig configure.in.orig
+	libmd5/md5.test
 DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
 	tangle-web2c tangleboot.c tangleboot.h tangleboot.p \
 	tangleboot-web2c ctangle.c cweb.c cweb.h ctangle-ctangle \
diff --git a/Build/source/texk/web2c/Makefile.in.orig b/Build/source/texk/web2c/Makefile.in.orig
deleted file mode 100644
index 3ac474b9c7a..00000000000
--- a/Build/source/texk/web2c/Makefile.in.orig
+++ /dev/null
@@ -1,1144 +0,0 @@
-# $Id$
-# @configure_input@
-# Makefile for web2c --kb@mail.tug.org. Public domain.
-version = @WEB2CVERSION@
-
-# This makefile uses static rules with many targets (to be compatible to
-# non-gnu make) and will not work correctly when parallelized.
-# So we switch off parallel makes with gnu make.
-.NOTPARALLEL:
-
-# These lines define the memory dumps that fmts/bases/mems will make and
-# install-fmts/install-bases/install-mems will install.
-# See the Formats node in doc/web2c.texi for more details.
-fmts = olatex.fmt # amstex.fmt eplain.fmt texinfo.fmt
-efmts = latex.fmt
-pdffmts = pdfolatex.fmt
-pdfefmts = pdflatex.fmt
-afmts = lamed.fmt
-ofmts = lambda.fmt
-eofmts = elambda.fmt
-bases = # no good reason to build cmmf.base.
-mems =  # mfplain.mem is probably not generally useful.
-
-# The name of the file that defines your local devices for Metafont.
-# (Only relevant during `make bases'.)  I recommend `modes.mf', which
-# defines all known modes, plus useful definitions for all fonts.  It's
-# available from ftp://ftp.tug.org/tex/modes.mf, among other places.
-localmodes = modes
-
-kpse_include ../make/paths.mk
-
-# Used for triptrap.
-DIFF = diff
-DIFFFLAGS =
-
-.SUFFIXES: # get rid of .p.o
-kpse_include ../make/common.mk
-kpse_include ../make/programs.mk
-
-XCPPFLAGS = $(PDFXCPPFLAGS)
-
-CXX = @CXX@
-CXXLD = $(CXX)
-cxx_link_command = $(CXXLD) -o $@ $(LDFLAGS)
-kpathsea_cxx_link = $(LIBTOOL) --mode=link $(cxx_link_command)
-
-@MAINT@ifeq ($(CC), gcc)
-@MAINT@XDEFS = -Wimplicit -Wreturn-type -Wcomment -Wformat
-@MAINT@endif
-
-# Make `#include <X11/...>' and `-lX...' work.
-# This matches xdvik.
-# wlibs is substituted by web2c's configure, LIBS by general configure
-# routines, and the others by AC_PATH_XTRA.
-# All the x_... variables will be empty if we aren't supporting X.
-x_cppflags = @X_CFLAGS@
-x_ldflags = @X_LIBS@
-x_pre_libs = @X_PRE_LIBS@
-x_extra_libs = @X_EXTRA_LIBS@
-x_tool_libs = @x_tool_libs@
-x_ext_lib = @x_ext_lib@
-wlibs = @wlibs@
-# Follow the library order used in X11R6 itself:
-#   -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 (some may not be present).
-windowlink = $(windowlib) $(x_ldflags) $(x_tool_libs) $(x_pre_libs) $(x_ext_lib) $(wlibs) $(x_extra_libs)
-
-# With --enable-ipc, TeX may need to link with -lsocket.
-socketlibs = @socketlibs@
-
-common_makeargs = $(MFLAGS) CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' $(XMAKEARGS)
-window_makeargs = x_cppflags='$(x_cppflags)' $(common_makeargs)
-install_makeargs = $(makevars) $(common_makeargs)
-
-proglib = lib/lib.a
-windowlib = window/window.a
-
-# 
-# The sh script that does the conversion.  The "." is the directory with
-# native tools; we don't attempt cross-compiling a la luatex.  The
-# $(native) variable is used in luatex.mk.
-native = .
-web2c = srcdir=$(srcdir) $(SHELL) $(srcdir)/web2c/convert $(native)
-
-# We put this in the web2c directory for lack of a better place, but it
-# is separate from (and simpler than) the actual web-to-C conversion programs.
-makecpool = $(native)/web2c/makecpool
-
-# Additional dependencies:
-web2c_common = web2c/convert web2c/common.defines
-web2c_programs = web2c/fixwrites web2c/splitup web2c/web2c $(makecpool)
-web2c_texmf = $(web2c_common) $(web2c_programs) \
-              web2c/texmf.defines web2c/coerce.h
-
-# The helper programs:
-TANGLEBOOT = @TANGLEBOOT@
-CTANGLEBOOT = @CTANGLEBOOT@
-TANGLE = @TANGLE@
-CTANGLE = @CTANGLE@
-TIE = @TIE@
-
-# Calling tangle
-tangle = WEBINPUTS=.:$(srcdir) $(TANGLE)
-ctangle = $(CTANGLE)
-tie = $(TIE)
-
-# The environment for making dumps.
-# No need to specify TEXMF, as ../kpathsea/texmf.cnf should contain
-# suitable absolute paths at this point.  Those are converted to
-# SELFAUTO* paths on installation.
-dumpenv = TEXMFCNF=../kpathsea
-
-# Unfortunately, suffix rules can't have dependencies, or multiple
-# targets, and we can't assume all makes supports pattern rules.
-#.SUFFIXES: .p .c .ch .p
-#.p.c: # really depends on $(web2c_programs), and generates .h.
-#	$(web2c) $*
-#.ch.p: # really depends on tangle; for mf/mp/tex, also generates .pool
-#	./tangle $(srcdir)/$*.web $<
-
-# These definitions have to come before the rules that expand them.
-# The *{ini,[0-2]}.c files are created by splitup, run as part of convert.
-# {mf,mp,tex}extra.c are created from lib/texmfmp.c, below.
-
-# Prevent Make from deleting the intermediate forms.
-.PRECIOUS: %.ch %.p %.c
-
-tex = tex
-mf = mf
-@MFN@mfn = mf-nowin
-#  
-default all: programs manpages doc/web2c.info @FMU@
-check: dumps
-
-bibtex: bibtex.o
-	$(kpathsea_link) bibtex.o $(LOADLIBES)
-bibtex.c bibtex.h: $(web2c_common) $(web2c_programs) web2c/cvtbib.sed bibtex.p
-	$(web2c) bibtex
-bibtex.p: tangle bibtex.web bibtex.ch
-	$(tangle) bibtex bibtex
-check: bibtex-check
-bibtex-check: bibtex
-	test -f tests/exampl.aux || \
-	  cp $(srcdir)/tests/exampl.aux tests/exampl.aux
-	TEXMFCNF=../kpathsea \
-	  BSTINPUTS=$(srcdir)/tests \
-	  BIBINPUTS=$(srcdir)/tests \
-	  ./bibtex tests/exampl
-clean:: bibtex-clean
-bibtex-clean:
-	$(LIBTOOL) --mode=clean rm -f bibtex
-	rm -f bibtex.o bibtex.c bibtex.h bibtex.p
-	rm -f tests/exampl.blg tests/exampl.bbl
-
-ctie: ctie.o
-	$(kpathsea_link) ctie.o $(LOADLIBES)
-ctie.c: ctangle ctiedir/ctie.w ctiedir/ctie-k.ch
-	CWEBINPUTS=$(srcdir)/ctiedir $(ctangle) ctie.w ctie-k.ch
-clean:: ctie-clean
-ctie-clean:
-	$(LIBTOOL) --mode=clean rm -f ctie
-	rm -f ctie.o ctie.c
-
-cweave: cweave.o cweb.o
-	$(kpathsea_link) cweave.o cweb.o $(LOADLIBES)
-cweave.c: ctangle cwebdir/cweave.w cwebdir/cweav-w2c.ch
-	CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) cweave cweav-w2c
-check: cweave-check
-cweave-check: cweave
-	CWEBINPUTS=$(srcdir)/cwebdir ./cweave common.w
-clean:: cweave-clean
-cweave-clean:
-	$(LIBTOOL) --mode=clean rm -f cweave
-	rm -f cweave.o cweave.c
-	rm -f common.tex common.scn common.idx
-
-dvicopy: dvicopy.o
-	$(kpathsea_link) dvicopy.o $(LOADLIBES)
-dvicopy.c dvicopy.h: $(web2c_common) $(web2c_programs) dvicopy.p
-	$(web2c) dvicopy
-dvicopy.p: tangle dvicopy.web dvicopy.ch
-	$(tangle) dvicopy dvicopy
-check: dvicopy-check
-dvicopy-check: dvicopy
-	TEXMFCNF=../kpathsea \
-	  ./dvicopy $(srcdir)/tests/story tests/xstory.dvi
-# Redirect stderr so the terminal output will end up in the log file.
-	(TFMFONTS=$(srcdir)/tests VFFONTS=$(srcdir)/tests ./dvicopy \
-	  <$(srcdir)/tests/pplr.dvi \
-	  >tests/xpplr.dvi) 2>&1
-clean:: dvicopy-clean
-dvicopy-clean:
-	$(LIBTOOL) --mode=clean rm -f dvicopy
-	rm -f dvicopy.o dvicopy.c dvicopy.h dvicopy.p
-	rm -f tests/xstory.dvi tests/xpplr.dvi
-
-## dvitomp is a special case
-kpse_include dvitomp.mk
-##
-
-dvitype: dvitype.o
-	$(kpathsea_link) dvitype.o $(LOADLIBES)
-dvitype.c dvitype.h: $(web2c_common) $(web2c_programs) dvitype.p
-	$(web2c) dvitype
-dvitype.p: tangle dvitype.web dvitype.ch
-	$(tangle) dvitype dvitype
-check: dvitype-check
-dvitype-check: dvitype
-	./dvitype -show-opcodes $(srcdir)/tests/story >tests/xstory.dvityp
-	./dvitype --p=\*.\*.2 $(srcdir)/tests/pagenum.dvi >tests/xpagenum.typ
-clean:: dvitype-clean
-dvitype-clean:
-	$(LIBTOOL) --mode=clean rm -f dvitype
-	rm -f dvitype.o dvitype.c dvitype.h dvitype.p
-	rm -f tests/xstory.dvityp tests/xpagenum.typ
-
-gftodvi: gftodvi.o
-	$(kpathsea_link) gftodvi.o $(LOADLIBES)
-gftodvi.c gftodvi.h: $(web2c_common) $(web2c_programs) gftodvi.p
-	$(web2c) gftodvi
-gftodvi.p: tangle gftodvi.web gftodvi.ch
-	$(tangle) gftodvi gftodvi
-check: gftodvi-check
-gftodvi-check: gftodvi
-	TFMFONTS=$(srcdir)/tests ./gftodvi -verbose \
-	  $(srcdir)/tests/cmr10.600gf
-	mv cmr10.dvi tests/xcmr10.dvi
-clean:: gftodvi-clean
-gftodvi-clean:
-	$(LIBTOOL) --mode=clean rm -f gftodvi
-	rm -f gftodvi.o gftodvi.c gftodvi.h gftodvi.p
-	rm -f tests/xcmr10.dvi
-
-gftopk: gftopk.o
-	$(kpathsea_link) gftopk.o $(LOADLIBES)
-gftopk.c gftopk.h: $(web2c_common) $(web2c_programs) gftopk.p
-	$(web2c) gftopk
-gftopk.p: tangle gftopk.web gftopk.ch
-	$(tangle) gftopk gftopk
-check: gftopk-check
-gftopk-check: gftopk
-	./gftopk -verbose $(srcdir)/tests/cmr10.600gf tests/xcmr10.pk
-	./gftopk $(srcdir)/tests/cmr10.600gf cmr10.pk && rm cmr10.pk
-clean:: gftopk-clean
-gftopk-clean:
-	$(LIBTOOL) --mode=clean rm -f gftopk
-	rm -f gftopk.o gftopk.c gftopk.h gftopk.p
-	rm -f tests/xcmr10.pk
-
-gftype: gftype.o
-	$(kpathsea_link) gftype.o $(LOADLIBES)
-gftype.c gftype.h: $(web2c_common) $(web2c_programs) gftype.p
-	$(web2c) gftype
-gftype.p: tangle gftype.web gftype.ch
-	$(tangle) gftype gftype
-check: gftype-check
-gftype-check: gftype
-	./gftype $(srcdir)/tests/cmr10.600gf >tests/xcmr10.gft1
-	./gftype -m -i $(srcdir)/tests/cmr10.600gf >tests/xcmr10.gft2
-clean:: gftype-clean
-gftype-clean:
-	$(LIBTOOL) --mode=clean rm -f gftype
-	rm -f gftype.o gftype.c gftype.h gftype.p
-	rm -f tests/xcmr10.gft1 tests/xcmr10.gft2
-
-mft: mft.o
-	$(kpathsea_link) mft.o $(LOADLIBES)
-mft.c mft.h: $(web2c_common) $(web2c_programs) mft.p
-	$(web2c) mft
-mft.p: tangle mft.web mft.ch
-	$(tangle) mft mft
-check: mft-check
-mft-check: mft
-	./mft $(srcdir)/tests/io; mv io.tex tests/io.tex
-clean:: mft-clean
-mft-clean:
-	$(LIBTOOL) --mode=clean rm -f mft
-	rm -f mft.o mft.c mft.h mft.p
-	rm -f tests/io.tex
-
-patgen: patgen.o
-	$(kpathsea_link) patgen.o $(LOADLIBES)
-patgen.c patgen.h: $(web2c_common) $(web2c_programs) patgen.p
-	$(web2c) patgen
-patgen.p: tangle patgen.web patgen.ch
-	$(tangle) patgen patgen
-check: patgen-check
-patgen-check: patgen
-	./patgen $(srcdir)/tests/dict $(srcdir)/tests/patterns tests/xpatout \
-	   $(srcdir)/tests/translate <$(srcdir)/tests/patgen.in
-clean:: patgen-clean
-patgen-clean:
-	$(LIBTOOL) --mode=clean rm -f patgen
-	rm -f patgen.o patgen.c patgen.h patgen.p
-	rm -f tests/xpatout pattmp.4
-
-pktogf: pktogf.o
-	$(kpathsea_link) pktogf.o $(LOADLIBES)
-pktogf.c pktogf.h: $(web2c_common) $(web2c_programs) pktogf.p
-	$(web2c) pktogf
-pktogf.p: tangle pktogf.web pktogf.ch
-	$(tangle) pktogf pktogf
-check: pktogf-check
-pktogf-check: pktogf
-	./pktogf -verbose $(srcdir)/tests/cmr10.pk tests/xcmr10.600gf
-	./pktogf $(srcdir)/tests/cmr10.pk && rm cmr10.gf
-clean:: pktogf-clean
-pktogf-clean:
-	$(LIBTOOL) --mode=clean rm -f pktogf
-	rm -f pktogf.o pktogf.c pktogf.h pktogf.p
-	rm -f tests/xcmr10.600gf
-
-pktype: pktype.o
-	$(kpathsea_link) pktype.o $(LOADLIBES)
-pktype.c pktype.h: $(web2c_common) $(web2c_programs) pktype.p
-	$(web2c) pktype
-pktype.p: tangle pktype.web pktype.ch
-	$(tangle) pktype pktype
-check: pktype-check
-pktype-check: pktype
-	./pktype $(srcdir)/tests/cmr10.pk >tests/xcmr10.pktyp
-clean:: pktype-clean
-pktype-clean:
-	$(LIBTOOL) --mode=clean rm -f pktype
-	rm -f pktype.o pktype.c pktype.h pktype.p
-	rm -f tests/xcmr10.pktyp
-
-pltotf: pltotf.o
-	$(kpathsea_link) pltotf.o $(LOADLIBES)
-pltotf.c pltotf.h: $(web2c_common) $(web2c_programs) pltotf.p
-	$(web2c) pltotf
-pltotf.p: tangle pltotf.web pltotf.ch
-	$(tangle) pltotf pltotf
-check: pltotf-check
-pltotf-check: pltotf
-	./pltotf -verbose $(srcdir)/tests/cmr10 tests/xcmr10
-clean:: pltotf-clean
-pltotf-clean:
-	$(LIBTOOL) --mode=clean rm -f pltotf
-	rm -f pltotf.o pltotf.c pltotf.h pltotf.p
-	rm -f tests/xcmr10.tfm
-
-pooltype: pooltype.o
-	$(kpathsea_link) pooltype.o $(LOADLIBES)
-pooltype.c pooltype.h: $(web2c_common) $(web2c_programs) pooltype.p
-	$(web2c) pooltype
-pooltype.p: tangle pooltype.web pooltype.ch
-	$(tangle) pooltype pooltype
-check: pooltype-check
-pooltype-check: tex.pool
-pooltype-check: pooltype
-	./pooltype tex.pool >tests/xtexpool.typ
-clean:: pooltype-clean
-pooltype-clean:
-	$(LIBTOOL) --mode=clean rm -f pooltype
-	rm -f pooltype.o pooltype.c pooltype.h pooltype.p
-	rm -f tests/xtexpool.typ
-
-tie: tie.o
-	$(kpathsea_link) tie.o $(LOADLIBES)
-tie.c: ctangle tiedir/tie.w tiedir/tie-w2c.ch
-	CWEBINPUTS=$(srcdir)/tiedir $(ctangle) tie.w tie-w2c.ch
-clean:: tie-clean
-tie-clean:
-	$(LIBTOOL) --mode=clean rm -f tie
-	rm -f tie.o tie.c
-
-tftopl: tftopl.o
-	$(kpathsea_link) tftopl.o $(LOADLIBES)
-tftopl.c tftopl.h: $(web2c_common) $(web2c_programs) tftopl.p
-	$(web2c) tftopl
-tftopl.p: tangle tftopl.web tftopl.ch
-	$(tangle) tftopl tftopl
-check: tftopl-check
-tftopl-check: tftopl
-	./tftopl -verbose $(srcdir)/tests/cmr10 tests/xcmr10
-clean:: tftopl-clean
-tftopl-clean:
-	$(LIBTOOL) --mode=clean rm -f tftopl
-	rm -f tftopl.o tftopl.c tftopl.h tftopl.p
-	rm -f tests/xcmr10.pl
-
-vftovp: vftovp.o
-	$(kpathsea_link) vftovp.o $(LOADLIBES)
-vftovp.c vftovp.h: $(web2c_common) $(web2c_programs) vftovp.p
-	$(web2c) vftovp
-vftovp.p: tangle vftovp.web vftovp.ch
-	$(tangle) vftovp vftovp
-check: vftovp-check
-vftovp-check: vftovp
-	TFMFONTS=$(srcdir)/tests ./vftovp -verbose $(srcdir)/tests/ptmr ptmr tests/xptmr
-clean:: vftovp-clean
-vftovp-clean:
-	$(LIBTOOL) --mode=clean rm -f vftovp
-	rm -f vftop.o vftovp.c vftovp.h vftovp.p
-	rm -f tests/xptmr.vpl
-
-vptovf: vptovf.o
-	$(kpathsea_link) vptovf.o $(LOADLIBES)
-vptovf.c vptovf.h: $(web2c_common) $(web2c_programs) vptovf.p
-	$(web2c) vptovf
-vptovf.p: tangle vptovf.web vptovf.ch
-	$(tangle) vptovf vptovf
-check: vptovf-check
-vptovf-check: vptovf
-	./vptovf $(srcdir)/tests/ptmr tests/xptmr tests/xptmr
-clean:: vptovf-clean
-vptovf-clean:
-	$(LIBTOOL) --mode=clean rm -f vptovf
-	rm -f vptovf.o vptovf.c vptovf.h vptovf.p
-	rm -f tests/xptmr.vf tests/xptmr.tfm
-
-weave: weave.o
-	$(kpathsea_link) weave.o $(LOADLIBES)
-weave.c weave.h: $(web2c_common) $(web2c_programs) weave.p
-	$(web2c) weave
-weave.p: tangle weave.web weave.ch
-	$(tangle) weave weave
-check: weave-check
-weave-check: weave
-	./weave $(srcdir)/pooltype
-clean:: weave-clean
-weave-clean:
-	$(LIBTOOL) --mode=clean rm -f weave
-	rm -f weave.o weave.c weave.h weave.p
-	rm -f pooltype.tex
-
-# 
-# Defines that are common to the texmf programs.
-
-triptrap: trip trap mptrap
-testdir = $(srcdir)/triptrap
-testenv = TEXMFCNF=$(testdir)
-dvitype_args = -output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'
-
-# 
-# Metafont
-mf_c  = mfini.c mf0.c mf1.c
-mf_o  = mfini.o mf0.o mf1.o mf-pool.o mfextra.o
-mfn_o = mfini.o mf0.o mf1.o mf-pool.o mfnowin.o
-mf: $(mf_o) $(windowlib)
-	$(kpathsea_link) $(mf_o) $(windowlink) $(LOADLIBES)
-mf-nowin: $(mfn_o) window/trap.o
-	$(kpathsea_link) $(mfn_o) window/trap.o $(LOADLIBES)
-mfnowin.o: mfnowin.c
-	$(compile) -DMFNOWIN -c $< -o $@
-$(mf_c) mfcoerce.h mfd.h: mf.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed
-	$(web2c) mf
-mfextra.c: lib/texmfmp.c
-	sed s/TEX-OR-MF-OR-MP/mf/ $(srcdir)/lib/texmfmp.c >$@
-mfnowin.c: lib/texmfmp.c
-	sed s/TEX-OR-MF-OR-MP/mf/ $(srcdir)/lib/texmfmp.c >$@
-mf.p mf.pool: tangle mf.web mf-final.ch
-	$(tangle) $(srcdir)/mf.web mf-final.ch
-mf-final.ch: $(TIE) mf.web mf.ch mf-binpool.ch
-	$(TIE) -c $@ $(srcdir)/mf.web $(srcdir)/mf.ch $(srcdir)/mf-binpool.ch
-check: mf-check
-mf-check: trap mf.base
-	./mf --progname=mf '&./mf \tracingstats:=1; end.'
-	./mf --progname=mf $(srcdir)/tests/online
-	./mf --progname=mf $(srcdir)/tests/one.two
-	./mf --progname=mf $(srcdir)/tests/uno.dos
-clean:: mf-clean
-mf-clean: trap-clean
-	$(LIBTOOL) --mode=clean rm -f mf
-	$(LIBTOOL) --mode=clean rm -f mf-nowin
-	rm -f $(mf_c) mfcoerce.h mfd.h mf.p mf.pool
-	rm -f $(mf_o) mfextra.c
-	rm -f $(mfn_o) mfnowin.c
-	rm -f mf.base mf.log
-	rm -f mfput.log online.2602gf online.log one.two.log uno.log
-
-# Can't run trap and mptrap in parallel, because both write trap.{log,tfm}.
-trap: mf tftopl gftype trap-clean
-	@echo ">>> See $(testdir)/mftrap.diffs for example of acceptable diffs." >&2
-	$(LN) $(testdir)/trap.mf . # get same filename in log
-	-$(SHELL) -c '$(testenv) ./mf --progname=inimf <$(testdir)/mftrap1.in >mftrapin.fot'
-	mv trap.log mftrapin.log
-	-diff $(testdir)/mftrapin.log mftrapin.log
-	-$(SHELL) -c '$(testenv) ./mf --progname=inimf <$(testdir)/mftrap2.in >mftrap.fot'
-	mv trap.log mftrap.log
-	mv trap.tfm mftrap.tfm
-	-diff $(testdir)/mftrap.fot mftrap.fot
-	-diff $(testdir)/mftrap.log mftrap.log
-	./tftopl ./mftrap.tfm mftrap.pl
-	-diff $(testdir)/mftrap.pl mftrap.pl
-	$(SHELL) -c '$(testenv) ./gftype -m -i ./trap.72270gf >trap.typ'
-	-diff $(testdir)/trap.typ trap.typ
-
-trap-clean:
-	rm -f trap.mf trap.base
-	rm -f mftrapin.fot mftrapin.log
-	rm -f mftrap.fot mftrap.log mftrap.tfm
-	rm -f mftrap.pl trap.72270gf trap.typ
-# 
-# MetaPost
-kpse_include mpdir/mpostlib.mk
-kpse_include metapost.mk
-# 
-# TeX
-tex_c = texini.c tex0.c tex1.c tex2.c
-tex_o = texini.o tex0.o tex1.o tex2.o tex-pool.o texextra.o
-tex: $(tex_o)
-	$(kpathsea_link) $(tex_o) $(socketlibs) $(LOADLIBES)
-$(tex_c) texcoerce.h texd.h: tex.p $(web2c_texmf)
-	$(web2c) tex
-texextra.c: lib/texmfmp.c
-	sed s/TEX-OR-MF-OR-MP/tex/ $(srcdir)/lib/texmfmp.c >$@
-tex.p tex.pool: tangle tex.web tex-final.ch
-	$(tangle) $(srcdir)/tex.web tex-final.ch
-tex-final.ch: $(TIE) tex.web tex.ch tex-binpool.ch
-	$(TIE) -c $@ $(srcdir)/tex.web $(srcdir)/tex.ch $(srcdir)/tex-binpool.ch
-
-# tools to load pool for tex and mf.
-#
-tex-pool.c: tex.pool $(makecpool) tmf-pool.h
-	$(makecpool) tex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
-mf-pool.c: mf.pool $(makecpool) tmf-pool.h
-	$(makecpool) mf.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
-mf-pool.o: mf-pool.c tmf-pool.h mfd.h
-# we include mfd.h, so need lots more includes.
-	$(CC) $(CFLAGS) -I. -I.. -I$(srcdir) -I$(srcdir)/.. -DMETA_FONT -c -o $@ mf-pool.c
-
-check: tex-check
-tex-check: trip tex.fmt
-# Test truncation (but don't bother showing the warning msg).
-	./tex --progname=tex --output-comment="`cat $(srcdir)/PROJECTS`" \
-	    $(srcdir)/tests/hello 2>/dev/null \
-	  && ./dvitype hello.dvi | grep olaf@infovore.xs4all.nl >/dev/null
-# \openout should show up in \write's.
-	./tex --progname=tex $(srcdir)/tests/openout && grep xfoo openout.log
-# one.two.tex -> one.two.log
-	./tex --progname=tex $(srcdir)/tests/one.two && ls -l one.two.log
-# uno.dos -> uno.log
-	./tex --progname=tex $(srcdir)/tests/uno.dos && ls -l uno.log
-	./tex --progname=tex $(srcdir)/tests/just.texi && ls -l just.log
-	-./tex --progname=tex $(srcdir)/tests/batch.tex
-	./tex --progname=tex --shell $(srcdir)/tests/write18 | grep echo
-	TEXMFCNF=../kpathsea \
-	  ./tex --mltex --progname=initex --ini $(srcdir)/tests/mltextst
-	-./tex </dev/null
-	-PATH=`pwd`:$(kpathsea_dir):$(kpathsea_srcdir):$$PATH \
-	  WEB2C=$(kpathsea_srcdir) TMPDIR=.. \
-	  ./tex --progname=tex '\nonstopmode\font\foo=nonesuch\end'
-clean:: tex-clean
-tex-clean: trip-clean
-	$(LIBTOOL) --mode=clean rm -f tex
-	rm -f $(tex_o) $(tex_c) texextra.c texcoerce.h texd.h
-	rm -f tex.p tex.pool
-	rm -f tex.fmt tex.log
-	rm -f hello.dvi hello.log xfoo.out openout.log on.two.log uno.log
-	rm -f just.log batch.log write18.log mltextst.log texput.log
-	rm -f missfont.log
-	rm -rf tfm
-
-trip: dvitype pltotf tftopl tex trip-clean
-	@echo ">>> See $(testdir)/trip.diffs for example of acceptable diffs." >&2
-	./pltotf $(testdir)/trip.pl trip.tfm
-	./tftopl ./trip.tfm trip.pl
-	-diff $(testdir)/trip.pl trip.pl
-	$(LN) $(testdir)/trip.tex . # get same filename in log
-	-$(SHELL) -c '$(testenv) ./tex --progname=initex --ini <$(testdir)/trip1.in >tripin.fot'
-	mv trip.log tripin.log
-	-diff $(testdir)/tripin.log tripin.log
-# May as well test non-ini second time through.
-	-$(SHELL) -c '$(testenv) ./tex --progname=tex <$(testdir)/trip2.in >trip.fot'
-	-diff $(testdir)/trip.fot trip.fot
-# We use $(DIFF) instead of `diff' only for those files where there
-# might actually be legitimate numerical differences.
-	-$(DIFF) $(DIFFFLAGS) $(testdir)/trip.log trip.log
-	$(SHELL) -c '$(testenv) ./dvitype $(dvitype_args) trip.dvi >trip.typ'
-	-$(DIFF) $(DIFFFLAGS) $(testdir)/trip.typ trip.typ
-
-trip-clean:
-	rm -f trip.tfm trip.pl trip.tex trip.fmt tripin.fot tripin.log
-	rm -f trip.fot trip.log trip.dvi trip.typ tripos.tex 8terminal.tex
-	rm -rf tfm
-# 
-# Helper makefile fragments for pdf*tex and luatex.
-kpse_include libsluapdf.mk
-kpse_include pdftexdir/pdftexlib.mk
-kpse_include luatexdir/luatexlib.mk
-# 
-# Makefile fragments:
-kpse_include synctexdir/synctex.mk
-kpse_include etexdir/etex.mk
-kpse_include omegadir/omega.mk
-kpse_include alephdir/aleph.mk
-kpse_include pdftexdir/pdftex.mk
-kpse_include xetexdir/xetex.mk
-kpse_include luatexdir/luatex.mk
-
-# 
-# non-engine programs.
-programs = bibtex ctangle ctie cweave dvicopy dvitomp dvitype gftodvi gftopk \
- gftype mft $(odvicopy) $(odvitype) $(otangle) patgen $(pdftosrc) \
- pktogf pktype pltotf pooltype synctex tangle tftopl tie $(ttf2afm) \
- vftovp vptovf weave
-
-# basic_engines are the binaries we build and install directly here in
-# the webdir/ directory.
-# include $(metapost) from metapost.mk even though it also includes
-# dvitomp.  Hopefully that doesn't hurt.
-basic_engines = $(tex) $(mf) $(mfn) $(metapost)
-
-# engines includes the ones built in subdirectories.
-engines = $(basic_engines) $(etex) \
-          $(omega) $(aleph) \
-          $(pdftex) $(pdfetex) \
-          $(xetex) $(luatex)
-
-programs: $(programs) $(engines) $(mpware_programs) \
-          $(omegafonts_programs) $(otps_programs) $(pdftosrc)
-
-# Additional dependencies for relinking.
-# Each program and engine already depends on $(web2c_programs).
-$(web2c_programs) tangleboot ctangleboot: $(kpathsea) $(proglib)
-
-# 
-# Bootstrapping tangle requires making it with itself.  We use the opportunity
-# to create an up-to-date tangleboot as well.
-tangle: tangle.o
-	$(kpathsea_link) tangle.o $(LOADLIBES)
-	$(MAKE) $(common_makeargs) tangleboot.p
-tangle.c tangle.h: tangle.p
-	$(web2c) tangle
-# tangle.p is a special case, since it is needed to compile itself.  We
-# convert and compile the (distributed) tangleboot.p to make a tangle
-# which we use to make the other programs.  We depend on tangleboot, even
-# though we might not use it.
-tangle.p: tangleboot tangle.web tangle.ch
-	WEBINPUTS=.:$(srcdir) $(TANGLEBOOT) tangle tangle
-tangle.web:
-	@echo "You seem to be missing tangle.web, perhaps because you" >&2
-	@echo "didn't retrieve web.tar.gz, only web2c.tar.gz." >&2
-	@echo "You need both." >&2
-	@echo >&2
-	@echo "web.tar.gz should be available from the" >&2
-	@echo "same place that you got web2c.tar.gz." >&2
-	@echo "In any case, you can get it from" >&2
-	@echo "ftp://ftp.tug.org/tex/web.tar.gz." >&2
-	false
-clean:: tangle-clean
-tangle-clean:
-	$(LIBTOOL) --mode=clean rm -f tangle
-	rm -f tangle.o tangle.c tangle.h tangle.p
-
-tangleboot: tangleboot.o
-	$(kpathsea_link) tangleboot.o $(LOADLIBES)
-tangleboot.c tangleboot.h: stamp-tangle $(web2c_programs) $(web2c_common)
-	$(web2c) tangleboot
-# tangleboot.p is in the distribution
-stamp-tangle: tangleboot.p
-	date >stamp-tangle
-# This is not run unless tangle.web or tangle.ch is changed.
-# Only try to run ./tangle if it actually exists, otherwise
-# just touch tangleboot.p and build tangle.
-tangleboot.p: tangle.web tangle.ch
-	if [ -r $(TANGLE) ] || [ -r $(TANGLE).exe ]; then \
-	  $(tangle) tangle tangle; \
-	  mv tangle.p tangleboot.p; \
-	elif [ -r tangleboot.p ]; then \
-	  touch tangleboot.p; \
-	else \
-	  cp $(srcdir)/tangleboot.p .; \
-	fi
-	date >stamp-tangle
-	$(MAKE) $(common_makeargs) tangle
-clean:: tangleboot-clean
-tangleboot-clean:
-	$(LIBTOOL) --mode=clean rm -f tangleboot
-	rm -f tangleboot.o tangleboot.c tangleboot.h
-
-# Bootstrapping ctangle requires making it with itself.  We use the opportunity
-# to create an up-to-date ctangleboot as well.
-ctangle: ctangle.o cweb.o
-	$(kpathsea_link) ctangle.o cweb.o $(LOADLIBES)
-	$(MAKE) $(common_makeargs) ctangleboot.c cwebboot.c
-# ctangle.c is a special case, since it is needed to compile itself.
-ctangle.c: ctangleboot cwebdir/ctangle.w cwebdir/ctang-w2c.ch
-	CWEBINPUTS=$(srcdir)/cwebdir $(CTANGLEBOOT) ctangle ctang-w2c
-cweb.c: ctangleboot cwebdir/common.w cwebdir/comm-w2c.ch
-	CWEBINPUTS=$(srcdir)/cwebdir $(CTANGLEBOOT) common comm-w2c cweb.c
-clean:: ctangle-clean
-clean:: cweb-clean
-ctangle-clean:
-	$(LIBTOOL) --mode=clean rm -f ctangle
-	rm -f ctangle.o ctangle.c
-cweb-clean:
-	rm -f cweb.o cweb.c
-
-ctangleboot: ctangleboot.o cwebboot.o
-	$(kpathsea_link) ctangleboot.o cwebboot.o $(LOADLIBES)
-# ctangleboot.c is in the distribution
-stamp-ctangle: ctangleboot.c cwebboot.c
-ctangleboot.c: cwebdir/ctangle.w cwebdir/ctang-w2c.ch
-	if [ -r $(CTANGLE) ] || [ -r $(CTANGLE).exe ]; then \
-	  CWEBINPUTS=$(srcdir)/cwebdir $(CTANGLE) ctangle ctang-w2c; \
-	  mv ctangle.c ctangleboot.c; \
-	elif [ -r ctangleboot.c ]; then \
-	  touch ctangleboot.c; \
-	else \
-	  cp $(srcdir)/ctangleboot.c .; \
-	fi
-	date >stamp-ctangle
-	$(MAKE) $(common_makeargs) ctangle
-cwebboot.c: cwebdir/common.w cwebdir/comm-w2c.ch
-	if [ -r $(CTANGLE) ] || [ -r $(CTANGLE).exe ]; then \
-	  CWEBINPUTS=$(srcdir)/cwebdir $(CTANGLE) common comm-w2c cweb.c; \
-	  mv cweb.c cwebboot.c; \
-	elif [ -r cwebboot.c ]; then \
-	  touch cwebboot.c; \
-	else \
-	  cp $(srcdir)/cwebboot.c .; \
-	fi
-	date >stamp-ctangle
-	$(MAKE) $(common_makeargs) ctangle
-clean:: ctangleboot-clean
-clean:: cwebboot-clean
-ctangleboot-clean:
-	$(LIBTOOL) --mode=clean rm -f ctangleboot
-	rm -f ctangleboot.o
-cwebboot-clean:
-	rm -f cwebboot.o
-
-# Even web2c itself uses the library.
-lib_sources = lib/alloca.c lib/basechsuffix.c lib/chartostring.c \
-  lib/eofeoln.c lib/fprintreal.c lib/input2int.c lib/inputint.c lib/main.c \
-  lib/openclose.c lib/printversion.c lib/uexit.c lib/usage.c lib/version.c \
-  lib/zround.c 
-$(proglib): $(lib_sources) stamp-auto
-	cd lib && $(MAKE) $(common_makeargs)
-
-# No exceptions in this library.
-window_sources = $(srcdir)/window/*.c
-$(windowlib): mfd.h $(window_sources)
-	cd window && $(MAKE) $(window_makeargs)
-window/trap.o: $(srcdir)/window/trap.c
-	cd window && $(MAKE) $(common_makeargs) trap.o
-
-# The web2c program consists of several executables.
-web2c/fixwrites: web2c/fixwrites.c web2c/kps.c
-	cd web2c && $(MAKE) $(common_makeargs) fixwrites
-web2c/splitup: web2c/splitup.c web2c/kps.c
-	cd web2c && $(MAKE) $(common_makeargs) splitup
-web2c/web2c: web2c/main.c web2c/web2c.h web2c/web2c.l web2c/web2c.y web2c/kps.c
-	cd web2c && $(MAKE) $(common_makeargs) web2c
-$(makecpool): web2c/makecpool.c
-	cd web2c && $(MAKE) $(common_makeargs) makecpool
-
-kpse_include ../make/tkpathsea.mk
-
-# 
-# Making dumps.
-all_fmts = tex.fmt $(fmts)
-all_bases = mf.base $(bases)
-all_mems = mpost.mem $(mems)
-
-# We used to build these by default, but nowadays the dumps are created
-# completely separately, e.g., at runtime by mktexfmt.  So just leave it
-# as an optional extra target.
-dumps: fmts bases mems
-fmts: $(all_fmts)
-bases: $(all_bases)
-mems: $(all_mems)
-
-tex.fmt: tex
-	$(dumpenv) $(MAKE) progname=tex files="plain.tex cmr10.tfm" prereq-check
-	$(dumpenv) ./tex --progname=tex --jobname=tex --ini \\input plain \\dump </dev/null
-
-olatex.fmt: tex
-	$(dumpenv) $(MAKE) progname=olatex files="latex.ltx" prereq-check
-	$(dumpenv) ./tex --progname=olatex --jobname=olatex --ini \\input latex.ltx </dev/null
-
-mltex.fmt: tex
-	$(dumpenv) $(MAKE) progname=mltex files="plain.tex cmr10.tfm" prereq-check
-	$(dumpenv) ./tex --mltex --progname=mltex --jobname=mltex --ini \\input plain \\dump </dev/null
-
-mf.base: mf
-	$(dumpenv) $(MAKE) progname=mf files="plain.mf cmr10.mf $(localmodes).mf" prereq-check
-	$(dumpenv) ./mf --progname=mf --jobname=mf --ini \\input plain input $(localmodes) dump </dev/null
-
-mpost.mem: mpost
-	$(dumpenv) $(MAKE) progname=mpost files=plain.mp prereq-check
-	$(dumpenv) ./mpost --progname=mpost --jobname=mpost --ini \\input plain dump </dev/null
-
-# This is meant to be called recursively, with $(files) set.
-prereq-check: $(kpathsea_dir)/kpsewhich
-	$(kpathsea_dir)/kpsewhich --progname=$(progname) $(files) >/dev/null || $(MAKE) prereq-lose >/dev/null
-
-prereq-lose:
-	@echo "You seem to be missing input files necessary to make the" >&2
-	@echo "basic formats (some or all of: $(files))." >&2
-	@echo "Perhaps you've defined the default paths incorrectly, or" >&2
-	@echo "perhaps you have environment variables set pointing" >&2
-	@echo "to an incorrect location.  See ../kpathsea/BUGS." >&2
-	@echo >&2
-	@echo "If you simply do not have the files, you can" >&2
-	@echo "retrieve a minimal set of input files from CTAN hosts." >&2
-	false
-
-$(kpathsea_dir)/kpsewhich: $(kpathsea)
-
-amstex.fmt: tex
-	$(dumpenv) ./tex --progname=amstex --jobname=amstex --ini amstex.ini </dev/null
-
-# Texinfo changes the escape character from `\' to `@'.
-texinfo.fmt: tex.fmt
-	$(dumpenv) ./tex --progname=texinfo --jobname=texinfo --ini texinfo @dump </dev/null
-
-eplain.fmt: tex.fmt
-	touch eplain.aux # Makes cross-reference warnings work right.
-	$(dumpenv) ./tex --progname=eplain --jobname=eplain --ini \&./tex eplain \\dump </dev/null
-
-# 
-install: install-exec install-data
-install-exec:: install-programs
-
-# Installation directories.
-$(bindir)::
-	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-$(texpooldir)::
-	$(SHELL) $(top_srcdir)/../mkinstalldirs $(texpooldir)
-$(mfpooldir)::
-	$(SHELL) $(top_srcdir)/../mkinstalldirs $(mfpooldir)
-$(mppooldir)::
-	$(SHELL) $(top_srcdir)/../mkinstalldirs $(mppooldir)
-$(fmtdir)::
-	$(SHELL) $(top_srcdir)/../mkinstalldirs $(fmtdir)
-$(basedir)::
-	$(SHELL) $(top_srcdir)/../mkinstalldirs $(basedir)
-$(memdir)::
-	$(SHELL) $(top_srcdir)/../mkinstalldirs $(memdir)
-$(web2cdir)::
-	$(SHELL) $(top_srcdir)/../mkinstalldirs $(web2cdir)
-
-# Installing the binaries.  Each of the *dir/*.mk files (except etex)
-# add to this target via a dependency-only rule, to install their
-# respective engines.
-install-programs: $(programs) $(basic_engines) $(bindir)
-	for p in $(programs) $(basic_engines); do \
-	  $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-
-# We do not attempt to install any of the per-format symlinks, leaving
-# that to a separate run of texlinks.
-
-# Always do plain.*, so examples from the TeXbook (etc.) will work.
-# This target is not called, since it depends on the whole texmf tree,
-# but we leave it for posterity.
-install-fmts: install-tex-fmts
-install-tex-fmts: fmts $(fmtdir)
-	fmts="$(all_fmts)"; \
-	  for f in $$fmts; do $(INSTALL_DATA) $$f $(fmtdir)/$$f; done
-	cd $(fmtdir) && (rm -f plain.fmt; $(LN) tex.fmt plain.fmt)
-	fmts="$(fmts)"; \
-	  for f in $$fmts; do base=`basename $$f .fmt`; \
-	    (cd $(bindir) && (rm -f $$base; $(LN) tex $$base)); done
-
-install-bases: install-mf-bases
-install-mf-bases: bases $(basedir)
-	bases="$(all_bases)"; \
-	  for f in $$bases; do $(INSTALL_DATA) $$f $(basedir)/$$f; done
-	cd $(basedir) && (rm -f plain.base; $(LN) mf.base plain.base)
-	bases="$(bases)"; \
-	  for f in $$bases; do base=`basename $$f .base`;\
-	    (cd $(bindir) && (rm -f $$base; $(LN) mf $$base)); done
-
-install-mems: install-mpost-mems
-install-mpost-mems: mems $(memdir)
-	mems="$(all_mems)"; \
-	  for f in $$mems; do $(INSTALL_DATA) $$f $(memdir)/$$f; done
-	cd $(memdir) && (rm -f plain.mem; $(LN) mpost.mem plain.mem)
-	mems="$(mems)"; \
-	  for f in $$mems; do base=`basename $$f .mem`; \
-            (cd $(bindir) && (rm -f $$base; $(LN) mpost $$base)); done
-
-# Auxiliary files.
-install-data:: $(web2cdir)
-	cd doc && $(MAKE) $(install_makeargs) install-data
-	cd man && $(MAKE) $(install_makeargs) install-data
-	$(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(man5dir)
-	$(INSTALL_DATA) $(srcdir)/tiedir/tie.1 $(man1dir)/tie.$(manext)
-	$(INSTALL_DATA) $(srcdir)/ctiedir/ctie.1 $(man1dir)/ctie.$(manext)
-	$(INSTALL_DATA) $(srcdir)/synctexdir/man1/synctex.1 $(man1dir)/synctex.$(manext)
-	$(INSTALL_DATA) $(srcdir)/synctexdir/man5/synctex.5 $(man5dir)/synctex.5
-
-# Dummy target.
-uninstall uninstall-exec uninstall-data:
-	@echo "*** Warning: uninstall is a dummy target in web2c/Makefile"
-
-# The distribution comes with up-to-date .info* files,
-# so this should never be used unless something goes wrong
-# with the unpacking, or you modify the manual.
-doc/web2c.info:
-	cd doc && $(MAKE) info
-info dvi:
-	cd doc && $(MAKE) $@
-
-# Manual pages
-manpages:
-	cd man && $(MAKE) all
-
-# 
-# make dist won't work for anyone but me. Sorry.
-
-@MAINT@all-dist: dist web-dist etex-dist omega-dist aleph-dist pdftex-dist libs-dist
-@MAINT@
-@MAINT@distname = web2c
-@MAINT@program_files = PROJECTS *.ac *.ch tangleboot.p
-@MAINT@# The files that omega places in the main directory.
-@MAINT@omega_files = omegamem.h {odvicopy,odvitype,otangle}.{web,ch}
-@MAINT@
-@MAINT@triptrapdiffs: triptrap/trip.diffs triptrap/mftrap.diffs triptrap/mptrap.diffs
-@MAINT@triptrap/trip.diffs: tex
-@MAINT@	$(MAKE) trip | tail +1 >triptrap/trip.diffs
-@MAINT@triptrap/mftrap.diffs: mf
-@MAINT@	$(MAKE) trap | tail +1 >triptrap/mftrap.diffs
-@MAINT@triptrap/mptrap.diffs: mpost
-@MAINT@	$(MAKE) mptrap | tail +1 >triptrap/mptrap.diffs
-@MAINT@
-@MAINT@tests/check.log: $(programs) $(engines)
-@MAINT@	$(MAKE) check | tail +1 >tests/check.log
-@MAINT@
-@MAINT@dist_subdirs = doc lib $(mpware) tests web2c window
-@MAINT@pre-dist-$(distname): depend triptrapdiffs tests/check.log tangleboot.p
-@MAINT@	cd web2c && $(MAKE) lex.yy.c y_tab.c
-@MAINT@	cd doc && $(MAKE) doc dvi
-@MAINT@
-@MAINT@post-dist-$(distname): 
-@MAINT@# Make the subdirectories.
-@MAINT@	for d in $(dist_subdirs); do \
-@MAINT@	  mkdir -p $(texk_distdir)/$(distname)/$$d; done
-@MAINT@# Link files in subdirectories.
-@MAINT@	for f in `find $(dist_subdirs)		\
-@MAINT@		       \(    -name README	\
-@MAINT@			  -o -name convert	\
-@MAINT@			  -o -name ChangeLog	\
-@MAINT@			  -o -name 'coerce.*'	\
-@MAINT@			  -o -name ref.aux	\
-@MAINT@			  -o -name ref.bbl	\
-@MAINT@			  -o -name ref.tex	\
-@MAINT@			  -o -name ref.txi	\
-@MAINT@			  -o -name texinfo.bst	\
-@MAINT@			  -o -name web2c.cps	\
-@MAINT@			  -o -name web2c.aux	\
-@MAINT@			  -o -name '*.asm'	\
-@MAINT@			  -o -name '*.[chly]'	\
-@MAINT@			  -o -name '*.defines'	\
-@MAINT@			  -o -name '*.in'	\
-@MAINT@			  -o -name '*.info*'	\
-@MAINT@	                  -o -name '*.map'	\
-@MAINT@			  -o -name '*.sed'	\
-@MAINT@			  -o -name '*.tcx'	\
-@MAINT@			  -o -name '*.texi'	\
-@MAINT@		       \) -print`; do		\
-@MAINT@	  ln $$f $(distdir)/`dirname $$f`; done
-@MAINT@# Handle the dependeny files in the subdirectories.
-@MAINT@	for d in lib $(mpware) web2c window; do \
-@MAINT@	  cp -p $$d/depend.mk $(texk_distdir)/$(distname)/$$d; done
-@MAINT@# Other subdirectories.
-@MAINT@	mkdir $(distdir)/triptrap && cd $(distdir)/triptrap && \
-@MAINT@	  for i in ../../../../triptrap/*; do \
-@MAINT@	    if test -f $$i; then ln -s $$i .; fi; done
-@MAINT@	mkdir $(distdir)/tiedir && cd $(distdir)/tiedir && \
-@MAINT@	  for i in ../../../../tiedir/*; do \
-@MAINT@	    if test -f $$i; then ln -s $$i .; fi; done
-@MAINT@	mkdir $(distdir)/ctiedir && cd $(distdir)/ctiedir && \
-@MAINT@	  for i in ../../../../ctiedir/*; do \
-@MAINT@	    if test -f $$i; then ln -s $$i .; fi; done
-@MAINT@	mkdir $(distdir)/cwebdir && cd $(distdir)/cwebdir && \
-@MAINT@	  for i in ../../../../cwebdir/*; do \
-@MAINT@	    if test -f $$i; then ln -s $$i .; fi; done
-@MAINT@	mkdir $(distdir)/cwebdir/examples && cd $(distdir)/cwebdir/examples && \
-@MAINT@	  for i in ../../../../cwebdir/examples/*; do \
-@MAINT@	    if test -f $$i; then ln -s $$i .; fi; done
-@MAINT@	mkdir $(distdir)/man && cd $(distdir)/man && \
-@MAINT@	  for i in ../../../../man/*; do \
-@MAINT@	    if test -f $$i; then ln -s $$i .; fi; done;
-@MAINT@	cd $(distdir)/man && rm -f *.1 Makefile sedscript
-@MAINT@	rm -f $(distdir)/window/x11.c
-@MAINT@	rm -f $(distdir)/tests/patgen.in
-@MAINT@	cd $(distdir)/tests && (rm just.texi; ln -s ../../../../tests/* .; rm -f x* CVS)
-@MAINT@	cd $(distdir)/tests && rm -f missfont.log ptmr.mpx io.tex exampl.b??
-@MAINT@# We supply the flex/bison output in case the user can't generate them.
-@MAINT@	cd $(distdir)/web2c; ../../../../../rename 's/$$/-dist/' lex.yy.c y_tab.[ch]
-@MAINT@# Remove cruft.
-@MAINT@	cd $(distdir); rm -f $(addsuffix .c, $(programs) tangleboot)
-@MAINT@	cd $(distdir); rm -f $(addsuffix .h, $(programs) tangleboot)
-@MAINT@	cd $(distdir); rm -f etex.ch omega.ch aleph.ch
-@MAINT@	cd $(distdir); rm -f pdftex.ch
-@MAINT@	cd $(distdir); bash -c "rm -f tests/x* tests/allbib.{bbl,blg,dvi,log}"
-@MAINT@	cd $(distdir)/tests && ln -s ../../../../tests/xampl.bib .
-@MAINT@	cd $(distdir); bash -c "rm -f $(omega_files) alephmem.h"
-@MAINT@	cd $(distdir); bash -c "rm -f cweb.c *{coerce,d}.h"
-@MAINT@	cd $(distdir); bash -c "rm -f omega*.c aleph*.c"
-@MAINT@	cd $(distdir); bash -c "rm -f tex*.c etex*.c"
-@MAINT@	cd $(distdir); bash -c "rm -f pdftex*.c"
-@MAINT@	cd $(distdir); bash -c "rm -f mf*.c mp*.c"
-@MAINT@	cd $(distdir); bash -c "rm -f macnames.c *extra.c"
-@MAINT@	touch $(distdir)/doc/*.info*
-@MAINT@
-@MAINT@web-dist:
-@MAINT@	rm -rf $(top_distdir)
-@MAINT@	mkdir -p $(distdir)
-@MAINT@	for f in *.web; do ln $$f $(distdir); done
-@MAINT@	rm -f $(distdir)/etex.web $(distdir)/omega.web $(distdir)/aleph.web
-@MAINT@	rm -f $(distdir)/pdfetex.web
-@MAINT@	cd $(distdir); bash -c "rm -f $(omega_files)"
-@MAINT@	chmod -w $(distdir)/*
-@MAINT@	GZIP=-9 tar czf web-$(version).tar.gz $(top_distdir)
-@MAINT@	rm -rf $(top_distdir)
-@MAINT@
-@MAINT@etex-dist: etexdir/etex.version
-@MAINT@	rm -rf $(top_distdir)
-@MAINT@	mkdir -p $(distdir)/etexdir
-@MAINT@	cp -rp etexdir/* $(distdir)/etexdir
-@MAINT@	rm -rf $(distdir)/etexdir/CVS $(distdir)/etexdir/*/CVS
-@MAINT@	rm -f $(distdir)/etexdir/etexextra.h $(distdir)/etexdir/etex.version
-@MAINT@	GZIP=-9 tar czf web2c-$(version)-etex-`cat etexdir/etex.version`.tar.gz $(top_distdir)
-@MAINT@	rm -rf $(top_distdir)
-@MAINT@
-@MAINT@omega-dist:
-@MAINT@	rm -rf $(top_distdir)
-@MAINT@	mkdir -p $(distdir)/omegadir
-@MAINT@	mkdir -p $(distdir)/omegaware $(distdir)/omegafonts $(distdir)/otps
-@MAINT@	cp -p omegadir/* $(distdir)/omegadir
-@MAINT@	cd omegafonts && $(MAKE) lex.yy.c y_tab.c
-@MAINT@	for f in omegafonts/*.[chly] omegafonts/*.in; do cp -p $$f $(distdir)/omegafonts; done
-@MAINT@	cp -p omegaware/* $(distdir)/omegaware
-@MAINT@	cd otps && $(MAKE) lex.yy.c y_tab.c
-@MAINT@	for f in otps/*.[chly] otps/*.in; do cp -p $$f $(distdir)/otps; done
-@MAINT@	cp -p otps/mkocp otps/mkofm $(distdir)/otps
-@MAINT@# We supply the flex/bison output in case the user can't generate them.
-@MAINT@	cd $(distdir)/omegafonts; ../../../../../rename 's/$$/-dist/' lex.yy.c y_tab.[ch]
-@MAINT@	cd $(distdir)/otps; ../../../../../rename 's/$$/-dist/' lex.yy.c y_tab.[ch]
-@MAINT@	GZIP=-9 tar czf web2c-$(version)-omega-`cat omegadir/omega.version`.tar.gz $(top_distdir)
-@MAINT@	rm -rf $(top_distdir)
-@MAINT@
-@MAINT@aleph-dist: alephdir/aleph.version
-@MAINT@	rm -rf $(top_distdir)
-@MAINT@	mkdir -p $(distdir)/alephdir
-@MAINT@	cp -p alephdir/* $(distdir)/alephdir
-@MAINT@	@echo "*** Removing generated files ***"
-@MAINT@	rm -f $(distdir)/alephdir/alephextra.h
-@MAINT@	GZIP=-9 tar czf web2c-$(version)-aleph-`cat alephdir/aleph.version`.tar.gz $(top_distdir)
-@MAINT@	rm -rf $(top_distdir)
-@MAINT@
-@MAINT@pdfetex-dist: pdfetexdir/pdfetex.version
-@MAINT@	rm -rf $(top_distdir)
-@MAINT@	mkdir -p $(distdir)/pdfetexdir
-@MAINT@	cp -rp pdfetexdir/* $(distdir)/pdfetexdir
-@MAINT@	rm -rf $(distdir)/pdf*texdir/CVS $(distdir)/pdf*texdir/*/CVS
-@MAINT@	rm -f $(distdir)/pdf*texdir/Makefile
-@MAINT@	rm -f $(distdir)/pdf*texdir/*.[oa]
-@MAINT@	rm -f $(distdir)/pdf*texdir/*/config.*
-@MAINT@	rm -f $(distdir)/pdf*texdir/*/Makefile
-@MAINT@	rm -f $(distdir)/pdf*texdir/*/*.[oa]
-@MAINT@	rm -f $(distdir)/pdf*texdir/*/*/Makefile
-@MAINT@	rm -f $(distdir)/pdf*texdir/*/*/*.[ao]
-@MAINT@	rm -f $(distdir)/pdf*texdir/*/*/pdftoepdf.cc
-@MAINT@	rm -f $(distdir)/pdf*texdir/*/*/epdf.h
-@MAINT@	rm -f $(distdir)/pdf*texdir/pdf*texextra.h
-@MAINT@	rm -f $(distdir)/pdf*texdir/pdf*tex.version
-@MAINT@	mkdir -p $(top_distdir)/libs/xpdf
-@MAINT@	cp -rp $(top_srcdir)/../../libs/xpdf/* $(top_distdir)/libs/xpdf
-@MAINT@	rm -rf $(top_distdir)/libs/xpdf/CVS $(top_distdir)/libs/xpdf/*/CVS
-@MAINT@	rm -f $(top_distdir)/libs/xpdf/Makefile
-@MAINT@	rm -f $(top_distdir)/libs/xpdf/config.*
-@MAINT@	rm -f $(top_distdir)/libs/xpdf/aconf.h
-@MAINT@	rm -f $(top_distdir)/libs/xpdf/*/Makefile
-@MAINT@	rm -f $(top_distdir)/libs/xpdf/*/*.[oa]
-@MAINT@	rm -f $(top_distdir)/libs/xpdf/*/c-auto.h
-@MAINT@	GZIP=-9 tar czf web2c-$(version)-pdftex-`cat pdfetexdir/pdfetex.version`.tar.gz $(top_distdir)
-@MAINT@	rm -rf $(top_distdir)
-@MAINT@
-@MAINT@libs-dist:
-@MAINT@	rm -rf $(top_distdir)
-@MAINT@	mkdir -p $(libs_distdir)/zlib
-@MAINT@	cp -rp $(top_srcdir)/../../libs/zlib/* $(libs_distdir)/zlib
-@MAINT@	mkdir -p $(libs_distdir)/libpng
-@MAINT@	cp -rp $(top_srcdir)/../../libs/libpng/* $(libs_distdir)/libpng
-@MAINT@	mkdir -p $(libs_distdir)/md5
-@MAINT@	cp -rp $(top_srcdir)/../../libs/md5/* $(libs_distdir)/md5
-@MAINT@	rm -f $(libs_distdir)/*/Makefile
-@MAINT@	rm -f $(libs_distdir)/*/config.*
-@MAINT@	rm -f $(libs_distdir)/*/c-auto.h
-@MAINT@	rm -f $(libs_distdir)/*/*.[oa]
-@MAINT@	GZIP=-9 tar czf web2c-$(version)-pdfetexlibs.tar.gz $(top_distdir)
-@MAINT@	rm -rf $(top_distdir)
-
-kpse_include ../make/dist.mk
-
-kpse_include ../make/config.mk
-
-@MAINT@$(srcdir)/configure: $(srcdir)/withenable.ac
-
-# 
-
-installcheck:
-	cd $(srcdir)/tests && bibtex allbib
-	mf '\mode:=ljfour; input logo10' && tftopl logo10.tfm >/dev/null
-	tex '\nonstopmode \tracingstats=1 \input story \bye'
-
-# 
-# Cleaning.
-all_subdirs = doc lib man $(mpware) web2c window $(omegafonts) $(otps) \
-              $(pdftexdir) $(mpostdir) $(luatexdir) 
-
-# Having a multiple-target rule with the subdir loop fails because of
-# the dependencies introduced by clean.mk.  Yet, we want the
-# dependencies here at the top level so that distclean will run the
-# clean rules, etc.  So, sigh, put the subdir loop in each target and
-# only run it if we have a Makefile.  Alternatively, we could do as
-# Automake does.
-
-mostlyclean:: tangleboot-clean ctangleboot-clean
-	test ! -r lib/Makefile \
-	  || for d in $(all_subdirs); do (cd $$d && $(MAKE) $@); done
-clean::
-	test ! -r lib/Makefile \
-	  || for d in $(all_subdirs); do (cd $$d && $(MAKE) $@); done
-	rm -f *.log *.fmt *.base *.mem *.fls *.ofl *.aux
-distclean::
-	test ! -r lib/Makefile \
-	  || for d in $(all_subdirs); do (cd $$d && $(MAKE) $@); done
-extraclean::
-	test ! -r lib/Makefile \
-	  || for d in $(all_subdirs); do (cd $$d && $(MAKE) $@); done
-maintainer-clean::
-	test ! -r lib/Makefile \
-	  || for d in $(all_subdirs); do (cd $$d && $(MAKE) $@); done
-
-kpse_include ../make/clean.mk
-
-@MAINT@depend::
-@MAINT@	for d in lib $(mpware) web2c window $(otps); do \
-@MAINT@	  (cd $$d && $(MAKE) depend); done
-
-kpse_include ../make/rdepend.mk
-kpse_include depend.mk
-
-# 
-# Local variables:
-# page-delimiter: "^# \f"
-# End:
diff --git a/Build/source/texk/web2c/configure.in.orig b/Build/source/texk/web2c/configure.in.orig
deleted file mode 100644
index d1034db49ad..00000000000
--- a/Build/source/texk/web2c/configure.in.orig
+++ /dev/null
@@ -1,502 +0,0 @@
-dnl Process this file with Autoconf to produce a configure script for Web2c.
-dnl
-dnl Some things are no longer configurable:
-dnl - SMALL{TeX,MF,BibTeX}: too painful to maintain the separate patch
-dnl   files, and, for TeX, texmfmem.h would have to be fixed to support
-dnl   more than 256 fonts.
-dnl - NONASCII: necessary for the character translation feature.
-dnl - REGFIX: modern compilers mostly ignore register declarations, anyway.
-dnl The code for these things remains (where applicable), so you can
-dnl get these features if you are willing to hack the sources. If not,
-dnl it'll take a good argument to convince me to invest the time to make
-dnl them configurable.
-dnl 
-dnl We don't use (for example) tex/tex.web because people who only want
-dnl to build part of the distribution may not have any given program.
-dnl Even main.c isn't guaranteed, but then nothing is, really ...
-AC_INIT(web2c/main.c)
-
-WEB2CVERSION=7.5.7
-AC_SUBST(WEB2CVERSION)
-AC_DEFINE_UNQUOTED(WEB2CVERSION," (Web2C $WEB2CVERSION)")
-
-dnl Write output here, instead of putting a zillion -D's on the command line.
-AC_CONFIG_HEADERS([c-auto.h:c-auto.in],
- [sed 's/^#define PACKAGE_/#define WEB2C_PACKAGE_/' c-auto.h >c-auto.tmp && mv -f c-auto.tmp c-auto.h
-  date >stamp-auto])
-
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-
-AC_PROG_YACC
-AC_PROG_LEX
-# Work around a problem with Flex Version 2.5.31 which needs -l flag.
-# Since all recent versions of flex support -l, don't check for the
-# specific version, but check that at least "--version" is supported.
-# We also want to catch LEX=/some/where/flex, so:
-case $LEX in
-  *flex) $LEX --version >/dev/null 2>&1 && LEX="$LEX -l" ;;
-esac
-AC_PROG_RANLIB
-AC_CHECK_HEADERS(sys/time.h sys/timeb.h locale.h)
-AC_CHECK_FUNCS(strerror gettimeofday ftime mkstemp mktemp setlocale strlcat strlcpy fmax)
-
-AC_TYPE_SIGNAL
-
-pb_AC_ASM_UNDERSCORE
-
-dnl pdfTeX likes inline functions in C code.
-AC_C_INLINE
-
-dnl These are standard among *NIX systems, but not when cross-compiling
-AC_DEFUN([CF_SUBST],
-[AC_MSG_CHECKING(for $1 (symbol $2))
-AC_CACHE_VAL(cf_cv_subst_$2,[
-test -z "[$]$2" && $2=$3
-cf_cv_subst_$2=[$]$2])
-$2=${cf_cv_subst_$2}
-AC_MSG_RESULT([$]$2)
-AC_SUBST($2)
-])dnl
-CF_SUBST(loader,LD,ld)
-CF_SUBST(archiver,AR,ar)
-CF_SUBST(archiver options,ARFLAGS,rc)
-
-# Needed on A/UX 3.0. I don't want to pull in other -lposix's, though.
-# From: bernt@weinberg.pop.bio.aau.dk (Bernt Guldbrandtsen)
-if test `(uname) 2>/dev/null` = aux; then
-  AC_CHECK_LIB(posix, sigemptyset)
-fi
-
-dnl These tests prevent reliable cross-compilation.  Sigh.
-dnl Some special hacks are used to make cross-compilation
-dnl succeed in one special case.
-
-AC_UNSET_CC
-AC_C_CHAR_UNSIGNED
-AC_C_BIGENDIAN
-AC_CHECK_SIZEOF(long)
-AC_RESET_CC
-
-# --with and --enable options.
-test "x$with_x_toolkit" = xyes && with_x=yes
-test "x$with_x_toolkit" = xxt && with_x=yes
-test "x$with_x_toolkit" = xathena && with_x=yes
-test "x$with_x" = xno && with_x_toolkit=no
-
-: ${with_x=no} # tell PATH_XTRA no X by default, if not specified.
-
-sinclude(withenable.ac)
-sinclude(../kpathsea/withenable.ac)
-sinclude(../../libs/zlib/withenable.ac)
-sinclude(../../libs/libpng/withenable.ac)
-sinclude(../../libs/zlib/zlib.ac)
-sinclude(../../libs/libpng/libpng.ac)
-sinclude(../../libs/xpdf/libxpdf.ac)
-sinclude(../../libs/obsdcompat/libobsd-compat.ac)
-sinclude(../../libs/freetype2/withenable.ac)
-sinclude(../../libs/freetype2/freetype2.ac)
-sinclude(../../libs/teckit/withenable.ac)
-sinclude(../../libs/teckit/teckit.ac)
-sinclude(../../libs/icu-xetex/withenable.ac)
-sinclude(../../libs/icu-xetex/icu-xetex.ac)
-sinclude(../../libs/graphite-engine/withenable.ac)
-sinclude(../../libs/graphite-engine/graphite-engine.ac)
-
-# Whether to build mf-nowin.
-: ${with_mf_nowin=no} # Default.
-if test "x$with_mf_nowin" = xyes; then
-  MFN=
-else
-  MFN='#! '
-fi
-AC_SUBST(MFN)
-
-# For Omega.
-if test -d $srcdir/omegadir; then
-  test "${with_omega+set}" = set || with_omega=yes
-else
-  if test "x$with_omega" = xyes; then
-    AC_MSG_WARN(The Omega sources are not available.)
-  fi
-  with_omega=no
-fi
-if test "x$with_omega" = xyes; then
-  OMEGA=
-  KPSE_CONFIG_FILES([omegafonts/Makefile otps/Makefile])
-else
-  OMEGA='#! '
-fi
-AC_SUBST(OMEGA)
-
-# For Aleph
-if test -d $srcdir/alephdir && test -d $srcdir/omegadir; then
-  test "${with_aleph+set}" = set || with_aleph=yes
-else
-  if test "x$with_aleph" = xyes; then
-    AC_MSG_WARN(The Aleph sources are not available.)
-  fi
-  with_aleph=no
-fi
-if test "x$with_aleph" = xyes; then
-  ALEPH=
-else
-  ALEPH='#! '
-fi
-AC_SUBST(ALEPH)
-
-# For pdfTeX.
-if test -d $srcdir/pdftexdir; then
-  # Create build dir, if necessary.
-  test -d pdftexdir || mkdir pdftexdir
-  test "${with_pdftex+set}" = set || with_pdftex=yes
-else
-  if test "x$with_pdftex" = xyes; then
-    AC_MSG_WARN(The pdfTeX sources are not available.)
-  fi
-  with_pdftex=no
-fi
-
-# For pdfeTeX
-if test -d $srcdir/pdftexdir; then
-  test "${with_pdfetex+set}" = set || with_pdfetex=yes
-else
-  if test "x$with_pdfetex" = xyes; then
-    AC_MSG_WARN(Not all sources of pdfeTeX are available.)
-  fi
-  with_pdfetex=no
-fi
-
-# For luaTeX.
-if test -d $srcdir/luatexdir; then
-  # Create build dir, if necessary.
-  test -d luatexdir || mkdir luatexdir
-  test "${with_luatex+set}" = set || with_luatex=yes
-else
-  if test "x$with_luatex" = xyes; then
-    AC_MSG_WARN(The luaTeX sources are not available.)
-  fi
-  with_luatex=no
-fi
-
-# For XeTeX
-if test -d $srcdir/xetexdir \
-    && test -d $srcdir/etexdir; then
-  test "${with_xetex+set}" = set || with_xetex=yes
-else
-  if test "x$with_xetex" = xyes; then
-    AC_MSG_WARN(Not all sources of XeTeX are available.)
-  fi
-  with_xetex=no
-fi
-
-# Check whether C++ compiler works.  Prevent exit if it doesn't.
-if test "x$with_pdftex"  = xyes ||
-   test "x$with_luatex"  = xyes ||
-   test "x$with_pdfetex" = xyes ||
-   test "x$with_xetex"   = xyes
-then
-  # First test whether the compiler works in a subshell, and if so,
-  # do it again in the main shell so we see the result.
-(
-  AC_PROG_CXX
-) && {
-  AC_PROG_CXX
-} || {
-  test "x$with_pdftex" = xyes \
-    && AC_MSG_WARN(No C++ compiler: pdfTeX will not be compiled.)
-  test "x$with_pdfetex" = xyes \
-    && AC_MSG_WARN(No C++ compiler: pdfeTeX will not be compiled.)
-  test "x$with_luatex" = xyes \
-    && AC_MSG_WARN(No C++ compiler: luaTeX will not be compiled.)
-  test "x$with_xetex" = xyes \
-    && AC_MSG_WARN(No C++ compiler: XeTeX will not be compiled.)
-  with_pdftex=no
-  with_pdfetex=no
-  with_luatex=no
-  with_xetex=no
-  true
-}
-fi
-
-# Check if we can link the C++ runtime lib statically, if we're building
-# some binary that will need it. And, only try the magic hack, if C++ is
-# GNU C++ (i.e. if $ac_cv_prog_gxx=yes). The reason for using a static
-# C++ runtime is that binaries are more portable. That's important only
-# if you are distributing binaries, so it is disabled by default.
-# 
-flags_try1='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm -lgcc_eh -lgcc -lc -lgcc_eh -lgcc'
-flags_try2='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm -lgcc -lc -lgcc'
-CXXLDEXTRA=
-CXXHACKLINK='$(kpathsea_cxx_link)'
-CXXHACKLDLIBS='$(LOADLIBES)'
-if test "x$with_cxx_runtime_hack" = xyes &&
-   { test "x$with_pdftex"  = xyes ||
-     test "x$with_luatex"  = xyes ||
-     test "x$with_pdfetex" = xyes ||
-     test "x$with_xetex"   = xyes; }
-then
-  AC_MSG_CHECKING(for statically linking C++ runtime library)
-
-  cpp_link_hack=false
-  old_flags=$flags
-  old_ac_ext=$ac_ext
-  old_ac_link=$ac_link
-  if test "$ac_cv_prog_gxx" = yes; then
-
-    # New C++ compilers choke on <iostream.h>, thanks to the
-    # backward-incompatible standard.  At this point, our code is
-    # using the new-style <iostream>, and so our test should follow suit.
-    # 
-    ac_ext=C
-    cat > conftest.$ac_ext << EOF
-#include <iostream>
-  using namespace std;
-int main()
-{
-  cout <<"worksok\n";
-}
-EOF
-    for flags in "$flags_try1" "$flags_try2"; do
-      ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS $flags 1>&5'
-      if { (eval echo configure: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-        case `(./conftest; exit) 2>/dev/null` in
-          worksok)
-            cpp_link_hack=true; break;;
-        esac
-      else
-        echo "configure: failed program was:" >&5
-        cat conftest.$ac_ext >&5
-      fi
-    done
-  fi
-
-  if $cpp_link_hack; then
-    CXXLDEXTRA=$flags
-    CXXHACKLINK='$(cxx_link_command)'
-    CXXHACKLDLIBS='$(proglib) $(kpathsea_dir)/.libs/libkpathsea.a $(LIBS) $(XLOADLIBES)'
-    AC_MSG_RESULT(ok using $flags)
-  else
-    AC_MSG_RESULT(not supported)
-  fi
-
-  flags=$old_flags
-  ac_ext=$old_ac_ext
-  ac_link=$old_ac_link
-fi
-AC_SUBST(CXXLDEXTRA)
-AC_SUBST(CXXHACKLINK)
-AC_SUBST(CXXHACKLDLIBS)
-
-if test "x$with_pdftex" = xyes; then
-  PTEX=
-else
-  PTEX='#! '
-fi
-AC_SUBST(PTEX)
-
-if test "x$with_pdfetex" = xyes; then
-  PETEX=
-else
-  PETEX='#! '
-fi
-AC_SUBST(PETEX)
-
-if test "x$with_luatex" = xyes; then
-  LTEX=
-else
-  LTEX='#! '
-fi
-AC_SUBST(LTEX)
-
-if test "x$with_xetex" = xyes; then
-  XETEX=
-else
-  XETEX='#! '
-fi
-AC_SUBST(XETEX)
-
-sinclude(xetexdir/withenable.ac)
-sinclude(xetexdir/tests.ac)
-
-sinclude(xetexdir/acx_pthread.m4)
-ACX_PTHREAD
-
-# the following is for OpenBSD, where the PTHREAD_CFLAGS setting is defeated by -nodefaultlibs in the xetex link;
-# similar hackery might be needed on other systems (groan) -- JK 2007-01-07
-case "${host}" in
-*-*-*bsd*)
-  if test "x$PTHREAD_LIBS" = "x"; then
-    PTHREAD_LIBS="-lpthread"
-  fi ;;
-esac
-
-if test "x$with_xetex" = xyes; then
-  AC_HAS_CARBON
-
-  if test "x$has_carbon" = "xyes"; then
-    XETEX_MACOSX=
-    XETEX_GENERIC='#! '
-  else
-    XETEX_MACOSX='#! '
-    XETEX_GENERIC=
-
-    AC_HAS_LIBFONTCONFIG
-    if test "x$LDFONTCONFIG" = "x"; then
-      AC_MSG_ERROR([
-Cannot build XeTeX without libfontconfig.
-Use the --with-fontconfig=DIR option to specify the prefix where
-fontconfig is installed.
-      ])
-    fi
-    AC_SUBST(FONTCONFIGCPPFLAGS)
-    AC_SUBST(FONTCONFIGLDFLAGS)
-    AC_SUBST(LDFONTCONFIG)
-  fi
-  AC_SUBST(XETEX_MACOSX)
-  AC_SUBST(XETEX_GENERIC)
-
-  if test "x$with_graphite" = xno; then
-    XETEX_GRAPHITE='#! '
-  else
-    XETEX_GRAPHITE=
-  fi
-  AC_SUBST(XETEX_GRAPHITE)
-fi
-
-
-# For e-TeX, three choices: no, yes, and tex.  In the latter case, we
-# have to comment out the normal TeX build (TEX), as well as enable the
-# e-TeX build (ETEX) and the replacement of TeX with e-TeX in compatibilty
-# mode(CTEX).
-if test -d $srcdir/etexdir; then
-  # Create build dir, if necessary.
-  test -d etexdir || mkdir etexdir
-  test "${with_etex+set}" = set || with_etex=yes
-else
-  if test "x$with_etex" = xyes; then
-    AC_MSG_WARN(The e-TeX sources are not available.)
-  fi
-  with_etex=no
-fi
-if test "x$with_etex" = xyes; then
-  ETEX=
-else
-  ETEX='#! '
-fi
-AC_SUBST(ETEX)
-
-
-# --with-x* options: Distinguish no X at all, no toolkit, or toolkit.
-AC_PATH_XTRA
-if test "x$with_x" = xyes; then
-  if test -n "$x_libraries"; then
-    XLFLAG="-L$x_libraries"
-    wlibs="-lX11 $wlibs $XLFLAG"
-  else
-    wlibs="-lX11 $wlibs"
-  fi
-  if test -z "$x_ext_lib"; then # allow envvar override
-    AC_CHECK_LIB(Xext, XextCreateExtension,
-                 x_ext_lib=-lXext, :, $wlibs $X_EXTRA_LIBS $XLFLAG)
-  fi
-  if test "x$with_mf_x_toolkit" = xno; then
-    wfile=x11-Xlib.c
-  else
-    # Effectively demote --with-x-toolkit=athena to xt since 
-    # the code does not distinguish.
-    x_tool_libs="-lXt $x_tool_libs"
-    wfile=x11-Xt.c
-  fi
-  test -d window || mkdir window
-  case "$srcdir" in
-    /*) wfile=$srcdir/window/$wfile;;
-    .)  ;;
-    *)  wfile=../$srcdir/window/$wfile;;
-  esac
-  (cd window && (rm -f x11.c; $LN_S $wfile x11.c))
-  AC_DEFINE([X11WIN], 1, [Define to include X11 window in Metafont.])
-fi
-AC_SUBST(x_ext_lib)
-AC_SUBST(x_tool_libs)
-AC_SUBST(wlibs)
-
-if test "x$enable_fmtutil" = xyes; then
-  FMU='# '
-else
-  FMU=
-fi
-AC_SUBST(FMU)
-
-# Don't bother with pdflib unless pdf*TeX is requested.
-if test "$with_pdftex" = yes || \
-   test "$with_pdfetex" = yes
-then
-  KPSE_CONFIG_FILES([pdftexdir/Makefile])
-fi
-
-# Ditto luatex.
-if test "$with_luatex" = yes; then
-  KPSE_CONFIG_FILES([luatexdir/Makefile])
-fi
-
-dnl Create tests subdirectory.
-test -d tests || mkdir tests
-
-# Is libm present.  FIXME: do we need it at all?
-AC_CHECK_LIB(m, main)
-
-# For cross-compilation.  Put at the end so there is a fair chance
-# these are still visible when the configure script has finished.
-
-# The variables we need to build binaries that will run on the build
-# machine: BUILDCC, BUILDCFLAGS, BUILDCCLD.
-KPSE_CROSS_BUILD_VAR(CC, cc)
-KPSE_CROSS_BUILD_VAR(CFLAGS, $(BUILDXCFLAGS))
-KPSE_CROSS_BUILD_VAR(CPPFLAGS, $(BUILDXCPPFLAGS))
-KPSE_CROSS_BUILD_VAR(LDFLAGS, $(BUILDXLDFLAGS))
-KPSE_CROSS_BUILD_VAR(CCLD, $(BUILDCC))
-
-# And supporting programs we need to have available on the build
-# machine.
-KPSE_CROSS_PATH_PROG(TANGLEBOOT, tangle, ./tangleboot)
-KPSE_CROSS_PATH_PROG(TANGLE, tangle, ./tangle)
-KPSE_CROSS_PATH_PROG(CTANGLEBOOT, ctangle, ./ctangleboot)
-KPSE_CROSS_PATH_PROG(CTANGLE, ctangle, ./ctangle)
-KPSE_CROSS_PATH_PROG(TIE, tie, ./tie)
-if test "x$with_omega" = xyes || test "x$with_aleph" = xyes || test "x$with_xetex" = xyes; then
-KPSE_CROSS_PATH_PROG(OTANGLE, otangle, ./otangle)
-fi
-
-AH_TOP([/* c-auto.h: defines for web2c, as determined by configure.
-
-   Copyright 1994-97, 2008 Karl Berry.
-   Copyright 1997-99, 2002, 2005 Olaf Weber.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* Guard against double inclusion. */
-#ifndef WEB2C_C_AUTO_H
-#define WEB2C_C_AUTO_H
-
-/* web2c: the version string. */
-#define WEB2CVERSION "REPLACE-WITH-WEB2CVERSION"])
-AH_BOTTOM([#endif /* !WEB2C_C_AUTO_H */])
-
-dnl Generate `Makefile's, `config.status', and our header file.
-KPSE_CONFIG_FILES([Makefile doc/Makefile lib/Makefile man/Makefile mpware/Makefile 
-          mpdir/Makefile web2c/Makefile window/Makefile])
-AC_OUTPUT