diff --git a/README b/README
index 5028a3ebb89f3ce75f5dc33ebdb62f27164fde2d..c165eb3822441a0bfb914277d6105ec5ec7aacdb 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-$Id: README 60982 2021-11-07 00:26:08Z karl $
+Id: README 62297 2022-02-28 22:13:17Z karl $
 Public domain.  Originally written 2005 by Karl Berry.
 
 For a high-level overview of building TeX Live, see
@@ -34,15 +34,17 @@ aarch64-linux:
 
 armhf-linux:
   Raspbian/Raspberry Pi OS (Debian Buster)
-  gcc (Raspbian 8.3.0-6+rpi1) 8.3.0
+  gcc version 10.2.1 20210110 (Raspbian 10.2.1-6+rpi1)
   ./Build --enable-xindy CLISP=${BUILD_ROOT_DIR}/clisp/clisp-build/clisp}
+  armhf-linux binaries are created and tested on RPi;
+  they run on RPi, as well as ARMv7 CPUs, but are untested on non-RPi
+  ARMv6 machines.
 
 i386-cygwin, x86_64-cygwin: gcc-10.2.0, cygwin-3.1.7
   TL_CONFIGURE_ARGS="--enable-xindy --enable-shared CLISP=/path/to/clisp.exe
     LDFLAGS='-Wl,--no-insert-timestamp -Wl,--stack,0x800000'" \
   ./Build
   
-
 i386-freebsd, amd64-freebsd:
   Built on contextgarden, see below.
   FreeBSD 11.4
@@ -50,7 +52,7 @@ i386-freebsd, amd64-freebsd:
 i386-linux: see travis below.
 
 i386-netbsd, amd64-netbsd:
-  NetBSD/amd64 9.1
+  NetBSD/amd64 9.2
   gcc version 7.5.0 (nb4 20200810)
     TL_MAKE=gmake CC=gcc CXX=g++ \
     CFLAGS=-D_NETBSD_SOURCE \
@@ -80,7 +82,7 @@ x86_64-linux,
 x86_64-linuxmusl:
   CentOS 7 Docker image with musl libc 1.1.5, plus gcc10:
     yum -y install centos-release-scl-rh
-    yum -y install devtoolset-10-gcc-c++
+    yum -y install devtoolset-9-gcc-c++
     yum install -y fontconfig-devel libX11-devel libXmu-devel libXaw-devel
   Binaries are taken from the CI testing via github;
   see the source/.github/* files for details on how to build,
diff --git a/source/ChangeLog b/source/ChangeLog
index efe03b854f07c32bc66249e918200d36770ffdbd..eabcf30a910d4ab77afe8edce69e5bb83849850a 100644
--- a/source/ChangeLog
+++ b/source/ChangeLog
@@ -1,3 +1,7 @@
+2022-03-21  Karl Berry  <karl@freefriends.org>
+
+	* tardate.ac (tex_live_tardate): 2020-03-21 for TL'22.
+
 2022-01-18  Karl Berry  <karl@freefriends.org>
 
 	* version.ac: 2022, no more /dev.
diff --git a/source/Makefile.in b/source/Makefile.in
index 099f32e86ef6ad21bf8e3c19b2aefc96df504ba8..37c770e9d2554cebf6b4bfc2427891948087a71d 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -120,25 +120,97 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/tardate.ac \
 	$(top_srcdir)/version.ac \
+	$(top_srcdir)/utils/autosp/ac/withenable.ac \
+	$(top_srcdir)/utils/axodraw2/ac/withenable.ac \
+	$(top_srcdir)/utils/devnag/ac/withenable.ac \
+	$(top_srcdir)/utils/lacheck/ac/withenable.ac \
+	$(top_srcdir)/utils/m-tx/ac/withenable.ac \
+	$(top_srcdir)/utils/pmx/ac/withenable.ac \
+	$(top_srcdir)/utils/ps2eps/ac/withenable.ac \
+	$(top_srcdir)/utils/t1utils/ac/withenable.ac \
+	$(top_srcdir)/utils/texdoctk/ac/withenable.ac \
+	$(top_srcdir)/utils/tpic2pdftex/ac/withenable.ac \
+	$(top_srcdir)/utils/vlna/ac/withenable.ac \
+	$(top_srcdir)/utils/xindy/ac/withenable.ac \
+	$(top_srcdir)/utils/xindy/ac/xindy.ac \
+	$(top_srcdir)/utils/xindy/ac/clisp.ac \
+	$(top_srcdir)/utils/xml2pmx/ac/withenable.ac \
+	$(top_srcdir)/utils/xpdfopen/ac/withenable.ac \
 	$(top_srcdir)/texk/web2c/ac/withenable.ac \
 	$(top_srcdir)/texk/web2c/ac/web2c.ac \
+	$(top_srcdir)/texk/afm2pl/ac/withenable.ac \
+	$(top_srcdir)/texk/bibtex-x/ac/withenable.ac \
+	$(top_srcdir)/texk/bibtex-x/ac/bibtex-x.ac \
+	$(top_srcdir)/texk/chktex/ac/withenable.ac \
+	$(top_srcdir)/texk/cjkutils/ac/withenable.ac \
+	$(top_srcdir)/texk/detex/ac/withenable.ac \
+	$(top_srcdir)/texk/dtl/ac/withenable.ac \
+	$(top_srcdir)/texk/dvi2tty/ac/withenable.ac \
+	$(top_srcdir)/texk/dvidvi/ac/withenable.ac \
+	$(top_srcdir)/texk/dviljk/ac/withenable.ac \
+	$(top_srcdir)/texk/dviout-util/ac/withenable.ac \
+	$(top_srcdir)/texk/dvipdfm-x/ac/withenable.ac \
+	$(top_srcdir)/texk/dvipng/ac/withenable.ac \
+	$(top_srcdir)/texk/dvipng/ac/dvipng.ac \
+	$(top_srcdir)/texk/dvipos/ac/withenable.ac \
+	$(top_srcdir)/texk/dvipsk/ac/withenable.ac \
+	$(top_srcdir)/texk/dvisvgm/ac/withenable.ac \
+	$(top_srcdir)/texk/gregorio/ac/withenable.ac \
+	$(top_srcdir)/texk/gsftopk/ac/withenable.ac \
+	$(top_srcdir)/texk/lcdf-typetools/ac/withenable.ac \
+	$(top_srcdir)/texk/lcdf-typetools/ac/lcdf-typetools.ac \
+	$(top_srcdir)/texk/makeindexk/ac/withenable.ac \
+	$(top_srcdir)/texk/makejvf/ac/withenable.ac \
+	$(top_srcdir)/texk/mendexk/ac/withenable.ac \
+	$(top_srcdir)/texk/musixtnt/ac/withenable.ac \
+	$(top_srcdir)/texk/ps2pk/ac/withenable.ac \
+	$(top_srcdir)/texk/psutils/ac/withenable.ac \
+	$(top_srcdir)/texk/seetexk/ac/withenable.ac \
+	$(top_srcdir)/texk/tex4htk/ac/withenable.ac \
+	$(top_srcdir)/texk/ttf2pk2/ac/withenable.ac \
+	$(top_srcdir)/texk/ttfdump/ac/withenable.ac \
+	$(top_srcdir)/texk/upmendex/ac/withenable.ac \
+	$(top_srcdir)/texk/xdvik/ac/withenable.ac \
+	$(top_srcdir)/texk/xdvik/ac/xdvik.ac \
 	$(top_srcdir)/texk/texlive/ac/withenable.ac \
 	$(top_srcdir)/texk/texlive/ac/texlive.ac \
 	$(top_srcdir)/libs/pplib/ac/withenable.ac \
 	$(top_srcdir)/libs/harfbuzz/ac/withenable.ac \
+	$(top_srcdir)/libs/icu/ac/withenable.ac \
+	$(top_srcdir)/libs/teckit/ac/withenable.ac \
 	$(top_srcdir)/libs/graphite2/ac/withenable.ac \
 	$(top_srcdir)/libs/zziplib/ac/withenable.ac \
+	$(top_srcdir)/libs/xpdf/ac/withenable.ac \
+	$(top_srcdir)/libs/mpfr/ac/withenable.ac \
+	$(top_srcdir)/libs/gmp/ac/withenable.ac \
+	$(top_srcdir)/libs/cairo/ac/withenable.ac \
+	$(top_srcdir)/libs/pixman/ac/withenable.ac \
+	$(top_srcdir)/libs/gd/ac/withenable.ac \
+	$(top_srcdir)/libs/freetype2/ac/withenable.ac \
 	$(top_srcdir)/libs/libpng/ac/withenable.ac \
+	$(top_srcdir)/libs/libpaper/ac/withenable.ac \
 	$(top_srcdir)/libs/luajit/ac/withenable.ac \
 	$(top_srcdir)/libs/lua53/ac/withenable.ac \
 	$(top_srcdir)/libs/zlib/ac/withenable.ac \
+	$(top_srcdir)/texk/ptexenc/ac/withenable.ac \
 	$(top_srcdir)/texk/kpathsea/ac/withenable.ac \
 	$(top_srcdir)/texk/kpathsea/ac/mktex.ac \
 	$(top_srcdir)/texk/kpathsea/ac/kpathsea.ac \
+	$(top_srcdir)/texk/ptexenc/ac/ptexenc.ac \
 	$(top_srcdir)/libs/zlib/ac/zlib.ac \
+	$(top_srcdir)/libs/libpaper/ac/libpaper.ac \
 	$(top_srcdir)/libs/libpng/ac/libpng.ac \
+	$(top_srcdir)/libs/freetype2/ac/freetype2.ac \
+	$(top_srcdir)/libs/gd/ac/gd.ac \
+	$(top_srcdir)/libs/pixman/ac/pixman.ac \
+	$(top_srcdir)/libs/cairo/ac/cairo.ac \
+	$(top_srcdir)/libs/gmp/ac/gmp.ac \
+	$(top_srcdir)/libs/mpfr/ac/mpfr.ac \
+	$(top_srcdir)/libs/xpdf/ac/xpdf.ac \
 	$(top_srcdir)/libs/zziplib/ac/zziplib.ac \
 	$(top_srcdir)/libs/graphite2/ac/graphite2.ac \
+	$(top_srcdir)/libs/teckit/ac/teckit.ac \
+	$(top_srcdir)/libs/icu/ac/icu.ac \
 	$(top_srcdir)/libs/harfbuzz/ac/harfbuzz.ac \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/source/README b/source/README
index 5028a3ebb89f3ce75f5dc33ebdb62f27164fde2d..c165eb3822441a0bfb914277d6105ec5ec7aacdb 100644
--- a/source/README
+++ b/source/README
@@ -1,4 +1,4 @@
-$Id: README 60982 2021-11-07 00:26:08Z karl $
+Id: README 62297 2022-02-28 22:13:17Z karl $
 Public domain.  Originally written 2005 by Karl Berry.
 
 For a high-level overview of building TeX Live, see
@@ -34,15 +34,17 @@ aarch64-linux:
 
 armhf-linux:
   Raspbian/Raspberry Pi OS (Debian Buster)
-  gcc (Raspbian 8.3.0-6+rpi1) 8.3.0
+  gcc version 10.2.1 20210110 (Raspbian 10.2.1-6+rpi1)
   ./Build --enable-xindy CLISP=${BUILD_ROOT_DIR}/clisp/clisp-build/clisp}
+  armhf-linux binaries are created and tested on RPi;
+  they run on RPi, as well as ARMv7 CPUs, but are untested on non-RPi
+  ARMv6 machines.
 
 i386-cygwin, x86_64-cygwin: gcc-10.2.0, cygwin-3.1.7
   TL_CONFIGURE_ARGS="--enable-xindy --enable-shared CLISP=/path/to/clisp.exe
     LDFLAGS='-Wl,--no-insert-timestamp -Wl,--stack,0x800000'" \
   ./Build
   
-
 i386-freebsd, amd64-freebsd:
   Built on contextgarden, see below.
   FreeBSD 11.4
@@ -50,7 +52,7 @@ i386-freebsd, amd64-freebsd:
 i386-linux: see travis below.
 
 i386-netbsd, amd64-netbsd:
-  NetBSD/amd64 9.1
+  NetBSD/amd64 9.2
   gcc version 7.5.0 (nb4 20200810)
     TL_MAKE=gmake CC=gcc CXX=g++ \
     CFLAGS=-D_NETBSD_SOURCE \
@@ -80,7 +82,7 @@ x86_64-linux,
 x86_64-linuxmusl:
   CentOS 7 Docker image with musl libc 1.1.5, plus gcc10:
     yum -y install centos-release-scl-rh
-    yum -y install devtoolset-10-gcc-c++
+    yum -y install devtoolset-9-gcc-c++
     yum install -y fontconfig-devel libX11-devel libXmu-devel libXaw-devel
   Binaries are taken from the CI testing via github;
   see the source/.github/* files for details on how to build,
diff --git a/source/README.1prerequisites b/source/README.1prerequisites
index 98617641b9af58bd5ef4b77ea2ce200b1200f412..845fae627b10038b6687c5304e36d7d6f10d179f 100644
--- a/source/README.1prerequisites
+++ b/source/README.1prerequisites
@@ -6,32 +6,41 @@
 ***************
 
 Overall, building the TeX Live programs, when using all libraries from
-the TL source tree, requires C and C++11 compilers and GNU 'make'.  If
-'make' from your 'PATH' is not GNU make, you can set the 'MAKE'
-environment variable to whatever is necessary.
+the TL source tree, requires C and C++11 compilers, GNU 'make', and
+Python.
 
-   GNU 'make' is required only because of some third-party libraries,
-notably FreeType; all the TL-maintained directories (and
-Automake/Autoconf output in general) work with any reasonable 'make'.
+   * If 'make' from your 'PATH' is not GNU 'make', you can set the
+     'MAKE' environment variable to whatever is necessary.
 
-   A C++11 compiler is similarly required because of the third-party
-library ICU; the program 'dvisvgm' also requires C++11.  It is possible
-to build everything else with older compilers, but you have to remove
-the C++11-dependent sources.  *Note Build one package::.
+     GNU 'make' is required only because of third-party libraries,
+     notably FreeType.  Automake/Autoconf output in general, and the
+     TL-maintained directories, work with any reasonable 'make'.(1)
+
+   * A C++11 compiler is similarly required because of the third-party
+     libraries ICU and HarfBuzz (at least); the program 'dvisvgm' also
+     requires C++11.  It is possible to build what remains with older
+     compilers, but you have to remove the C++11-dependent sources.
+     *Note Build one package::.
+
+   * Python is required by ICU tests.  (If you know how to disable these
+     tests and thus eliminate the requirement, please write.)
 
    A few programs in the tree have additional requirements:
 
 'web2c'
-     requires 'perl' for some tests run by 'make check'.
+     requires 'perl' for some tests run by 'make check'.  Incidentally,
+     the TeX Live installer ('install-tl') and manager ('tlmgr') are
+     also written in Perl, but this does not matter for compiling the
+     sources.
 
 'xdvik'
 'xpdfopen'
-     require X11 headers and libraries, typically in "development"
+     require X11 headers and libraries, typically in devel(opment)
      packages that are not installed by default.
 
 'xetex'
      requires 'fontconfig' (again both headers and library), or, for
-     MacOSX only, the 'ApplicationServices' and 'Cocoa' frameworks.
+     MacOS only, the 'ApplicationServices' and 'Cocoa' frameworks.
 
 'xindy'
      requires GNU 'clisp', 'libsigsegv', and 'libiconv'; additionally,
@@ -60,6 +69,14 @@ expect:
    If you haven't modified any source files, and infrastructure tools
 such as 'autoconf' or 'makeinfo' are still being run, check your
 timestamps--notably, 'use-commit-times' must be set to 'yes' in your
-Subversion configuration (*note Build system tools::).  Barring buggy
-commits, no infrastructure tools are needed to do a normal build.
+Subversion configuration (*note Build system tools::).  No
+infrastructure tools are needed to do a normal build (barring bugs).
+
+   ---------- Footnotes ----------
+
+   (1) There is one exception in TL: the 'tangle-sh' and related rules
+use '$@' to mean the target name, a feature not present in all 'make's.
+This could be alleviated by laborious editing, but since there's no way
+to avoid GNU 'make' for builds of the entire tree, it does not seem
+worth the trouble.
 
diff --git a/source/README.2building b/source/README.2building
index b72be14776191c28e22b0f7d337350907492f6a2..759d8fef53b5cdf3b4870c955a2cb19f380b57e6 100644
--- a/source/README.2building
+++ b/source/README.2building
@@ -42,16 +42,7 @@ These iterations consist of two steps:
 the library and program modules, and finds (should find) nothing to be
 done.
 
-4.2 Build problems
-==================
-
-If configuring or building a module fails, you should first try to find
-and fix the problem.  Failing that, a possible workaround is to remove
-the subdirectory for that module from the build tree (so 'configure'
-won't try to run there, and finally rerun the top level 'make' (or
-'./Build' '--no-clean').
-
-4.3 Build in parallel
+4.2 Build in parallel
 =====================
 
 The TL build system carefully formulates dependencies as well as 'make'
@@ -63,7 +54,7 @@ N>1 or even 'make -j') that can considerably speed up the TL build.
 using a configure cache file, i.e., specifying the 'configure' option
 '-C' (recommended).
 
-4.4 Build distribution
+4.3 Build distribution
 ======================
 
 Running 'make dist' at the top level creates a tarball
@@ -76,7 +67,7 @@ Makefiles, but the result is not a complete or even usable TeX system,
 since all the support files are lacking; *note Installing::.  We do not
 actually distribute any such tarball, and have no plans to do so.
 
-4.5 Build one package
+4.4 Build one package
 =====================
 
 To build one package, the basic idea is to use the 'configure' option
@@ -87,8 +78,8 @@ invoked to build an individual program or library, first building any
 required libraries.
 
    Here is an example from start to finish for working on 'dvipdfm-x'.
-(Unfortunately, this does not suffice for building the TeX engines; see
-the next section.)
+Unfortunately, this does not suffice for building the TeX engines; see
+the next section.
 
      mkdir mydir && cd mydir  # new working directory
 
@@ -106,10 +97,17 @@ the next section.)
      # Do the make:
      make >&outm || echo fail
 
-     # Test:
+     # Run the tests:
      cd texk/dvipdfm-x
      make check
 
+     # Run the new binary in the buil tree, finding support files
+     # in a separate tree for a TeX Live release YYYY
+     # (Bourne shell syntax):
+     TEXMFROOT=/usr/local/texlive/YYYY \
+     TEXMFCNF=$TEXMFROOT/texmf-dist/web2c \
+     ./xdvipdfmx ...
+
    Then you can modify source files in 'mydir/texk/dvipdfm-x' and rerun
 'make' in 'mydir/Work/texk/dvipdfm-x' to rebuild; that build directory
 is where the binary ends up and where you can run a debugger, etc.
@@ -126,10 +124,13 @@ desired; check the output from 'configure --help'.  It is also a good
 idea to run 'make check' after making any changes, to ensure that
 whatever tests have been written still pass.
 
-   Finally, the above retrieves the entire TL source tree (several
-hundred megabytes).  It is natural to ask if this is really necessary.
-Strictly speaking, the answer is no, but it is vastly more convenient to
-do so.  If you cut down the source tree, you must also give additional
+Reducing source download size
+.............................
+
+The above retrieves the entire TL source tree (several hundred
+megabytes).  It is natural to ask if this is really necessary.  Strictly
+speaking, the answer is no, but it is vastly more convenient to do so.
+If you cut down the source tree, you must also give additional
 'configure' flags to individually disable using system versions of
 libraries, or the intricacies of the dependencies (such as 'teckit'
 requiring 'zlib') will have undesired side effects.  For an example of
@@ -137,26 +138,46 @@ this approach, see the 'build-pdftex.sh' script in the 'pdftex'
 development source (details at <http://pdftex.org>), which is indeed
 such a cut-down TL source tree.
 
-   Some libraries and programs require C++11.  If you want to build with
-an older compiler lacking such support, you need to (re)move those
-source directories; specifying '--disable' for them does not suffice,
-unfortunately.  Specifically, before running 'configure':
+GCC used by default
+...................
+
+By default, the 'gcc' compilers will be used if present; otherwise,
+individual packages may use something different.  You can explicitly
+specify the compilers to be used with the environment variables 'CC',
+'CXX', and 'OBJCXX'.
+
+Removing C+11 dependency
+........................
 
-     rm -rf libs/icu libs/graphite2 texk/dvisvgm
+Some libraries and programs require C++11; one such is XeTeX. If you
+want to build with an older compiler lacking such support, you need to
+(re)move those source directories; unfortunately, specifying '--disable'
+for them does not suffice.  It's also necessary to specify
+'--disable-xetex' explicitly.  Specifically, before running 'configure
+--disable-xetex ...':
+
+     rm -rf libs/icu libs/graphite2 texk/dvisvgm texk/web2c/xetexdir
 
    Also, even with '--disable-all-pkgs', dependencies are (currently)
-checked.  For instance, if a (non-MacOSX) system does not have
+checked.  One notable case: if a (non-MacOS) system does not have
 'fontconfig', XeTeX cannot be built (*note Prerequisites::), and
 'configure' will terminate even with '--disable-xetex'.  To proceed
-without such dependencies, specify '--enable-missing' also.  (Patches to
-improve this would be most welcome.)
+without such dependencies, specify '--enable-missing' also.
 
-   By default, the 'gcc' compilers will be used if present; otherwise,
-individual packages may use something different.  You can explicitly
-specify the compilers to be used with the environment variables 'CC',
-'CXX', and 'OBJCXX'.
+   As of 2022, HarfBuzz also requires C++11.  Therefore even more would
+have to be disabled and removed, notably including 'luahbtex', the
+standard engine used for LuaLaTeX.  Removing that would not be
+acceptable for builds intended for distribution; but perhaps for testing
+the above information could still be useful.
+
+   In general, the TL 'configure' will run in all directories.
+Therefore a general workaround for build problems is to remove failing
+directories from the tree, and also specify the relevant '--disable-...'
+option(s).
+
+   Patches to improve all this would be most welcome.
 
-4.6 Build one engine
+4.5 Build one engine
 ====================
 
 Unfortunately, there is one common case where the steps in the preceding
@@ -170,16 +191,20 @@ original TeX:
 
      cd Work        # top build directory
      ../configure --without-x --disable-shared --disable-all-pkgs \
-                  --enable-tex --disable-synctex -C CFLAGS=-g CXXFLAGS=-g
+                  --enable-tex --disable-synctex --disable-xetex \
+                  --enable-missing -C CFLAGS=-g CXXFLAGS=-g
      make
      cd texk/web2c  # cd engine build directory
      make tex       # must specify target
 
    The first 'make' run will configure everything, and even build the
-libraries, even though the packages are disabled.  The source tree can
-be cut down to just what is needed for the given engine (the separate
-pdfTeX and LuaTeX source repositories do this, for example), but see
-caveats in previous section.
+libraries, even though the packages are disabled.
+
+   The source tree can be cut down to just what is needed for the given
+engine (the separate pdfTeX and LuaTeX source repositories do this, for
+example), but see caveats in previous section.  When the
+'--disable-xetex' and '--enable-missing' options are needed is also
+explained in the previous section.
 
    If you want to debug an X-related program or shared library setup, or
 other variants, change the 'configure' options accordingly.  Either
@@ -188,10 +213,31 @@ other variants, change the 'configure' options accordingly.  Either
    Then it is necessary to again specify the target engine ('tex', in
 the above) in the 'make'.
 
-   All this is somewhat unfortunate.  We hope to improve the situation
-in the future.  Patches are welcome.
+   All these complications are rather unfortunate.  Patches are welcome.
+
+Testing one engine
+..................
+
+To run only the tests for a given engine, say 'hitex':
+
+     make -C $ww check SUBDIRS=. TESTS='$(hitex_tests)'
+
+where '$ww' is the web2c build directory, that is,
+'ww=/wherever/Build/source/Work/texk/web2c'.
+
+   It's also possible to run individual tests the same way, using the
+test name exactly as specified in the '.am' file:
+
+     make -C $ww check SUBDIRS=. TESTS=hitexdir/tests/hello.test
+
+   If you get tired of looking at the 'Entering'/'Leaving directory'
+lines, you can add the (GNU) make option '--no-print-dir'.
+
+   You may find it useful to put lengthy incantations like this into a
+trivial shell script with a short name (say, 'hitst').  Then you just
+run 'hitst' and edit the file when necessary to change things around.
 
-4.7 Cross compilation
+4.6 Cross compilation
 =====================
 
 In a cross compilation a "build" system is used to create binaries to be
@@ -209,14 +255,14 @@ canonical host name, but note that this should _not_ be '--host=HOST'
 (*note (autoconf)Hosts and Cross-Compilation::).
 
    In order to build, e.g., 32-bit binaries with 'clang' on a 64-bit
-MacOSX system one could use:
+MacOS system one could use:
 
      TL_BUILD_ENV="CC='clang -arch i386' \
        CXX='clang++ -arch i386' \
        OBJCXX='clang++ -arch i386'" \
        ./Build --build=i386-apple-darwin
 
-4.7.1 Cross configuring
+4.6.1 Cross configuring
 -----------------------
 
 In a standard cross compilation, binaries for the host system cannot
@@ -262,7 +308,7 @@ C and C++ programs required for the build process as configure arguments
      BUILDCXXFLAGS=...
      BUILDLDFLAGS=...
 
-4.7.2 Cross problems
+4.6.2 Cross problems
 --------------------
 
 The fact that binaries for the host system cannot be executed on the
diff --git a/source/README.4layout b/source/README.4layout
index 407c00d98db89b4696c3fff0789baa8d8d426a6b..b623020300960e784c7f4234e4de36d8aace2a4d 100644
--- a/source/README.4layout
+++ b/source/README.4layout
@@ -27,12 +27,12 @@ many extra hassles, so don't do that, tempting as it may be.
 
    Currently the versions we use are:
 
-     autoconf (GNU Autoconf) 2.69
-     automake (GNU automake) 1.16.2
-     bison (GNU Bison) 3.7.4
+     autoconf (GNU Autoconf) 2.71
+     automake (GNU automake) 1.16.5
+     bison (GNU Bison) 3.8.2
      flex 2.6.0
      ltmain.sh (GNU libtool) 2.4.6
-     m4 (GNU M4) 1.4.18
+     m4 (GNU M4) 1.4.19
      makeinfo (GNU texinfo) 6.7
 
    These versions should be used to update the generated files (e.g.,
@@ -409,7 +409,7 @@ modifications documented in 'TLpatches/*', and a wrapper 'configure.ac'
 and 'Makefile.am' that descends into 'xindy-src'.
 
    The 'xindy' build requires a 'make' that supports a 'VPATH' build,
-can handle all targets, and do not refer to '${top_srcdir}' or
+can handle all targets, and does not refer to '${top_srcdir}' or
 '${top_builddir}'.  The fragment 'xindy/ac/withenable.ac' contains
 
      KPSE_ENABLE_PROG([xindy], , [disable])
@@ -453,7 +453,7 @@ This subdirectory contains the sources for 'asy' and 'xasy' but due to
 its complexity and prerequisites (e.g., OpenGL) it is not part of the TL
 build system.  These programs must be built and installed independently,
 but are included on the TL DVD together with their support files.  See
-<https://tug.org/build.html#asymptote>.
+<https://tug.org/texlive/build.html#asymptote>.
 
 6.6 Extending TeX Live
 ======================
@@ -569,13 +569,41 @@ end, also make sure that the whole tree builds from scratch.
    After final success, don't forget to commit.  (Or email the TL
 maintainers with the patch.)
 
-   Caveat: adding a new TeX engine is not completely different, but it's
-not all that similar, either.  In that case, the work is done inside a
-new subdirectory of 'texk/web2c/'.  Many things are common to all the
-engines, other things need to be copied and possibly modified for each
-one, yet others are unique to each.  No general recipe is possible.
+6.6.2 Adding a new engine
+-------------------------
 
-6.6.2 Adding a new generic library module
+Adding a new TeX engine is not completely different from adding a
+program, but it's not all that similar, either.  In this case, the main
+work is done by creating a new subdirectory of 'texk/web2c/' for the
+engine.  The subdirectory is conventionally named ending in 'dir', like
+'pdftexdir' and 'xetexdir', to avoid clashes with executable names.
+
+   The source files for the new engine should be put in this
+'NEWENGINEdir' subdirectory.  Also, a file
+'NEWENGINEdir/am/NEWENGINE.am' (e.g., 'pdftexdir/am/pdftex.am' is needed
+with the Makefile fragment needed to build it.
+
+   The overall 'web2c/Makefile.am' needs to have an 'include' statement
+added to insert that 'NEWENGINE.am' file.
+
+   In 'web2c/ac/web2c.ac', a line needs to be added in the definition of
+the 'kpse_tex_progs' variable to include it in the build.  That line
+specifies whether the new engine is built by default, and the additional
+libraries requires.
+
+   For examples of building engines in CWEB, you can check the existing
+'hitexdir' and 'mplibdir' directories; these are somewhat simpler than
+LuaTeX.  Of course, every engine will have its own unique features and
+requirements, so existing examples will only take you so far.
+
+   Web2c is built as one "package", with each subdirectory's '.am'
+fragment inserted with an Automake 'include'.  This means that, for
+instance, '$(srcdir)' is '.../web2c', not '.../webdir/enginedir'.  It is
+a difficult setup to come to terms with, but the alternative is to
+recurse into each engine subdirectory, and that would be far worse
+(*note (automake)Directories::).
+
+6.6.3 Adding a new generic library module
 -----------------------------------------
 
 A generic library module in a subdirectory 'libs/LIB' must not depend on
@@ -614,7 +642,7 @@ library.  In addition, the definition of the M4 macro
 line:
    'AC_REQUIRE([KPSE_LIB_SYSTEM_FLAGS])'
 
-6.6.3 Adding a new TeX-specific library module
+6.6.4 Adding a new TeX-specific library module
 ----------------------------------------------
 
 A TeX-specific library module in a subdirectory 'texk/LIB' may depend on
diff --git a/source/configure b/source/configure
index 1f9fe2cb8459c2d05838ece09c4822344d35cce5..ea7236224d4bb19d19894db0de677944ebe6ed73 100755
--- a/source/configure
+++ b/source/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for TeX Live 2021-03-23.
+# Generated by GNU Autoconf 2.71 for TeX Live 2022-03-21.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -621,8 +621,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='TeX Live'
 PACKAGE_TARNAME='tex-live'
-PACKAGE_VERSION='2021-03-23'
-PACKAGE_STRING='TeX Live 2021-03-23'
+PACKAGE_VERSION='2022-03-21'
+PACKAGE_STRING='TeX Live 2022-03-21'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1543,7 +1543,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures TeX Live 2021-03-23 to adapt to many kinds of systems.
+\`configure' configures TeX Live 2022-03-21 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1618,7 +1618,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of TeX Live 2021-03-23:";;
+     short | recursive ) echo "Configuration of TeX Live 2022-03-21:";;
    esac
   cat <<\_ACEOF
 
@@ -1928,7 +1928,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-TeX Live configure 2021-03-23
+TeX Live configure 2022-03-21
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2614,7 +2614,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by TeX Live $as_me 2021-03-23, which was
+It was created by TeX Live $as_me 2022-03-21, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -11775,7 +11775,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tex-live'
- VERSION='2021-03-23'
+ VERSION='2022-03-21'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -24320,7 +24320,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by TeX Live $as_me 2021-03-23, which was
+This file was extended by TeX Live $as_me 2022-03-21, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24379,7 +24379,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-TeX Live config.status 2021-03-23
+TeX Live config.status 2022-03-21
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
diff --git a/source/doc/ChangeLog b/source/doc/ChangeLog
index 3432f8878c82486b00c638972d0980599c084645..e63d42f6ebf46796c84f9a87c9f821894d53c252 100644
--- a/source/doc/ChangeLog
+++ b/source/doc/ChangeLog
@@ -1,3 +1,13 @@
+2022-02-19  Karl Berry  <karl@freefriends.org>
+
+	* tlbuild.texi (Prerequisites): C++11 required by HarfBuzz;
+	Python required by ICU tests.
+	(Build problems): move basic idea to "Removing C++11 dependency";
+	not worth its own section.
+	(Build one program): add subsubheadings; mention TEXMFROOT
+	and TEXMFCNF settings to run a program from the build tree.
+	(Build one engine): mention testing hints.
+
 2022-01-11  Karl Berry  <karl@freefriends.org>
 
 	* tlbuild.texi (Prerequisites): mention use of GNU make $@ feature
diff --git a/source/doc/Makefile.in b/source/doc/Makefile.in
index cbb2c3e7446c92141b1dbbbba2af3ccf224e4373..a1c26ce18709d1ac7f563e2456d305594114ab13 100644
--- a/source/doc/Makefile.in
+++ b/source/doc/Makefile.in
@@ -120,25 +120,97 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/tardate.ac \
 	$(top_srcdir)/version.ac \
+	$(top_srcdir)/utils/autosp/ac/withenable.ac \
+	$(top_srcdir)/utils/axodraw2/ac/withenable.ac \
+	$(top_srcdir)/utils/devnag/ac/withenable.ac \
+	$(top_srcdir)/utils/lacheck/ac/withenable.ac \
+	$(top_srcdir)/utils/m-tx/ac/withenable.ac \
+	$(top_srcdir)/utils/pmx/ac/withenable.ac \
+	$(top_srcdir)/utils/ps2eps/ac/withenable.ac \
+	$(top_srcdir)/utils/t1utils/ac/withenable.ac \
+	$(top_srcdir)/utils/texdoctk/ac/withenable.ac \
+	$(top_srcdir)/utils/tpic2pdftex/ac/withenable.ac \
+	$(top_srcdir)/utils/vlna/ac/withenable.ac \
+	$(top_srcdir)/utils/xindy/ac/withenable.ac \
+	$(top_srcdir)/utils/xindy/ac/xindy.ac \
+	$(top_srcdir)/utils/xindy/ac/clisp.ac \
+	$(top_srcdir)/utils/xml2pmx/ac/withenable.ac \
+	$(top_srcdir)/utils/xpdfopen/ac/withenable.ac \
 	$(top_srcdir)/texk/web2c/ac/withenable.ac \
 	$(top_srcdir)/texk/web2c/ac/web2c.ac \
+	$(top_srcdir)/texk/afm2pl/ac/withenable.ac \
+	$(top_srcdir)/texk/bibtex-x/ac/withenable.ac \
+	$(top_srcdir)/texk/bibtex-x/ac/bibtex-x.ac \
+	$(top_srcdir)/texk/chktex/ac/withenable.ac \
+	$(top_srcdir)/texk/cjkutils/ac/withenable.ac \
+	$(top_srcdir)/texk/detex/ac/withenable.ac \
+	$(top_srcdir)/texk/dtl/ac/withenable.ac \
+	$(top_srcdir)/texk/dvi2tty/ac/withenable.ac \
+	$(top_srcdir)/texk/dvidvi/ac/withenable.ac \
+	$(top_srcdir)/texk/dviljk/ac/withenable.ac \
+	$(top_srcdir)/texk/dviout-util/ac/withenable.ac \
+	$(top_srcdir)/texk/dvipdfm-x/ac/withenable.ac \
+	$(top_srcdir)/texk/dvipng/ac/withenable.ac \
+	$(top_srcdir)/texk/dvipng/ac/dvipng.ac \
+	$(top_srcdir)/texk/dvipos/ac/withenable.ac \
+	$(top_srcdir)/texk/dvipsk/ac/withenable.ac \
+	$(top_srcdir)/texk/dvisvgm/ac/withenable.ac \
+	$(top_srcdir)/texk/gregorio/ac/withenable.ac \
+	$(top_srcdir)/texk/gsftopk/ac/withenable.ac \
+	$(top_srcdir)/texk/lcdf-typetools/ac/withenable.ac \
+	$(top_srcdir)/texk/lcdf-typetools/ac/lcdf-typetools.ac \
+	$(top_srcdir)/texk/makeindexk/ac/withenable.ac \
+	$(top_srcdir)/texk/makejvf/ac/withenable.ac \
+	$(top_srcdir)/texk/mendexk/ac/withenable.ac \
+	$(top_srcdir)/texk/musixtnt/ac/withenable.ac \
+	$(top_srcdir)/texk/ps2pk/ac/withenable.ac \
+	$(top_srcdir)/texk/psutils/ac/withenable.ac \
+	$(top_srcdir)/texk/seetexk/ac/withenable.ac \
+	$(top_srcdir)/texk/tex4htk/ac/withenable.ac \
+	$(top_srcdir)/texk/ttf2pk2/ac/withenable.ac \
+	$(top_srcdir)/texk/ttfdump/ac/withenable.ac \
+	$(top_srcdir)/texk/upmendex/ac/withenable.ac \
+	$(top_srcdir)/texk/xdvik/ac/withenable.ac \
+	$(top_srcdir)/texk/xdvik/ac/xdvik.ac \
 	$(top_srcdir)/texk/texlive/ac/withenable.ac \
 	$(top_srcdir)/texk/texlive/ac/texlive.ac \
 	$(top_srcdir)/libs/pplib/ac/withenable.ac \
 	$(top_srcdir)/libs/harfbuzz/ac/withenable.ac \
+	$(top_srcdir)/libs/icu/ac/withenable.ac \
+	$(top_srcdir)/libs/teckit/ac/withenable.ac \
 	$(top_srcdir)/libs/graphite2/ac/withenable.ac \
 	$(top_srcdir)/libs/zziplib/ac/withenable.ac \
+	$(top_srcdir)/libs/xpdf/ac/withenable.ac \
+	$(top_srcdir)/libs/mpfr/ac/withenable.ac \
+	$(top_srcdir)/libs/gmp/ac/withenable.ac \
+	$(top_srcdir)/libs/cairo/ac/withenable.ac \
+	$(top_srcdir)/libs/pixman/ac/withenable.ac \
+	$(top_srcdir)/libs/gd/ac/withenable.ac \
+	$(top_srcdir)/libs/freetype2/ac/withenable.ac \
 	$(top_srcdir)/libs/libpng/ac/withenable.ac \
+	$(top_srcdir)/libs/libpaper/ac/withenable.ac \
 	$(top_srcdir)/libs/luajit/ac/withenable.ac \
 	$(top_srcdir)/libs/lua53/ac/withenable.ac \
 	$(top_srcdir)/libs/zlib/ac/withenable.ac \
+	$(top_srcdir)/texk/ptexenc/ac/withenable.ac \
 	$(top_srcdir)/texk/kpathsea/ac/withenable.ac \
 	$(top_srcdir)/texk/kpathsea/ac/mktex.ac \
 	$(top_srcdir)/texk/kpathsea/ac/kpathsea.ac \
+	$(top_srcdir)/texk/ptexenc/ac/ptexenc.ac \
 	$(top_srcdir)/libs/zlib/ac/zlib.ac \
+	$(top_srcdir)/libs/libpaper/ac/libpaper.ac \
 	$(top_srcdir)/libs/libpng/ac/libpng.ac \
+	$(top_srcdir)/libs/freetype2/ac/freetype2.ac \
+	$(top_srcdir)/libs/gd/ac/gd.ac \
+	$(top_srcdir)/libs/pixman/ac/pixman.ac \
+	$(top_srcdir)/libs/cairo/ac/cairo.ac \
+	$(top_srcdir)/libs/gmp/ac/gmp.ac \
+	$(top_srcdir)/libs/mpfr/ac/mpfr.ac \
+	$(top_srcdir)/libs/xpdf/ac/xpdf.ac \
 	$(top_srcdir)/libs/zziplib/ac/zziplib.ac \
 	$(top_srcdir)/libs/graphite2/ac/graphite2.ac \
+	$(top_srcdir)/libs/teckit/ac/teckit.ac \
+	$(top_srcdir)/libs/icu/ac/icu.ac \
 	$(top_srcdir)/libs/harfbuzz/ac/harfbuzz.ac \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/source/doc/tlbuild-incl/install-tl.texi b/source/doc/tlbuild-incl/install-tl.texi
index 1437b31ad0a765e0953d3cc9234fd9ba4dd9f6d9..957f361ec5512ea5ee1ff1886b3126ed07c4ab8d 100644
--- a/source/doc/tlbuild-incl/install-tl.texi
+++ b/source/doc/tlbuild-incl/install-tl.texi
@@ -24,8 +24,6 @@ install-tl [@emph{option}]...
 
 install-tl-windows.bat [@emph{option}]...
 
-install-tl-advanced.bat [@emph{option}]...
-
 @node install-tl DESCRIPTION
 @appendixsec DESCRIPTION
 
@@ -172,6 +170,12 @@ For more information on custom binaries, see
 @url{https://tug.org/texlive/custom-bin.html}.  For general information on
 building TeX Live, see @url{https://tug.org/texlive/build.html}.
 
+@item @strong{-debug-fakenet}
+@anchor{install-tl @strong{-debug-fakenet}}
+
+Pretend we're doing a network install, for the sole purpose of testing
+broken downloads via moving package files aside in a tlnet mirror.
+
 @item @strong{-debug-translation}
 @anchor{install-tl @strong{-debug-translation}}
 
@@ -515,9 +519,6 @@ Set the default paper size for all relevant programs; must be either
 @item @code{TEXLIVE_INSTALL_PREFIX}
 @anchor{install-tl @code{TEXLIVE_INSTALL_PREFIX}}
 
-@item @code{TEXLIVE_INSTALL_TEXDIR}
-@anchor{install-tl @code{TEXLIVE_INSTALL_TEXDIR}}
-
 @item @code{TEXLIVE_INSTALL_TEXMFCONFIG}
 @anchor{install-tl @code{TEXLIVE_INSTALL_TEXMFCONFIG}}
 
@@ -536,12 +537,14 @@ Set the default paper size for all relevant programs; must be either
 @item @code{TEXLIVE_INSTALL_TEXMFSYSVAR}
 @anchor{install-tl @code{TEXLIVE_INSTALL_TEXMFSYSVAR}}
 
-Specify the respective directories.  @code{TEXLIVE_INSTALL_PREFIX} defaults
-to @code{/usr/local/texlive}, while @code{TEXLIVE_INSTALL_TEXDIR} defaults to
-the release directory within that prefix, e.g.,
-@code{/usr/local/texlive/2016}.  All the defaults can be seen by running the
+Specify the respective directories. @code{TEXLIVE_INSTALL_PREFIX} defaults
+to @code{/usr/local/texlive}. All the defaults can be seen by running the
 installer interactively and then typing @code{D} for the directory menu.
 
+To override the so-called @code{TEXDIR}, which defaults to the release
+directory within that prefix, e.g., @code{/usr/local/texlive/2020}, use a
+profile file (q.v.).
+
 @item @code{NOPERLDOC}
 @anchor{install-tl @code{NOPERLDOC}}
 
@@ -556,5 +559,5 @@ This script and its documentation were written for the TeX Live
 distribution (@url{https://tug.org/texlive}) and both are licensed under the
 GNU General Public License Version 2 or later.
 
-$Id: install-tl 58938 2021-04-21 21:26:24Z karl $
+$Id: install-tl 62146 2022-02-22 22:48:10Z karl $
 
diff --git a/source/doc/tlbuild-incl/tlmgr.texi b/source/doc/tlbuild-incl/tlmgr.texi
index 7a3169115785416239ce3ee6a5646c3da1a2ff75..f1a4403831f9003419be3096a76627d61d508d3a 100644
--- a/source/doc/tlbuild-incl/tlmgr.texi
+++ b/source/doc/tlbuild-incl/tlmgr.texi
@@ -839,8 +839,8 @@ is available in a remote repository using
 @item @strong{--data @code{item1,item2,...}}
 @anchor{tlmgr @strong{--data @code{item1@comma{}item2@comma{}...}}}
 
-If the option @code{--data} is given, its argument must be a comma separated
-list of field names from: @code{name}, @code{category}, @code{localrev},
+If the option @code{--data} is given, its argument must be a comma or colon 
+separated list of field names from: @code{name}, @code{category}, @code{localrev},
 @code{remoterev}, @code{shortdesc}, @code{longdesc}, @code{installed}, @code{size},
 @code{relocatable}, @code{depends}, @code{cat-version}, @code{cat-date}, @code{cat-license},
 plus various @code{cat-contact-*} fields (see below).
@@ -1386,9 +1386,10 @@ written to the terminal.
 
 @end table
 
-This action does not automatically remove symlinks to executables from
-system directories; you need to run @code{tlmgr path remove} (@ref{tlmgr path,, path})
-yourself if you are using this feature and want stale symlinks removed.
+Except with @code{--all}, this @code{remove} action does not automatically
+remove symlinks to executables from system directories; you need to run
+@code{tlmgr path remove} (@ref{tlmgr path,, path}) yourself if you remove an individual
+package with a symlink in a system directory.
 
 @node tlmgr repository
 @appendixsubsec repository
@@ -1902,62 +1903,56 @@ where the spaces are optional but the @code{=} is required.
 The allowed keys are:
 
 @table @asis
-@item @code{auto-remove}, value 0 or 1 (default 1), same as command-line option.
-@anchor{tlmgr @code{auto-remove}@comma{} value 0 or 1 (default 1)@comma{} same as command-line option.}
+@item @code{auto-remove =} 0 or 1 (default 1), same as command-line option.
+@anchor{tlmgr @code{auto-remove =} 0 or 1 (default 1)@comma{} same as command-line option.}
 
-@item @code{gui-expertmode}, value 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.
-@anchor{tlmgr @code{gui-expertmode}@comma{} value 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.}
+@item @code{gui-expertmode =} 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.
+@anchor{tlmgr @code{gui-expertmode =} 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.}
 
-@item @code{gui-lang} @emph{llcode}, with a language code value as with the command-line option.
-@anchor{tlmgr @code{gui-lang} @emph{llcode}@comma{} with a language code value as with the command-line option.}
+@item @code{gui-lang =} @emph{llcode}, with a language code value as with the command-line option.
+@anchor{tlmgr @code{gui-lang =} @emph{llcode}@comma{} with a language code value as with the command-line option.}
 
-@item @code{no-checksums}, value 0 or 1 (default 0, see below).
-@anchor{tlmgr @code{no-checksums}@comma{} value 0 or 1 (default 0@comma{} see below).}
+@item @code{no-checksums =} 0 or 1 (default 0, see below).
+@anchor{tlmgr @code{no-checksums =} 0 or 1 (default 0@comma{} see below).}
 
-@item @code{persistent-downloads}, value 0 or 1 (default 1), same as command-line option.
-@anchor{tlmgr @code{persistent-downloads}@comma{} value 0 or 1 (default 1)@comma{} same as command-line option.}
+@item @code{persistent-downloads =} 0 or 1 (default 1), same as command-line option.
+@anchor{tlmgr @code{persistent-downloads =} 0 or 1 (default 1)@comma{} same as command-line option.}
 
-@item @code{require-verification}, value 0 or 1 (default 0), same as command-line option.
-@anchor{tlmgr @code{require-verification}@comma{} value 0 or 1 (default 0)@comma{} same as command-line option.}
+@item @code{require-verification =} 0 or 1 (default 0), same as command-line option.
+@anchor{tlmgr @code{require-verification =} 0 or 1 (default 0)@comma{} same as command-line option.}
 
-@item @code{tkfontscale}, value any float. Controls the scaling of fonts in the Tk based frontends.
-@anchor{tlmgr @code{tkfontscale}@comma{} value any float. Controls the scaling of fonts in the Tk based frontends.}
+@item @code{tkfontscale =} @emph{floating-point number} (default 1.0); scaling factor for fonts in the Tk-based frontends.
+@anchor{tlmgr @code{tkfontscale =} @emph{floating-point number} (default 1.0); scaling factor for fonts in the Tk-based frontends.}
 
-@item @code{update-exclude}, value: comma-separated list of packages (no space allowed). Same as the command line option @code{--exclude} for the action @code{update}.
-@anchor{tlmgr @code{update-exclude}@comma{} value: comma-separated list of packages (no space allowed). Same as the command line option @code{--exclude} for the action @code{update}.}
+@item @code{update-exclude =} @emph{comma-separated list of packages} (no spaces allowed). Same as the command line option @code{--exclude} for the @code{update} action.
+@anchor{tlmgr @code{update-exclude =} @emph{comma-separated list of packages} (no spaces allowed). Same as the command line option @code{--exclude} for the @code{update} action.}
 
-@item @code{verify-downloads}, value 0 or 1 (default 1), same as command-line option.
-@anchor{tlmgr @code{verify-downloads}@comma{} value 0 or 1 (default 1)@comma{} same as command-line option.}
+@item @code{verify-downloads =} 0 or 1 (default 1), same as command-line option.
+@anchor{tlmgr @code{verify-downloads =} 0 or 1 (default 1)@comma{} same as command-line option.}
 
 @end table
 
 The system-wide config file can contain one additional key:
 
 @table @asis
-@item @code{allowed-actions} @emph{action1} [,@emph{action},...] The value is a comma-separated list of @code{tlmgr} actions which are allowed to be executed when @code{tlmgr} is invoked in system mode (that is, without @code{--usermode}).
-@anchor{tlmgr @code{allowed-actions} @emph{action1} [@comma{}@emph{action}@comma{}...] The value is a comma-separated list of @code{tlmgr} actions which are allowed to be executed when @code{tlmgr} is invoked in system mode (that is@comma{} without @code{--usermode}).}
-
-This allows distributors to include the @code{tlmgr} in their packaging, but
-allow only a restricted set of actions that do not interfere with their
-distro package manager.  For native TeX Live installations, it doesn't
-make sense to set this.
+@item @code{allowed-actions =} @emph{action1}[,@emph{action2},...] The value is a comma-separated list (no spaces) of @code{tlmgr} actions which are allowed to be executed when @code{tlmgr} is invoked in system mode (that is, without @code{--usermode}). This allows distributors to include @code{tlmgr} in their packaging, but allow only a restricted set of actions that do not interfere with their distro package manager. For native TeX Live installations, it doesn't make sense to set this.
+@anchor{tlmgr @code{allowed-actions =} @emph{action1}[@comma{}@emph{action2}@comma{}...] The value is a comma-separated list (no spaces) of @code{tlmgr} actions which are allowed to be executed when @code{tlmgr} is invoked in system mode (that is@comma{} without @code{--usermode}). This allows distributors to include @code{tlmgr} in their packaging@comma{} but allow only a restricted set of actions that do not interfere with their distro package manager. For native TeX Live installations@comma{} it doesn't make sense to set this.}
 
 @end table
 
-The @code{no-checksums} key needs more explanation.  By default, package
-checksums computed and stored on the server (in the TLPDB) are compared
-to checksums computed locally after downloading.  @code{no-checksums}
-disables this process.
-
-The checksum algorithm is SHA-512.  Your system must have one of (looked
-for in this order) the Perl @code{Digest::SHA} module, the @code{openssl}
-program (@url{https://openssl.org}), the @code{sha512sum} program (from GNU
-Coreutils, @url{https://www.gnu.org/software/coreutils}), or finally the
-@code{shasum} program (just to support old Macs).  If none of these are
-available, a warning is issued and @code{tlmgr} proceeds without checking
-checksums.  (Incidentally, other SHA implementations, such as the pure
-Perl and pure Lua modules, are much too slow to be usable in our
-context.)  @code{no-checksums} avoids the warning.
+Finally, the @code{no-checksums} key needs more explanation. By default,
+package checksums computed and stored on the server (in the TLPDB) are
+compared to checksums computed locally after downloading.
+@code{no-checksums} disables this process. The checksum algorithm is
+SHA-512. Your system must have one of (looked for in this order) the
+Perl @code{Digest::SHA} module, the @code{openssl} program
+(@url{https://openssl.org}), the @code{sha512sum} program (from GNU Coreutils,
+@url{https://www.gnu.org/software/coreutils}), or finally the @code{shasum}
+program (just to support old Macs). If none of these are available, a
+warning is issued and @code{tlmgr} proceeds without checking checksums.
+@code{no-checksums} avoids the warning. (Incidentally, other SHA
+implementations, such as the pure Perl and pure Lua modules, are much
+too slow to be usable in our context.)
 
 @node tlmgr CRYPTOGRAPHIC VERIFICATION
 @appendixsec CRYPTOGRAPHIC VERIFICATION
@@ -2108,7 +2103,6 @@ just as in normal mode.
 
 In user mode, these actions operate only on the user tree's
 configuration files and/or @code{texlive.tlpdb}.
-creates configuration files in user tree
 
 @node tlmgr MULTIPLE REPOSITORIES
 @appendixsec MULTIPLE REPOSITORIES
@@ -2764,5 +2758,5 @@ This script and its documentation were written for the TeX Live
 distribution (@url{https://tug.org/texlive}) and both are licensed under the
 GNU General Public License Version 2 or later.
 
-$Id: tlmgr.pl 58938 2021-04-21 21:26:24Z karl $
+$Id: tlmgr.pl 62273 2022-02-28 08:52:17Z preining $
 
diff --git a/source/doc/tlbuild.info b/source/doc/tlbuild.info
index 77414ff945f95ccb006443ff8d32b384f02143a6..907ec4bf2469133c384caab7e3647a7081d7d504 100644
--- a/source/doc/tlbuild.info
+++ b/source/doc/tlbuild.info
@@ -33,7 +33,7 @@ END-INFO-DIR-ENTRY
 
 File: tlbuild.info,  Node: Top,  Next: Introduction,  Up: (dir)
 
-Building TeX Live (2021)
+Building TeX Live (2022)
 ************************
 
 For an overview of this manual, *note Introduction::.
@@ -59,8 +59,7 @@ File: tlbuild.info,  Node: Introduction,  Next: Overview of build system,  Prev:
 1 Introduction
 **************
 
-This manual (dated January 2022) corresponds to the TeX Live 2021
-release.
+This manual (dated March 2022) corresponds to the TeX Live 2022 release.
 
    This manual is aimed at system installers and programmers, and
 focuses on how to configure, build, and develop the TeX Live (TL)
@@ -159,32 +158,41 @@ File: tlbuild.info,  Node: Prerequisites,  Next: Building,  Prev: Overview of bu
 ***************
 
 Overall, building the TeX Live programs, when using all libraries from
-the TL source tree, requires C and C++11 compilers and GNU 'make'.  If
-'make' from your 'PATH' is not GNU 'make,' you can set the 'MAKE'
-environment variable to whatever is necessary.
+the TL source tree, requires C and C++11 compilers, GNU 'make', and
+Python.
 
-   GNU 'make' is required only because of some third-party libraries,
-notably FreeType; Automake/Autoconf output in general, and the
-TL-maintained directories, work with any reasonable 'make'.(1)
+   * If 'make' from your 'PATH' is not GNU 'make', you can set the
+     'MAKE' environment variable to whatever is necessary.
 
-   A C++11 compiler is similarly required because of the third-party
-library ICU; the program 'dvisvgm' also requires C++11.  It is possible
-to build everything else with older compilers, but you have to remove
-the C++11-dependent sources.  *Note Build one package::.
+     GNU 'make' is required only because of third-party libraries,
+     notably FreeType.  Automake/Autoconf output in general, and the
+     TL-maintained directories, work with any reasonable 'make'.(1)
+
+   * A C++11 compiler is similarly required because of the third-party
+     libraries ICU and HarfBuzz (at least); the program 'dvisvgm' also
+     requires C++11.  It is possible to build what remains with older
+     compilers, but you have to remove the C++11-dependent sources.
+     *Note Build one package::.
+
+   * Python is required by ICU tests.  (If you know how to disable these
+     tests and thus eliminate the requirement, please write.)
 
    A few programs in the tree have additional requirements:
 
 'web2c'
-     requires 'perl' for some tests run by 'make check'.
+     requires 'perl' for some tests run by 'make check'.  Incidentally,
+     the TeX Live installer ('install-tl') and manager ('tlmgr') are
+     also written in Perl, but this does not matter for compiling the
+     sources.
 
 'xdvik'
 'xpdfopen'
-     require X11 headers and libraries, typically in "development"
+     require X11 headers and libraries, typically in devel(opment)
      packages that are not installed by default.
 
 'xetex'
      requires 'fontconfig' (again both headers and library), or, for
-     MacOSX only, the 'ApplicationServices' and 'Cocoa' frameworks.
+     MacOS only, the 'ApplicationServices' and 'Cocoa' frameworks.
 
 'xindy'
      requires GNU 'clisp', 'libsigsegv', and 'libiconv'; additionally,
@@ -213,16 +221,16 @@ expect:
    If you haven't modified any source files, and infrastructure tools
 such as 'autoconf' or 'makeinfo' are still being run, check your
 timestamps--notably, 'use-commit-times' must be set to 'yes' in your
-Subversion configuration (*note Build system tools::).  Barring buggy
-commits, no infrastructure tools are needed to do a normal build.
+Subversion configuration (*note Build system tools::).  No
+infrastructure tools are needed to do a normal build (barring bugs).
 
    ---------- Footnotes ----------
 
    (1) There is one exception in TL: the 'tangle-sh' and related rules
 use '$@' to mean the target name, a feature not present in all 'make's.
-This could be alleviated by some laborious editing, but since there's no
-way to avoid GNU 'make' for the entire tree, it does not seem worth the
-trouble.
+This could be alleviated by laborious editing, but since there's no way
+to avoid GNU 'make' for builds of the entire tree, it does not seem
+worth the trouble.
 
 
 File: tlbuild.info,  Node: Building,  Next: Installing,  Prev: Prerequisites,  Up: Top
@@ -248,7 +256,6 @@ the source directory itself is not supported (sorry).
 * Menu:
 
 * Build iteration::     What 'configure' and 'make' do in TL.
-* Build problems::      If the build fails.
 * Build in parallel::   Simultaneous 'make' processes.
 * Build distribution::  Making a distribution tarball.
 * Build one package::   Example of working on just one program.
@@ -256,7 +263,7 @@ the source directory itself is not supported (sorry).
 * Cross compilation::   Building on host X for target Y.
 
 
-File: tlbuild.info,  Node: Build iteration,  Next: Build problems,  Up: Building
+File: tlbuild.info,  Node: Build iteration,  Next: Build in parallel,  Up: Building
 
 4.1 Build iteration
 ===================
@@ -281,21 +288,9 @@ the library and program modules, and finds (should find) nothing to be
 done.
 
 
-File: tlbuild.info,  Node: Build problems,  Next: Build in parallel,  Prev: Build iteration,  Up: Building
-
-4.2 Build problems
-==================
-
-If configuring or building a module fails, you should first try to find
-and fix the problem.  Failing that, a possible workaround is to remove
-the subdirectory for that module from the build tree (so 'configure'
-won't try to run there, and finally rerun the top level 'make' (or
-'./Build' '--no-clean').
-
-
-File: tlbuild.info,  Node: Build in parallel,  Next: Build distribution,  Prev: Build problems,  Up: Building
+File: tlbuild.info,  Node: Build in parallel,  Next: Build distribution,  Prev: Build iteration,  Up: Building
 
-4.3 Build in parallel
+4.2 Build in parallel
 =====================
 
 The TL build system carefully formulates dependencies as well as 'make'
@@ -310,7 +305,7 @@ using a configure cache file, i.e., specifying the 'configure' option
 
 File: tlbuild.info,  Node: Build distribution,  Next: Build one package,  Prev: Build in parallel,  Up: Building
 
-4.4 Build distribution
+4.3 Build distribution
 ======================
 
 Running 'make dist' at the top level creates a tarball
@@ -326,7 +321,7 @@ actually distribute any such tarball, and have no plans to do so.
 
 File: tlbuild.info,  Node: Build one package,  Next: Build one engine,  Prev: Build distribution,  Up: Building
 
-4.5 Build one package
+4.4 Build one package
 =====================
 
 To build one package, the basic idea is to use the 'configure' option
@@ -337,8 +332,8 @@ invoked to build an individual program or library, first building any
 required libraries.
 
    Here is an example from start to finish for working on 'dvipdfm-x'.
-(Unfortunately, this does not suffice for building the TeX engines; see
-the next section.)
+Unfortunately, this does not suffice for building the TeX engines; see
+the next section.
 
      mkdir mydir && cd mydir  # new working directory
 
@@ -356,10 +351,17 @@ the next section.)
      # Do the make:
      make >&outm || echo fail
 
-     # Test:
+     # Run the tests:
      cd texk/dvipdfm-x
      make check
 
+     # Run the new binary in the buil tree, finding support files
+     # in a separate tree for a TeX Live release YYYY
+     # (Bourne shell syntax):
+     TEXMFROOT=/usr/local/texlive/YYYY \
+     TEXMFCNF=$TEXMFROOT/texmf-dist/web2c \
+     ./xdvipdfmx ...
+
    Then you can modify source files in 'mydir/texk/dvipdfm-x' and rerun
 'make' in 'mydir/Work/texk/dvipdfm-x' to rebuild; that build directory
 is where the binary ends up and where you can run a debugger, etc.
@@ -376,10 +378,13 @@ desired; check the output from 'configure --help'.  It is also a good
 idea to run 'make check' after making any changes, to ensure that
 whatever tests have been written still pass.
 
-   Finally, the above retrieves the entire TL source tree (several
-hundred megabytes).  It is natural to ask if this is really necessary.
-Strictly speaking, the answer is no, but it is vastly more convenient to
-do so.  If you cut down the source tree, you must also give additional
+Reducing source download size
+.............................
+
+The above retrieves the entire TL source tree (several hundred
+megabytes).  It is natural to ask if this is really necessary.  Strictly
+speaking, the answer is no, but it is vastly more convenient to do so.
+If you cut down the source tree, you must also give additional
 'configure' flags to individually disable using system versions of
 libraries, or the intricacies of the dependencies (such as 'teckit'
 requiring 'zlib') will have undesired side effects.  For an example of
@@ -387,7 +392,18 @@ this approach, see the 'build-pdftex.sh' script in the 'pdftex'
 development source (details at <http://pdftex.org>), which is indeed
 such a cut-down TL source tree.
 
-   Some libraries and programs require C++11; one such is XeTeX. If you
+GCC used by default
+...................
+
+By default, the 'gcc' compilers will be used if present; otherwise,
+individual packages may use something different.  You can explicitly
+specify the compilers to be used with the environment variables 'CC',
+'CXX', and 'OBJCXX'.
+
+Removing C+11 dependency
+........................
+
+Some libraries and programs require C++11; one such is XeTeX. If you
 want to build with an older compiler lacking such support, you need to
 (re)move those source directories; unfortunately, specifying '--disable'
 for them does not suffice.  It's also necessary to specify
@@ -397,22 +413,28 @@ for them does not suffice.  It's also necessary to specify
      rm -rf libs/icu libs/graphite2 texk/dvisvgm texk/web2c/xetexdir
 
    Also, even with '--disable-all-pkgs', dependencies are (currently)
-checked.  One notable case: if a (non-MacOSX) system does not have
+checked.  One notable case: if a (non-MacOS) system does not have
 'fontconfig', XeTeX cannot be built (*note Prerequisites::), and
 'configure' will terminate even with '--disable-xetex'.  To proceed
 without such dependencies, specify '--enable-missing' also.
 
-   Patches to improve all this would be most welcome.
+   As of 2022, HarfBuzz also requires C++11.  Therefore even more would
+have to be disabled and removed, notably including 'luahbtex', the
+standard engine used for LuaLaTeX.  Removing that would not be
+acceptable for builds intended for distribution; but perhaps for testing
+the above information could still be useful.
 
-   By default, the 'gcc' compilers will be used if present; otherwise,
-individual packages may use something different.  You can explicitly
-specify the compilers to be used with the environment variables 'CC',
-'CXX', and 'OBJCXX'.
+   In general, the TL 'configure' will run in all directories.
+Therefore a general workaround for build problems is to remove failing
+directories from the tree, and also specify the relevant '--disable-...'
+option(s).
+
+   Patches to improve all this would be most welcome.
 
 
 File: tlbuild.info,  Node: Build one engine,  Next: Cross compilation,  Prev: Build one package,  Up: Building
 
-4.6 Build one engine
+4.5 Build one engine
 ====================
 
 Unfortunately, there is one common case where the steps in the preceding
@@ -448,13 +470,34 @@ other variants, change the 'configure' options accordingly.  Either
    Then it is necessary to again specify the target engine ('tex', in
 the above) in the 'make'.
 
-   All this is somewhat unfortunate.  We hope to improve the situation
-in the future.  Patches are welcome.
+   All these complications are rather unfortunate.  Patches are welcome.
+
+Testing one engine
+..................
+
+To run only the tests for a given engine, say 'hitex':
+
+     make -C $ww check SUBDIRS=. TESTS='$(hitex_tests)'
+
+where '$ww' is the web2c build directory, that is,
+'ww=/wherever/Build/source/Work/texk/web2c'.
+
+   It's also possible to run individual tests the same way, using the
+test name exactly as specified in the '.am' file:
+
+     make -C $ww check SUBDIRS=. TESTS=hitexdir/tests/hello.test
+
+   If you get tired of looking at the 'Entering'/'Leaving directory'
+lines, you can add the (GNU) make option '--no-print-dir'.
+
+   You may find it useful to put lengthy incantations like this into a
+trivial shell script with a short name (say, 'hitst').  Then you just
+run 'hitst' and edit the file when necessary to change things around.
 
 
 File: tlbuild.info,  Node: Cross compilation,  Prev: Build one engine,  Up: Building
 
-4.7 Cross compilation
+4.6 Cross compilation
 =====================
 
 In a cross compilation a "build" system is used to create binaries to be
@@ -472,7 +515,7 @@ canonical host name, but note that this should _not_ be '--host=HOST'
 (*note (autoconf)Hosts and Cross-Compilation::).
 
    In order to build, e.g., 32-bit binaries with 'clang' on a 64-bit
-MacOSX system one could use:
+MacOS system one could use:
 
      TL_BUILD_ENV="CC='clang -arch i386' \
        CXX='clang++ -arch i386' \
@@ -487,7 +530,7 @@ MacOSX system one could use:
 
 File: tlbuild.info,  Node: Cross configuring,  Next: Cross problems,  Up: Cross compilation
 
-4.7.1 Cross configuring
+4.6.1 Cross configuring
 -----------------------
 
 In a standard cross compilation, binaries for the host system cannot
@@ -536,7 +579,7 @@ C and C++ programs required for the build process as configure arguments
 
 File: tlbuild.info,  Node: Cross problems,  Prev: Cross configuring,  Up: Cross compilation
 
-4.7.2 Cross problems
+4.6.2 Cross problems
 --------------------
 
 The fact that binaries for the host system cannot be executed on the
@@ -1275,7 +1318,7 @@ This subdirectory contains the sources for 'asy' and 'xasy' but due to
 its complexity and prerequisites (e.g., OpenGL) it is not part of the TL
 build system.  These programs must be built and installed independently,
 but are included on the TL DVD together with their support files.  See
-<https://tug.org/build.html#asymptote>.
+<https://tug.org/texlive/build.html#asymptote>.
 
 
 File: tlbuild.info,  Node: Extending TeX Live,  Prev: Program modules,  Up: Layout and infrastructure
@@ -2284,8 +2327,6 @@ install-tl [_option_]...
 
    install-tl-windows.bat [_option_]...
 
-   install-tl-advanced.bat [_option_]...
-
 
 File: tlbuild.info,  Node: install-tl DESCRIPTION,  Next: install-tl REFERENCES,  Prev: install-tl SYNOPSIS,  Up: install-tl
 
@@ -2430,6 +2471,12 @@ by either a space or '='.
      <https://tug.org/texlive/custom-bin.html>.  For general information
      on building TeX Live, see <https://tug.org/texlive/build.html>.
 
+*-debug-fakenet*
+
+     Pretend we're doing a network install, for the sole purpose of
+     testing broken downloads via moving package files aside in a tlnet
+     mirror.
+
 *-debug-translation*
 
      In the former Perl/Tk GUI modes, this option reported any missing,
@@ -2741,8 +2788,6 @@ user installations.
 
 'TEXLIVE_INSTALL_PREFIX'
 
-'TEXLIVE_INSTALL_TEXDIR'
-
 'TEXLIVE_INSTALL_TEXMFCONFIG'
 
 'TEXLIVE_INSTALL_TEXMFVAR'
@@ -2756,11 +2801,13 @@ user installations.
 'TEXLIVE_INSTALL_TEXMFSYSVAR'
 
      Specify the respective directories.  'TEXLIVE_INSTALL_PREFIX'
-     defaults to '/usr/local/texlive', while 'TEXLIVE_INSTALL_TEXDIR'
-     defaults to the release directory within that prefix, e.g.,
-     '/usr/local/texlive/2016'.  All the defaults can be seen by running
-     the installer interactively and then typing 'D' for the directory
-     menu.
+     defaults to '/usr/local/texlive'.  All the defaults can be seen by
+     running the installer interactively and then typing 'D' for the
+     directory menu.
+
+     To override the so-called 'TEXDIR', which defaults to the release
+     directory within that prefix, e.g., '/usr/local/texlive/2020', use
+     a profile file (q.v.).
 
 'NOPERLDOC'
 
@@ -2776,7 +2823,7 @@ This script and its documentation were written for the TeX Live
 distribution (<https://tug.org/texlive>) and both are licensed under the
 GNU General Public License Version 2 or later.
 
-   $Id: install-tl 58938 2021-04-21 21:26:24Z karl $
+   $Id: install-tl 62146 2022-02-22 22:48:10Z karl $
 
 
 File: tlbuild.info,  Node: tlmgr,  Next: Index,  Prev: install-tl,  Up: Top
@@ -3565,11 +3612,11 @@ B.6.10 info
      *-data 'item1,item2,...'*
 
           If the option '--data' is given, its argument must be a comma
-          separated list of field names from: 'name', 'category',
-          'localrev', 'remoterev', 'shortdesc', 'longdesc', 'installed',
-          'size', 'relocatable', 'depends', 'cat-version', 'cat-date',
-          'cat-license', plus various 'cat-contact-*' fields (see
-          below).
+          or colon separated list of field names from: 'name',
+          'category', 'localrev', 'remoterev', 'shortdesc', 'longdesc',
+          'installed', 'size', 'relocatable', 'depends', 'cat-version',
+          'cat-date', 'cat-license', plus various 'cat-contact-*' fields
+          (see below).
 
           The 'cat-*' fields all come from the TeX Catalogue
           (<https://ctan.org/pkg/catalogue>).  For each, there are two
@@ -4077,10 +4124,10 @@ package, dependencies are never removed.  Options:
      Nothing is actually removed; instead, the actions to be performed
      are written to the terminal.
 
-   This action does not automatically remove symlinks to executables
-from system directories; you need to run 'tlmgr path remove' (*note
-path: tlmgr path.) yourself if you are using this feature and want stale
-symlinks removed.
+   Except with '--all', this 'remove' action does not automatically
+remove symlinks to executables from system directories; you need to run
+'tlmgr path remove' (*note path: tlmgr path.) yourself if you remove an
+individual package with a symlink in a system directory.
 
 
 File: tlbuild.info,  Node: tlmgr repository,  Next: tlmgr restore,  Prev: tlmgr remove [_option_...] _pkg_...,  Up: tlmgr ACTIONS
@@ -4556,47 +4603,41 @@ ignored.  All other lines must look like:
 
    The allowed keys are:
 
-'auto-remove', value 0 or 1 (default 1), same as command-line option.
+'auto-remove =' 0 or 1 (default 1), same as command-line option.
 
-'gui-expertmode', value 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.
+'gui-expertmode =' 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.
 
-'gui-lang' _llcode_, with a language code value as with the command-line option.
+'gui-lang =' _llcode_, with a language code value as with the command-line option.
 
-'no-checksums', value 0 or 1 (default 0, see below).
+'no-checksums =' 0 or 1 (default 0, see below).
 
-'persistent-downloads', value 0 or 1 (default 1), same as command-line option.
+'persistent-downloads =' 0 or 1 (default 1), same as command-line option.
 
-'require-verification', value 0 or 1 (default 0), same as command-line option.
+'require-verification =' 0 or 1 (default 0), same as command-line option.
 
-'tkfontscale', value any float. Controls the scaling of fonts in the Tk based frontends.
+'tkfontscale =' _floating-point number_ (default 1.0); scaling factor for fonts in the Tk-based frontends.
 
-'update-exclude', value: comma-separated list of packages (no space allowed). Same as the command line option '--exclude' for the action 'update'.
+'update-exclude =' _comma-separated list of packages_ (no spaces allowed). Same as the command line option '--exclude' for the 'update' action.
 
-'verify-downloads', value 0 or 1 (default 1), same as command-line option.
+'verify-downloads =' 0 or 1 (default 1), same as command-line option.
 
    The system-wide config file can contain one additional key:
 
-'allowed-actions' _action1_ [,_action_,...] The value is a comma-separated list of 'tlmgr' actions which are allowed to be executed when 'tlmgr' is invoked in system mode (that is, without '--usermode').
-
-     This allows distributors to include the 'tlmgr' in their packaging,
-     but allow only a restricted set of actions that do not interfere
-     with their distro package manager.  For native TeX Live
-     installations, it doesn't make sense to set this.
-
-   The 'no-checksums' key needs more explanation.  By default, package
-checksums computed and stored on the server (in the TLPDB) are compared
-to checksums computed locally after downloading.  'no-checksums'
-disables this process.
+'allowed-actions =' _action1_[,_action2_,...] The value is a comma-separated list (no spaces) of 'tlmgr' actions which are allowed to be executed when 'tlmgr' is invoked in system mode (that is, without '--usermode'). This allows distributors to include 'tlmgr' in their packaging, but allow only a restricted set of actions that do not interfere with their distro package manager. For native TeX Live installations, it doesn't make sense to set this.
 
-   The checksum algorithm is SHA-512.  Your system must have one of
-(looked for in this order) the Perl 'Digest::SHA' module, the 'openssl'
-program (<https://openssl.org>), the 'sha512sum' program (from GNU
-Coreutils, <https://www.gnu.org/software/coreutils>), or finally the
-'shasum' program (just to support old Macs).  If none of these are
-available, a warning is issued and 'tlmgr' proceeds without checking
-checksums.  (Incidentally, other SHA implementations, such as the pure
-Perl and pure Lua modules, are much too slow to be usable in our
-context.)  'no-checksums' avoids the warning.
+   Finally, the 'no-checksums' key needs more explanation.  By default,
+package checksums computed and stored on the server (in the TLPDB) are
+compared to checksums computed locally after downloading.
+'no-checksums' disables this process.  The checksum algorithm is
+SHA-512.  Your system must have one of (looked for in this order) the
+Perl 'Digest::SHA' module, the 'openssl' program
+(<https://openssl.org>), the 'sha512sum' program (from GNU Coreutils,
+<https://www.gnu.org/software/coreutils>), or finally the 'shasum'
+program (just to support old Macs).  If none of these are available, a
+warning is issued and 'tlmgr' proceeds without checking checksums.
+'no-checksums' avoids the warning.  (Incidentally, other SHA
+implementations, such as the pure Perl and pure Lua modules, are much
+too slow to be usable in our context.)
 
 
 File: tlbuild.info,  Node: tlmgr CRYPTOGRAPHIC VERIFICATION,  Next: tlmgr USER MODE,  Prev: tlmgr CONFIGURATION FILE FOR TLMGR,  Up: tlmgr
@@ -4764,8 +4805,7 @@ B.9.3 User mode generate, option, paper
 ---------------------------------------
 
 In user mode, these actions operate only on the user tree's
-configuration files and/or 'texlive.tlpdb'.  creates configuration files
-in user tree
+configuration files and/or 'texlive.tlpdb'.
 
 
 File: tlbuild.info,  Node: tlmgr MULTIPLE REPOSITORIES,  Next: tlmgr GUI FOR TLMGR,  Prev: tlmgr USER MODE,  Up: tlmgr
@@ -5386,7 +5426,7 @@ This script and its documentation were written for the TeX Live
 distribution (<https://tug.org/texlive>) and both are licensed under the
 GNU General Public License Version 2 or later.
 
-   $Id: tlmgr.pl 58938 2021-04-21 21:26:24Z karl $
+   $Id: tlmgr.pl 62273 2022-02-28 08:52:17Z preining $
 
 
 File: tlbuild.info,  Node: Index,  Prev: tlmgr,  Up: Top
@@ -5397,973 +5437,997 @@ Index
 �[index�]
 * Menu:
 
-* $@ target in normal make rules:        Prerequisites.        (line 11)
+* $@ target in normal make rules:        Prerequisites.       (line  13)
 * --bindir configure option:             --prefix --bindir ....
-                                                               (line  6)
+                                                              (line   6)
 * --bindir configure option <1>:         --enable-multiplatform.
-                                                               (line  6)
-* --build=HOST:                          Cross configuring.    (line  6)
-* --disable-all-packages:                Build one package.    (line  6)
-* --disable-all-pkgs:                    --disable-all-pkgs.   (line  6)
+                                                              (line   6)
+* --build=HOST:                          Cross configuring.   (line   6)
+* --disable-all-packages:                Build one package.   (line   6)
+* --disable-all-pkgs:                    --disable-all-pkgs.  (line   6)
 * --disable-bibtex8:                     Configure options for texk/bibtex-x.
-                                                               (line  9)
+                                                              (line   9)
 * --disable-bibtexu:                     Configure options for texk/bibtex-x.
-                                                               (line 12)
+                                                              (line  12)
 * --disable-dump-share:                  Configure options for texk/web2c.
-                                                               (line 27)
+                                                              (line  27)
 * --disable-dvipdfmx:                    Configure options for texk/dvipdfm-x.
-                                                               (line 12)
+                                                              (line  12)
 * --disable-etex-synctex:                Configure options for texk/web2c.
-                                                               (line 59)
+                                                              (line  59)
 * --disable-ipc:                         Configure options for texk/web2c.
-                                                               (line 31)
-* --disable-largefile:                   --disable-largefile.  (line  6)
+                                                              (line  31)
+* --disable-largefile:                   --disable-largefile. (line   6)
 * --disable-linked-scripts:              Configure options for texk/texlive.
-                                                               (line  6)
+                                                              (line   6)
 * --disable-mf-nowin:                    Configure options for texk/web2c.
-                                                               (line 34)
-* --disable-missing:                     --disable-missing.    (line  6)
+                                                              (line  34)
+* --disable-missing:                     --disable-missing.   (line   6)
 * --disable-native-texlive-build:        --disable-native-texlive-build.
-                                                               (line  6)
+                                                              (line   6)
 * --disable-PROG:                        --enable-PROG --disable-PROG.
-                                                               (line  6)
+                                                              (line   6)
 * --disable-synctex:                     Configure options for texk/web2c.
-                                                               (line 64)
+                                                              (line  64)
 * --disable-tex:                         Configure options for texk/web2c.
-                                                               (line 37)
+                                                              (line  37)
 * --disable-web-progs:                   Configure options for texk/web2c.
-                                                               (line 41)
+                                                              (line  41)
 * --disable-xdvipdfmx:                   Configure options for texk/dvipdfm-x.
-                                                               (line 15)
+                                                              (line  15)
 * --enable-*win for Metafont window support: Configure options for texk/web2c.
-                                                               (line 55)
+                                                              (line  55)
 * --enable-auto-core:                    Configure options for texk/web2c.
-                                                               (line 45)
+                                                              (line  45)
 * --enable-compiler-warnings=LEVEL:      --enable-compiler-warnings=LEVEL.
-                                                               (line  6)
-* --enable-cxx-runtime-hack:             Macros for compilers. (line 29)
+                                                              (line   6)
+* --enable-cxx-runtime-hack:             Macros for compilers.
+                                                              (line  29)
 * --enable-etex:                         Configure options for texk/web2c.
-                                                               (line 37)
+                                                              (line  37)
 * --enable-libtool-hack:                 Configure options for texk/web2c.
-                                                               (line 50)
-* --enable-maintainer-mode:              Build system tools.   (line 28)
+                                                              (line  50)
+* --enable-maintainer-mode:              Build system tools.  (line  28)
 * --enable-maintainer-mode <1>:          --enable-maintainer-mode.
-                                                               (line  6)
-* --enable-missing to ignore dependencies: Build one package.  (line 73)
-* --enable-mktextfm-default:             kpathsea library.     (line 18)
+                                                              (line   6)
+* --enable-missing to ignore dependencies: Build one package. (line  94)
+* --enable-mktextfm-default:             kpathsea library.    (line  18)
 * --enable-multiplatform:                --enable-multiplatform.
-                                                               (line  6)
+                                                              (line   6)
 * --enable-PROG:                         --enable-PROG --disable-PROG.
-                                                               (line  6)
-* --enable-shared:                       --enable-shared.      (line  6)
+                                                              (line   6)
+* --enable-shared:                       --enable-shared.     (line   6)
 * --enable-silent-rules:                 --enable-silent-rules.
-                                                               (line  6)
+                                                              (line   6)
 * --enable-tex-synctex:                  Configure options for texk/web2c.
-                                                               (line 59)
+                                                              (line  59)
 * --enable-texlive-build:                --disable-native-texlive-build.
-                                                               (line 15)
+                                                              (line  15)
 * --enable-xi2-scrolling:                Configure options for texk/xdvik.
-                                                               (line 13)
+                                                              (line  13)
 * --enable-xindy-docs:                   Configure options for utils/xindy.
-                                                               (line 10)
+                                                              (line  10)
 * --enable-xindy-rules:                  Configure options for utils/xindy.
-                                                               (line  6)
-* --host=HOST:                           Cross configuring.    (line  6)
+                                                              (line   6)
+* --host=HOST:                           Cross configuring.   (line   6)
 * --libdir configure option:             --enable-multiplatform.
-                                                               (line  6)
-* --no-clean Build option:               Build problems.       (line  6)
+                                                              (line   6)
+* --no-print-directory GNU make option:  Build one engine.    (line  56)
 * --prefix configure option:             --prefix --bindir ....
-                                                               (line  6)
+                                                              (line   6)
 * --with-banner-add=STR:                 Configure options for texk/web2c.
-                                                               (line  6)
+                                                              (line   6)
 * --with-clisp-runtime=FILENAME:         Configure options for utils/xindy.
-                                                               (line 14)
+                                                              (line  14)
 * --with-editor=CMD:                     Configure options for texk/web2c.
-                                                               (line 11)
+                                                              (line  11)
 * --with-fontconfig-includes=DIR:        Configure options for texk/web2c.
-                                                               (line 16)
+                                                              (line  16)
 * --with-fontconfig-libdir=DIR:          Configure options for texk/web2c.
-                                                               (line 16)
+                                                              (line  16)
 * --with-gs=FILENAME:                    Configure options for texk/xdvik.
-                                                               (line  6)
+                                                              (line   6)
 * --with-LIB-includes=DIR, -libdir:      Library-specific configure options.
-                                                               (line 16)
+                                                              (line  16)
 * --with-libgs-includes, -libdir:        Configure options for texk/dvisvgm.
-                                                               (line 17)
-* --with-system-kpathsea:                kpathsea library.     (line 13)
+                                                              (line  17)
+* --with-system-kpathsea:                kpathsea library.    (line  13)
 * --with-system-LIB:                     Adding a new generic library module.
-                                                               (line 34)
+                                                              (line  34)
 * --with-system-LIB <1>:                 Library-specific configure options.
-                                                               (line  9)
+                                                              (line   9)
 * --with-system-libgs:                   Configure options for texk/dvisvgm.
-                                                               (line  6)
-* --with-xdvi-x-toolkit:                 xdvik package.        (line 21)
+                                                              (line   6)
+* --with-xdvi-x-toolkit:                 xdvik package.       (line  21)
 * --with-xdvi-x-toolkit=KIT:             Configure options for texk/xdvik.
-                                                               (line  9)
+                                                              (line   9)
 * --without-libgs:                       Configure options for texk/dvisvgm.
-                                                               (line 12)
-* --without-ln-s:                        --without-ln-s.       (line  6)
-* --without-x:                           --without-x.          (line  6)
-* -C configure option:                   Build in parallel.    (line 11)
-* -j make option:                        Build in parallel.    (line  6)
+                                                              (line  12)
+* --without-ln-s:                        --without-ln-s.      (line   6)
+* --without-x:                           --without-x.         (line   6)
+* -C configure option:                   Build in parallel.   (line  11)
+* -j make option:                        Build in parallel.   (line   6)
 * ac/withenable.ac:                      Adding a new program module.
-                                                               (line 42)
-* adapting TeX Live for distros:         Distro builds.        (line 54)
-* adding a new engine:                   Adding a new engine.  (line  6)
+                                                              (line  42)
+* adapting TeX Live for distros:         Distro builds.       (line  54)
+* adding a new engine:                   Adding a new engine. (line   6)
 * adding a new generic library:          Adding a new generic library module.
-                                                               (line  6)
+                                                              (line   6)
 * adding a new program:                  Adding a new program module.
-                                                               (line  6)
+                                                              (line   6)
 * adding a new TeX-specific library:     Adding a new TeX-specific library module.
-                                                               (line  6)
-* adding to TeX Live:                    Extending TeX Live.   (line  6)
+                                                              (line   6)
+* adding to TeX Live:                    Extending TeX Live.  (line   6)
 * am/ top-level directory:               Top-level directories.
-                                                               (line 14)
+                                                              (line  14)
 * ANSI C:                                Declarations and definitions.
-                                                               (line  6)
+                                                              (line   6)
 * ApplicationServices Mac framework, required by xetex: Prerequisites.
-                                                               (line 31)
-* asymptote:                             Linked scripts.       (line 23)
-* asymptote <1>:                         asymptote.            (line  6)
+                                                              (line  40)
+* asymptote:                             Linked scripts.      (line  23)
+* asymptote <1>:                         asymptote.           (line   6)
 * Autoconf:                              Overview of build system.
-                                                               (line  6)
-* autoconf macros:                       Autoconf macros.      (line  6)
+                                                              (line   6)
+* autoconf macros:                       Autoconf macros.     (line   6)
 * Automake:                              Overview of build system.
-                                                               (line  6)
+                                                              (line   6)
 * autoreconf, for new program:           Adding a new program module.
-                                                               (line 76)
-* biber:                                 Linked scripts.       (line 23)
+                                                              (line  76)
+* biber:                                 Linked scripts.      (line  23)
 * bibtex-x:                              Configure options for texk/bibtex-x.
-                                                               (line  6)
+                                                              (line   6)
 * bibtex8:                               Configure options for texk/bibtex-x.
-                                                               (line  6)
+                                                              (line   6)
 * bibtexu:                               Configure options for texk/bibtex-x.
-                                                               (line  6)
-* BSD distro:                            Distro builds.        (line  6)
-* build directory, required:             Building.             (line 17)
-* build iteration:                       Build iteration.      (line  6)
-* build on demand:                       Build one package.    (line  6)
-* build one engine:                      Build one engine.     (line  6)
-* build one package:                     Build one package.    (line  6)
-* build problems:                        Build problems.       (line  6)
-* Build script:                          Building.             (line  6)
+                                                              (line   6)
+* BSD distro:                            Distro builds.       (line   6)
+* build directory, required:             Building.            (line  17)
+* build iteration:                       Build iteration.     (line   6)
+* build on demand:                       Build one package.   (line   6)
+* build one engine:                      Build one engine.    (line   6)
+* build one package:                     Build one package.   (line   6)
+* Build script:                          Building.            (line   6)
 * build system, design of:               Overview of build system.
-                                                               (line  6)
+                                                              (line   6)
 * build-aux/ top-level directory:        Top-level directories.
-                                                               (line 30)
-* BUILDCC, BUILDCFLAGS, ...:             Cross configuring.    (line 42)
-* building:                              Building.             (line  6)
-* building a distribution:               Build distribution.   (line  6)
-* building in parallel:                  Build in parallel.    (line  6)
-* C++11, removing dependent sources:     Build one package.    (line 64)
-* C++11, required:                       Prerequisites.        (line 15)
+                                                              (line  30)
+* BUILDCC, BUILDCFLAGS, ...:             Cross configuring.   (line  42)
+* building:                              Building.            (line   6)
+* building a distribution:               Build distribution.  (line   6)
+* building in parallel:                  Build in parallel.   (line   6)
+* C++11, removing dependent sources:     Build one package.   (line  85)
+* C++11, required:                       Prerequisites.       (line  17)
 * C, ANSI, required:                     Declarations and definitions.
-                                                               (line  6)
+                                                              (line   6)
 * C99, avoided:                          Declarations and definitions.
-                                                               (line  6)
-* cache file, for configure:             Build in parallel.    (line 11)
-* cache for configure:                   Build in parallel.    (line  6)
-* callexe.c:                             Macros for Windows.   (line 32)
+                                                              (line   6)
+* cache file, for configure:             Build in parallel.   (line  11)
+* cache for configure:                   Build in parallel.   (line   6)
+* callexe.c:                             Macros for Windows.  (line  32)
 * CC:                                    Variables for configure.
-                                                               (line 10)
-* CC=C-COMPILER:                         Build one package.    (line 81)
-* CC_BUILD:                              Cross problems.       (line 13)
+                                                              (line  10)
+* CC=C-COMPILER:                         Build one package.   (line  77)
+* CC_BUILD:                              Cross problems.      (line  13)
 * ChangeLog:                             Adding a new program module.
-                                                               (line 73)
+                                                              (line  73)
 * chktex:                                Declarations and definitions.
-                                                               (line 18)
+                                                              (line  18)
 * clisp:                                 Variables for configure.
-                                                               (line 18)
+                                                              (line  18)
 * CLISP:                                 Variables for configure.
-                                                               (line 17)
+                                                              (line  17)
 * CLISP <1>:                             Configure options for utils/xindy.
-                                                               (line 14)
-* clisp, required by xindy:              Prerequisites.        (line 35)
-* Cocoa Mac framework, required by xetex: Prerequisites.       (line 31)
-* coding conventions:                    Coding conventions.   (line  6)
-* compilers, C and C++11:                Prerequisites.        (line  6)
+                                                              (line  14)
+* clisp, required by xindy:              Prerequisites.       (line  44)
+* Cocoa Mac framework, required by xetex: Prerequisites.      (line  40)
+* coding conventions:                    Coding conventions.  (line   6)
+* compilers, C and C++11:                Prerequisites.       (line   6)
 * config.guess, config.sub, ...:         Top-level directories.
-                                                               (line 30)
-* configure options:                     Configure options.    (line  6)
+                                                              (line  30)
+* configure options:                     Configure options.   (line   6)
 * configure options, for bibtex-x:       Configure options for texk/bibtex-x.
-                                                               (line  6)
+                                                              (line   6)
 * configure options, for dvipdfm-x:      Configure options for texk/dvipdfm-x.
-                                                               (line  6)
+                                                              (line   6)
 * configure options, for dvisvgm:        Configure options for texk/dvisvgm.
-                                                               (line  6)
+                                                              (line   6)
 * configure options, for kpathsea:       Configure options for kpathsea.
-                                                               (line  6)
+                                                              (line   6)
 * configure options, for texk/texlive:   Configure options for texk/texlive.
-                                                               (line  6)
+                                                              (line   6)
 * configure options, for web2c:          Configure options for texk/web2c.
-                                                               (line  6)
+                                                              (line   6)
 * configure options, for xdvik:          Configure options for texk/xdvik.
-                                                               (line  6)
+                                                              (line   6)
 * configure options, for xindy:          Configure options for utils/xindy.
-                                                               (line  6)
+                                                              (line   6)
 * configure options, global:             Global configure options.
-                                                               (line  6)
+                                                              (line   6)
 * configure options, library-specific:   Library-specific configure options.
-                                                               (line  6)
+                                                              (line   6)
 * configure options, program-specific:   Program-specific configure options.
-                                                               (line  6)
+                                                              (line   6)
+* configure problems, work around by removing: Build one package.
+                                                              (line 106)
 * configure variables:                   Variables for configure.
-                                                               (line  6)
+                                                              (line   6)
 * configure.ac:                          Adding a new program module.
-                                                               (line 45)
-* configuring, for cross compilation:    Cross configuring.    (line  6)
-* const:                                 Const.                (line  6)
+                                                              (line  45)
+* configuring, for cross compilation:    Cross configuring.   (line   6)
+* const:                                 Const.               (line   6)
 * continuous integration:                Continuous integration.
-                                                               (line  6)
-* conventions, coding:                   Coding conventions.   (line  6)
+                                                              (line   6)
+* conventions, coding:                   Coding conventions.  (line   6)
 * CPPFLAGS:                              Variables for configure.
-                                                               (line 12)
-* cross compilation:                     Cross compilation.    (line  6)
-* cross compilation configuring:         Cross configuring.    (line  6)
-* cross compilation problems:            Cross problems.       (line  6)
-* cross compilation, with host binary:   xdvik package.        (line 14)
-* ctangle:                               Cross problems.       (line 26)
+                                                              (line  12)
+* cross compilation:                     Cross compilation.   (line   6)
+* cross compilation configuring:         Cross configuring.   (line   6)
+* cross compilation problems:            Cross problems.      (line   6)
+* cross compilation, with host binary:   xdvik package.       (line  14)
+* ctangle:                               Cross problems.      (line  26)
 * CXX:                                   Variables for configure.
-                                                               (line 11)
-* CXX=C++-COMPILER:                      Build one package.    (line 81)
+                                                              (line  11)
+* CXX=C++-COMPILER:                      Build one package.   (line  77)
 * declarations and definitions, in source code: Declarations and definitions.
-                                                               (line  6)
+                                                              (line   6)
 * declarations before statements, avoiding: Declarations and definitions.
-                                                               (line  6)
-* dependencies, with several output files: Build in parallel.  (line  6)
+                                                              (line   6)
+* dependencies, with several output files: Build in parallel. (line   6)
 * DESTDIR:                               --prefix --bindir ....
-                                                               (line  9)
+                                                              (line   9)
 * directories, for installation:         Installation directories.
-                                                               (line  6)
+                                                              (line   6)
 * directories, top-level:                Top-level directories.
-                                                               (line  6)
-* discards qualifiers warning:           Const.                (line 30)
-* dist and distcheck targets for make:   Build distribution.   (line  6)
-* distribution tarball, making:          Build distribution.   (line  6)
-* distro, building for:                  Distro builds.        (line  6)
+                                                              (line   6)
+* discards qualifiers warning:           Const.               (line  30)
+* dist and distcheck targets for make:   Build distribution.  (line   6)
+* distribution tarball, making:          Build distribution.  (line   6)
+* distro, building for:                  Distro builds.       (line   6)
 * dvipdfm-x:                             Configure options for texk/dvipdfm-x.
-                                                               (line  6)
+                                                              (line   6)
 * dvipdfmx:                              Configure options for texk/dvipdfm-x.
-                                                               (line  6)
+                                                              (line   6)
 * dvisvgm:                               Configure options for texk/dvisvgm.
-                                                               (line  6)
-* engine, adding new:                    Adding a new engine.  (line  6)
-* engine, building one:                  Build one engine.     (line  6)
-* environment variables, for configure:  Configure options.    (line 16)
+                                                              (line   6)
+* dvisvgm, requires C++11:               Prerequisites.       (line  17)
+* engine, adding new:                    Adding a new engine. (line   6)
+* engine, building one:                  Build one engine.    (line   6)
+* environment variables, for configure:  Configure options.   (line  16)
 * exec_prefix:                           --enable-multiplatform.
-                                                               (line  6)
-* extending TeX Live:                    Extending TeX Live.   (line  6)
+                                                              (line   6)
+* extending TeX Live:                    Extending TeX Live.  (line   6)
 * extern functions:                      Declarations and definitions.
-                                                               (line 41)
-* failure to build:                      Build problems.       (line  6)
+                                                              (line  41)
 * flags, macros for library and header:  Macros for library and header flags.
-                                                               (line  6)
-* fontconfig library, required by xetex: Prerequisites.        (line 31)
-* FreeType:                              Prerequisites.        (line 11)
-* freetype cross compiling:              Cross problems.       (line 13)
-* freetype library:                      freetype library.     (line  6)
-* freetype-config:                       freetype library.     (line 13)
+                                                              (line   6)
+* fontconfig library, required by xetex: Prerequisites.       (line  40)
+* freetype cross compiling:              Cross problems.      (line  13)
+* freetype library:                      freetype library.    (line   6)
+* FreeType, requires gmake:              Prerequisites.       (line  13)
+* freetype-config:                       freetype library.    (line  13)
 * freetype-config <1>:                   Variables for configure.
-                                                               (line 24)
+                                                              (line  24)
 * FT2_CONFIG:                            Variables for configure.
-                                                               (line 21)
-* gcc, default compilers:                Build one package.    (line 81)
-* general setup macros:                  General setup macros. (line  6)
+                                                              (line  21)
+* gcc, default compilers:                Build one package.   (line  77)
+* general setup macros:                  General setup macros.
+                                                              (line   6)
 * generic library module, adding:        Adding a new generic library module.
-                                                               (line  6)
+                                                              (line   6)
 * Ghostscript location for Xdvik:        Configure options for texk/xdvik.
-                                                               (line  6)
+                                                              (line   6)
 * git-svn:                               Transfer from Subversion to Github.
-                                                               (line  6)
+                                                              (line   6)
 * global configure options:              Global configure options.
-                                                               (line  6)
-* gmake, required:                       Prerequisites.        (line 11)
-* GNU make, required:                    Prerequisites.        (line 11)
-* GNU tools, needed for building:        Build system tools.   (line  6)
-* GNU/Linux distro:                      Distro builds.        (line  6)
+                                                              (line   6)
+* gmake, required:                       Prerequisites.       (line  13)
+* GNU make, required:                    Prerequisites.       (line  13)
+* GNU tools, needed for building:        Build system tools.  (line   6)
+* GNU/Linux distro:                      Distro builds.       (line   6)
 * Gnulib, used for common files:         Top-level directories.
-                                                               (line 30)
-* ICU cross compiling:                   Cross problems.       (line 20)
+                                                              (line  30)
+* HarfBuzz, requires C++11:              Prerequisites.       (line  17)
+* ICU cross compiling:                   Cross problems.      (line  20)
 * ICU libraries:                         Variables for configure.
-                                                               (line 24)
+                                                              (line  24)
+* ICU, requires C++11:                   Prerequisites.       (line  17)
 * icu-config:                            Variables for configure.
-                                                               (line 24)
+                                                              (line  24)
 * ICU_CONFIG:                            Variables for configure.
-                                                               (line 22)
-* infrastructure, tools needed for:      Build system tools.   (line  6)
+                                                              (line  22)
+* infrastructure, tools needed for:      Build system tools.  (line   6)
 * inst/ top-level directory:             Top-level directories.
-                                                               (line 39)
-* install-tl, TeX Live installer:        Installing.           (line  8)
+                                                              (line  39)
+* install-tl, TeX Live installer:        Installing.          (line   8)
 * installation directories:              Installation directories.
-                                                               (line  6)
-* installing:                            Installing.           (line  6)
+                                                              (line   6)
+* installing:                            Installing.          (line   6)
 * interprocess communication:            Configure options for texk/web2c.
-                                                               (line 31)
-* introduction:                          Introduction.         (line  6)
+                                                              (line  31)
+* introduction:                          Introduction.        (line   6)
 * iteration through sources, by configure and make: Build iteration.
-                                                               (line  6)
-* kpathsea library:                      kpathsea library.     (line  6)
-* kpathsea.ac:                           kpathsea library.     (line 18)
-* kpse-libpng-flags.m4:                  png library.          (line 45)
+                                                              (line   6)
+* kpathsea library:                      kpathsea library.    (line   6)
+* kpathsea.ac:                           kpathsea library.    (line  18)
+* kpse-libpng-flags.m4:                  png library.         (line  45)
 * kpse-pkgs.m4:                          Overview of build system.
-                                                               (line 30)
-* kpse-zlib-flags.m4:                    zlib library.         (line  6)
+                                                              (line  30)
+* kpse-zlib-flags.m4:                    zlib library.        (line   6)
 * kpsewhich:                             Variables for configure.
-                                                               (line 30)
+                                                              (line  30)
 * KPSEWHICH:                             Variables for configure.
-                                                               (line 29)
+                                                              (line  29)
 * KPSE_ADD_FLAGS:                        Macros for library and header flags.
-                                                               (line 20)
+                                                              (line  20)
 * KPSE_ALL_SYSTEM_FLAGS:                 Adding a new generic library module.
-                                                               (line 34)
-* KPSE_BASIC:                            General setup macros. (line  8)
-* KPSE_CHECK_LATEX:                      Macros for programs.  (line  8)
-* KPSE_CHECK_PDFLATEX:                   Macros for programs.  (line 15)
-* KPSE_CHECK_PERL:                       Macros for programs.  (line 18)
-* KPSE_CHECK_WIN32:                      Macros for Windows.   (line  9)
-* KPSE_COMMON:                           General setup macros. (line 16)
-* KPSE_COMPILER_VISIBILITY:              Macros for compilers. (line 18)
-* KPSE_COMPILER_WARNINGS:                Macros for compilers. (line  8)
-* KPSE_COND_MINGW32:                     Macros for Windows.   (line 19)
-* KPSE_COND_WIN32:                       Macros for Windows.   (line 15)
-* KPSE_COND_WIN32_WRAP:                  Macros for Windows.   (line 24)
-* kpse_cv_cxx_hack:                      Macros for compilers. (line 33)
-* kpse_cv_have_win32:                    Macros for Windows.   (line 10)
-* kpse_cv_visibility_c[xx]flags:         Macros for compilers. (line 25)
-* kpse_cv_warning_cflags:                Macros for compilers. (line 15)
-* KPSE_CXX_HACK:                         Macros for compilers. (line 28)
+                                                              (line  34)
+* KPSE_BASIC:                            General setup macros.
+                                                              (line   8)
+* KPSE_CHECK_LATEX:                      Macros for programs. (line   8)
+* KPSE_CHECK_PDFLATEX:                   Macros for programs. (line  15)
+* KPSE_CHECK_PERL:                       Macros for programs. (line  18)
+* KPSE_CHECK_WIN32:                      Macros for Windows.  (line   9)
+* KPSE_COMMON:                           General setup macros.
+                                                              (line  16)
+* KPSE_COMPILER_VISIBILITY:              Macros for compilers.
+                                                              (line  18)
+* KPSE_COMPILER_WARNINGS:                Macros for compilers.
+                                                              (line   8)
+* KPSE_COND_MINGW32:                     Macros for Windows.  (line  19)
+* KPSE_COND_WIN32:                       Macros for Windows.  (line  15)
+* KPSE_COND_WIN32_WRAP:                  Macros for Windows.  (line  24)
+* kpse_cv_cxx_hack:                      Macros for compilers.
+                                                              (line  33)
+* kpse_cv_have_win32:                    Macros for Windows.  (line  10)
+* kpse_cv_visibility_c[xx]flags:         Macros for compilers.
+                                                              (line  25)
+* kpse_cv_warning_cflags:                Macros for compilers.
+                                                              (line  15)
+* KPSE_CXX_HACK:                         Macros for compilers.
+                                                              (line  28)
 * KPSE_ENABLE_PROG:                      Adding a new program module.
-                                                               (line 14)
-* KPSE_LARGEFILE:                        Macros for libraries. (line  8)
+                                                              (line  14)
+* KPSE_LARGEFILE:                        Macros for libraries.
+                                                              (line   8)
 * KPSE_LIBPNG_FLAGS:                     Macros for library and header flags.
-                                                               (line 10)
-* KPSE_LIBPNG_FLAGS <1>:                 png library.          (line 45)
+                                                              (line  10)
+* KPSE_LIBPNG_FLAGS <1>:                 png library.         (line  45)
 * kpse_libs_pkgs:                        Adding a new generic library module.
-                                                               (line  6)
+                                                              (line   6)
 * KPSE_LIB_FLAGS:                        Macros for library and header flags.
-                                                               (line  6)
+                                                              (line   6)
 * KPSE_LIB_FLAGS <1>:                    Adding a new generic library module.
-                                                               (line 26)
+                                                              (line  26)
 * KPSE_LIB_SYSTEM_FLAGS:                 Adding a new generic library module.
-                                                               (line 34)
-* KPSE_PROG_LEX:                         Macros for programs.  (line 21)
+                                                              (line  34)
+* KPSE_PROG_LEX:                         Macros for programs. (line  21)
 * KPSE_RESTORE_FLAGS:                    Macros for library and header flags.
-                                                               (line 24)
+                                                              (line  24)
 * kpse_texk_pkgs:                        Adding a new program module.
-                                                               (line  6)
+                                                              (line   6)
 * kpse_texlibs_pkgs:                     Adding a new TeX-specific library module.
-                                                               (line 11)
-* KPSE_TRY_LIB:                          png library.          (line 17)
+                                                              (line  11)
+* KPSE_TRY_LIB:                          png library.         (line  17)
 * KPSE_TRY_LIB <1>:                      Adding a new generic library module.
-                                                               (line 20)
-* KPSE_TRY_LIBXX:                        png library.          (line 30)
+                                                              (line  20)
+* KPSE_TRY_LIBXX:                        png library.         (line  30)
 * KPSE_TRY_LIBXX <1>:                    Adding a new generic library module.
-                                                               (line 20)
+                                                              (line  20)
 * kpse_utils_pkgs:                       Adding a new program module.
-                                                               (line 10)
-* KPSE_WIN32_CALL:                       Macros for Windows.   (line 31)
+                                                              (line  10)
+* KPSE_WIN32_CALL:                       Macros for Windows.  (line  31)
 * KPSE_WITH_LIB:                         Adding a new generic library module.
-                                                               (line 11)
+                                                              (line  11)
 * KPSE_WITH_TEXLIB:                      Adding a new TeX-specific library module.
-                                                               (line 14)
-* large file support:                    --disable-largefile.  (line  6)
+                                                              (line  14)
+* large file support:                    --disable-largefile. (line   6)
 * LATEX:                                 Variables for configure.
-                                                               (line 40)
+                                                              (line  40)
 * layout of sources:                     Layout and infrastructure.
-                                                               (line  6)
-* LFS (large file support):              --disable-largefile.  (line  6)
+                                                              (line   6)
+* LFS (large file support):              --disable-largefile. (line   6)
 * libexpat, dependency of libfontconfig: Configure options for texk/web2c.
-                                                               (line 50)
+                                                              (line  50)
 * libfontconfig, hack for avoiding linking dependencies: Configure options for texk/web2c.
-                                                               (line 50)
+                                                              (line  50)
 * libfreetype:                           Variables for configure.
-                                                               (line 24)
-* libfreetype, and const:                Const.                (line 21)
-* libpng library:                        png library.          (line  6)
+                                                              (line  24)
+* libfreetype, and const:                Const.               (line  21)
+* libpng library:                        png library.         (line   6)
 * library module, generic, adding:       Adding a new generic library module.
-                                                               (line  6)
+                                                              (line   6)
 * library module, TeX-specific, adding:  Adding a new TeX-specific library module.
-                                                               (line  6)
-* library modules:                       Library modules.      (line  6)
+                                                              (line   6)
+* library modules:                       Library modules.     (line   6)
 * library-specific configure options:    Library-specific configure options.
-                                                               (line  6)
-* libsigsegv, required by xindy:         Prerequisites.        (line 35)
-* libstc++, statically linking:          Macros for compilers. (line 29)
+                                                              (line   6)
+* libsigsegv, required by xindy:         Prerequisites.       (line  44)
+* libstc++, statically linking:          Macros for compilers.
+                                                              (line  29)
 * Libtool:                               Overview of build system.
-                                                               (line  6)
+                                                              (line   6)
 * libtool, hack for avoiding excessive linking: Configure options for texk/web2c.
-                                                               (line 50)
+                                                              (line  50)
 * libXt:                                 Configure options for texk/web2c.
-                                                               (line 22)
-* linked scripts:                        Linked scripts.       (line  6)
-* linking C++ libraries statically:      Macros for compilers. (line 29)
+                                                              (line  22)
+* linked scripts:                        Linked scripts.      (line   6)
+* linking C++ libraries statically:      Macros for compilers.
+                                                              (line  29)
 * lisp.run, lisp.exe:                    Configure options for utils/xindy.
-                                                               (line 14)
+                                                              (line  14)
 * LittleEndian architectures:            Configure options for texk/web2c.
-                                                               (line 27)
+                                                              (line  27)
 * m4/ top-level directory:               Top-level directories.
-                                                               (line 14)
-* macros, for compilers:                 Macros for compilers. (line  6)
-* macros, for libraries:                 Macros for libraries. (line  6)
+                                                              (line  14)
+* macros, for compilers:                 Macros for compilers.
+                                                              (line   6)
+* macros, for libraries:                 Macros for libraries.
+                                                              (line   6)
 * macros, for library and header flags:  Macros for library and header flags.
-                                                               (line  6)
-* macros, for programs:                  Macros for programs.  (line  6)
-* macros, for Windows:                   Macros for Windows.   (line  6)
-* macros, general setup:                 General setup macros. (line  6)
+                                                              (line   6)
+* macros, for programs:                  Macros for programs. (line   6)
+* macros, for Windows:                   Macros for Windows.  (line   6)
+* macros, general setup:                 General setup macros.
+                                                              (line   6)
 * MAKE:                                  Variables for configure.
-                                                               (line 33)
-* make -t:                               Build system tools.   (line 43)
+                                                              (line  33)
+* make -t:                               Build system tools.  (line  43)
 * make rules, verbose vs. silent:        --enable-silent-rules.
-                                                               (line  6)
+                                                              (line   6)
 * Makefile.am:                           Adding a new program module.
-                                                               (line 46)
+                                                              (line  46)
 * mf-nowin:                              Configure options for texk/web2c.
-                                                               (line 34)
-* mingw32:                               Cross configuring.    (line 27)
-* MINGW32, Automake conditional:         Macros for Windows.   (line 20)
-* mktex.ac:                              kpathsea library.     (line 18)
-* mktextfm:                              kpathsea library.     (line 18)
-* modules, for libraries:                Library modules.      (line  6)
-* modules, for programs:                 Program modules.      (line  6)
+                                                              (line  34)
+* mingw32:                               Cross configuring.   (line  27)
+* MINGW32, Automake conditional:         Macros for Windows.  (line  20)
+* mktex.ac:                              kpathsea library.    (line  18)
+* mktextfm:                              kpathsea library.    (line  18)
+* modules, for libraries:                Library modules.     (line   6)
+* modules, for programs:                 Program modules.     (line   6)
 * motif:                                 Configure options for texk/xdvik.
-                                                               (line  9)
-* native cross compilation:              Cross compilation.    (line 10)
+                                                              (line   9)
+* native cross compilation:              Cross compilation.   (line  10)
 * NEWPROG-SRC, original source subdirectory: Adding a new program module.
-                                                               (line 33)
-* OBJCXX=OBJC-COMPILER:                  Build one package.    (line 81)
-* one engine, building:                  Build one engine.     (line  6)
-* one package, building:                 Build one package.    (line  6)
-* OpenGL, required for Asymptote:        asymptote.            (line  6)
-* operating system distribution, building for: Distro builds.  (line  6)
-* otangle:                               Cross problems.       (line 26)
-* overall build process:                 Building.             (line  6)
-* parallel build:                        Build in parallel.    (line  6)
+                                                              (line  33)
+* OBJCXX=OBJC-COMPILER:                  Build one package.   (line  77)
+* one engine, building:                  Build one engine.    (line   6)
+* one package, building:                 Build one package.   (line   6)
+* OpenGL, required for Asymptote:        asymptote.           (line   6)
+* operating system distribution, building for: Distro builds. (line   6)
+* otangle:                               Cross problems.      (line  26)
+* overall build process:                 Building.            (line   6)
+* parallel build:                        Build in parallel.   (line   6)
 * paths, for installation:               Installation directories.
-                                                               (line  6)
-* PDF files, size of:                    --disable-largefile.  (line 11)
+                                                              (line   6)
+* PDF files, size of:                    --disable-largefile. (line  11)
 * PDFLATEX:                              Variables for configure.
-                                                               (line 41)
+                                                              (line  41)
 * PERL:                                  Variables for configure.
-                                                               (line 39)
-* perl, required by web2c, etc.:         Prerequisites.        (line 23)
+                                                              (line  39)
+* perl, required by web2c, etc.:         Prerequisites.       (line  29)
 * PKG_CONFIG:                            Variables for configure.
-                                                               (line 23)
-* plain.tex, not in source tree:         Installing.           (line  8)
-* png library:                           png library.          (line  6)
-* PostScript files, size of:             --disable-largefile.  (line 11)
-* Preining, Norbert:                     Distro builds.        (line 54)
+                                                              (line  23)
+* plain.tex, not in source tree:         Installing.          (line   8)
+* png library:                           png library.         (line   6)
+* PostScript files, size of:             --disable-largefile. (line  11)
+* Preining, Norbert:                     Distro builds.       (line  54)
 * preloaded binaries:                    Configure options for texk/web2c.
-                                                               (line 45)
-* prerequisites for building:            Prerequisites.        (line  6)
-* problems with build:                   Build problems.       (line  6)
+                                                              (line  45)
+* prerequisites for building:            Prerequisites.       (line   6)
 * program module, adding:                Adding a new program module.
-                                                               (line  6)
-* program modules:                       Program modules.      (line  6)
+                                                              (line   6)
+* program modules:                       Program modules.     (line   6)
 * program-specific configure options:    Program-specific configure options.
-                                                               (line  6)
-* proxy build system:                    png library.          (line 35)
-* reautoconf:                            Build system tools.   (line 28)
+                                                              (line   6)
+* proxy build system:                    png library.         (line  35)
+* Python, required by ICU:               Prerequisites.       (line  23)
+* reautoconf:                            Build system tools.  (line  28)
 * reautoconf, for new program:           Adding a new program module.
-                                                               (line 89)
-* requirements for building:             Prerequisites.        (line  6)
-* runscript.exe:                         Macros for Windows.   (line 25)
-* scripts, linked and not maintained:    Linked scripts.       (line  6)
+                                                              (line  89)
+* removing build directories:            Build one package.   (line 106)
+* requirements for building:             Prerequisites.       (line   6)
+* runscript.exe:                         Macros for Windows.  (line  25)
+* scripts, linked and not maintained:    Linked scripts.      (line   6)
 * scrolling, smooth:                     Configure options for texk/xdvik.
-                                                               (line 13)
+                                                              (line  13)
 * SED:                                   Variables for configure.
-                                                               (line 34)
-* setup macros, general:                 General setup macros. (line  6)
-* shared libraries, using vs. avoiding:  Distro builds.        (line 11)
-* size of PDF and PS files:              --disable-largefile.  (line 11)
-* size of source tree:                   Build one package.    (line 53)
+                                                              (line  34)
+* setup macros, general:                 General setup macros.
+                                                              (line   6)
+* shared libraries, using vs. avoiding:  Distro builds.       (line  11)
+* size of PDF and PS files:              --disable-largefile. (line  11)
+* size of source tree:                   Build one package.   (line  63)
 * source code declarations:              Declarations and definitions.
-                                                               (line  6)
-* source directory building, not supported: Building.          (line 17)
+                                                              (line   6)
+* source directory building, not supported: Building.         (line  17)
 * source tree:                           Layout and infrastructure.
-                                                               (line  6)
-* squeeze:                               Cross problems.       (line 13)
-* squeeze/configure.ac:                  xdvik package.        (line 14)
+                                                              (line   6)
+* squeeze:                               Cross problems.      (line  13)
+* squeeze/configure.ac:                  xdvik package.       (line  14)
 * static functions:                      Declarations and definitions.
-                                                               (line 35)
-* static linking for C++:                Macros for compilers. (line 29)
+                                                              (line  35)
+* static linking for C++:                Macros for compilers.
+                                                              (line  29)
 * stpcpy:                                Declarations and definitions.
-                                                               (line 18)
-* Subversion repository:                 Build system tools.   (line 38)
-* support files, separate from build:    Installing.           (line  8)
-* symlinks, used for scripts:            Linked scripts.       (line  6)
+                                                              (line  18)
+* Subversion repository:                 Build system tools.  (line  38)
+* support files, separate from build:    Installing.          (line   8)
+* symlinks, used for scripts:            Linked scripts.      (line   6)
 * synctex:                               Configure options for texk/web2c.
-                                                               (line 59)
+                                                              (line  59)
 * synctex <1>:                           Configure options for texk/web2c.
-                                                               (line 64)
-* system distribution, building for:     Distro builds.        (line  6)
-* t1utils package:                       t1utils package.      (line  6)
-* tangle:                                Cross problems.       (line 26)
+                                                              (line  64)
+* system distribution, building for:     Distro builds.       (line   6)
+* t1utils package:                       t1utils package.     (line   6)
+* tangle:                                Cross problems.      (line  26)
 * tests, running:                        Overview of build system.
-                                                               (line  6)
+                                                              (line   6)
 * TeX-specific library module, adding:   Adding a new TeX-specific library module.
-                                                               (line  6)
-* texlive.tlpdb, TeX Live database:      Installing.           (line  8)
-* tie:                                   Cross problems.       (line 26)
-* timestamps, in repository:             Build system tools.   (line 38)
+                                                              (line   6)
+* texlive.tlpdb, TeX Live database:      Installing.          (line   8)
+* TEXMFCNF for running standalone:       Build one package.   (line  44)
+* TEXMFROOT for running standalone:      Build one package.   (line  44)
+* tie:                                   Cross problems.      (line  26)
+* timestamps, in repository:             Build system tools.  (line  38)
 * TLpatches/patch-...:                   Adding a new program module.
-                                                               (line 68)
+                                                              (line  68)
 * TLpatches/TL-Changes:                  Adding a new program module.
-                                                               (line 64)
-* tools, for building:                   Build system tools.   (line  6)
+                                                              (line  64)
+* tools, for building:                   Build system tools.  (line   6)
 * top-level directories:                 Top-level directories.
-                                                               (line  6)
-* touching files to avoid rerunning:     Build system tools.   (line 43)
+                                                              (line   6)
+* touching files to avoid rerunning:     Build system tools.  (line  43)
 * Travis-CI:                             Continuous integration.
-                                                               (line  6)
+                                                              (line   6)
 * travis.yml:                            CI testing on Travis-CI.
-                                                               (line  6)
-* type cast from const, avoiding:        Const.                (line 38)
-* use-commit-times, Subversion:          Build system tools.   (line 38)
+                                                              (line   6)
+* type cast from const, avoiding:        Const.               (line  38)
+* use-commit-times, Subversion:          Build system tools.  (line  38)
 * variable declarations, in source code: Declarations and definitions.
-                                                               (line 52)
+                                                              (line  52)
 * variables for configure:               Variables for configure.
-                                                               (line  6)
-* warning, discards qualifiers:          Const.                (line 30)
-* WARNING_C[XX]FLAGS:                    Macros for compilers. (line  9)
-* web2c program:                         Cross problems.       (line 13)
+                                                              (line   6)
+* warning, discards qualifiers:          Const.               (line  30)
+* WARNING_C[XX]FLAGS:                    Macros for compilers.
+                                                              (line   9)
+* web2c program:                         Cross problems.      (line  13)
 * web2c.ac:                              Configure options for texk/web2c.
-                                                               (line 37)
-* wget:                                  Linked scripts.       (line 23)
-* WIN32, Automake conditional:           Macros for Windows.   (line 16)
-* WIN32_WRAP, Automake conditional:      Macros for Windows.   (line 25)
-* Windows, invoking scripts on:          Linked scripts.       (line  6)
-* Windows, macros for:                   Macros for Windows.   (line  6)
+                                                              (line  37)
+* wget:                                  Linked scripts.      (line  23)
+* WIN32, Automake conditional:           Macros for Windows.  (line  16)
+* WIN32_WRAP, Automake conditional:      Macros for Windows.  (line  25)
+* Windows, invoking scripts on:          Linked scripts.      (line   6)
+* Windows, macros for:                   Macros for Windows.  (line   6)
 * withenable.ac, for new modules:        Adding a new program module.
-                                                               (line 14)
+                                                              (line  14)
 * Work/ top-level directory:             Top-level directories.
-                                                               (line 39)
-* wrapper binary for scripts on Windows: Linked scripts.       (line  6)
-* wrapper build system:                  freetype library.     (line  6)
+                                                              (line  39)
+* wrapper binary for scripts on Windows: Linked scripts.      (line   6)
+* wrapper build system:                  freetype library.    (line   6)
 * X toolkit:                             Configure options for texk/web2c.
-                                                               (line 22)
-* X11 development, required by X clients: Prerequisites.       (line 27)
-* X11 headers, and const:                Const.                (line 21)
-* xasy:                                  asymptote.            (line  6)
+                                                              (line  22)
+* X11 development, required by X clients: Prerequisites.      (line  36)
+* X11 headers, and const:                Const.               (line  21)
+* xasy:                                  asymptote.           (line   6)
 * xaw:                                   Configure options for texk/xdvik.
-                                                               (line  9)
-* xdvik:                                 xdvik package.        (line  6)
+                                                              (line   9)
+* xdvik:                                 xdvik package.       (line   6)
 * xdvik <1>:                             Configure options for texk/xdvik.
-                                                               (line  6)
+                                                              (line   6)
 * xdvipdfmx:                             Configure options for texk/dvipdfm-x.
-                                                               (line  6)
-* xindy:                                 Linked scripts.       (line 23)
-* xindy <1>:                             xindy package.        (line  6)
+                                                              (line   6)
+* xindy:                                 Linked scripts.      (line  23)
+* xindy <1>:                             xindy package.       (line   6)
 * xindy <2>:                             Configure options for utils/xindy.
-                                                               (line  6)
-* xindy cross compiling requires clisp:  Cross problems.       (line 33)
+                                                              (line   6)
+* xindy cross compiling requires clisp:  Cross problems.      (line  33)
 * XInput:                                Configure options for texk/xdvik.
-                                                               (line 13)
+                                                              (line  13)
 * Xlib:                                  Configure options for texk/web2c.
-                                                               (line 22)
-* xz:                                    Linked scripts.       (line 23)
-* zlib library:                          zlib library.         (line  6)
+                                                              (line  22)
+* xz:                                    Linked scripts.      (line  23)
+* zlib library:                          zlib library.        (line   6)
 
 
 
 Tag Table:
 Node: Top1208
 Node: Introduction2118
-Node: Overview of build system3945
-Node: Prerequisites5996
-Ref: Prerequisites-Footnote-18629
-Node: Building8927
-Node: Build iteration10313
-Node: Build problems11354
-Node: Build in parallel11808
-Node: Build distribution12412
-Node: Build one package13060
-Node: Build one engine16834
-Node: Cross compilation18517
-Node: Cross configuring19797
-Node: Cross problems21474
-Node: Installing23136
-Node: Installation directories24156
-Node: Linked scripts25974
-Node: Distro builds27465
-Node: Layout and infrastructure29841
-Node: Build system tools30672
-Node: Top-level directories32889
-Node: Autoconf macros35125
-Node: General setup macros35887
-Node: Macros for programs36762
-Node: Macros for compilers37563
-Node: Macros for libraries38971
-Node: Macros for library and header flags39397
-Node: Macros for Windows41308
-Node: Library modules42895
-Node: png library43384
-Node: zlib library45732
-Node: freetype library46247
-Node: kpathsea library46943
-Node: Program modules48322
-Node: t1utils package48750
-Node: xindy package49295
-Node: xdvik package50411
-Node: asymptote51470
-Node: Extending TeX Live51966
-Node: Adding a new program module52773
-Node: Adding a new engine57536
-Node: Adding a new generic library module59321
-Node: Adding a new TeX-specific library module61542
-Node: Configure options62240
-Node: Global configure options63621
-Node: --disable-native-texlive-build64163
-Node: --prefix --bindir ...65125
-Node: --disable-largefile65665
-Node: --disable-missing66207
-Node: --enable-compiler-warnings=LEVEL66608
-Node: --enable-cxx-runtime-hack67264
-Node: --enable-maintainer-mode67684
-Node: --enable-multiplatform68213
-Node: --enable-shared68786
-Node: --enable-silent-rules69157
-Node: --without-ln-s69609
-Node: --without-x69956
-Node: Program-specific configure options70144
-Node: --enable-PROG --disable-PROG70787
-Node: --disable-all-pkgs71060
-Node: Configure options for texk/web2c71843
-Node: Configure options for texk/bibtex-x74381
-Node: Configure options for texk/dvipdfm-x74924
-Node: Configure options for texk/dvisvgm75700
-Node: Configure options for texk/texlive76581
-Node: Configure options for texk/xdvik77002
-Node: Configure options for utils/xindy77623
-Node: Library-specific configure options78513
-Node: Configure options for kpathsea79474
-Node: Variables for configure80178
-Node: Coding conventions81604
-Node: Declarations and definitions82319
-Node: Const84493
-Node: Continuous integration86357
-Node: Transfer from Subversion to Github87021
-Node: Automatic update of the Git mirror89183
-Node: CI testing on Travis-CI89765
-Node: Releases on Github90474
-Node: install-tl90914
-Node: install-tl NAME91283
-Node: install-tl SYNOPSIS91441
-Node: install-tl DESCRIPTION91699
-Node: install-tl REFERENCES92759
-Node: install-tl OPTIONS93283
-Ref: install-tl *-gui* [[=]_module_]93624
-Ref: install-tl text93832
-Ref: install-tl tcl (or "perltk" or "wizard" or "expert" or nothing)94017
-Ref: install-tl *-no-gui*94649
-Ref: install-tl *-lang* _llcode_94739
-Ref: install-tl *-repository* _url|path_95363
-Ref: install-tl *-select-repository*96252
-Ref: install-tl *-all-options*96670
-Ref: install-tl *-custom-bin* _path_96925
-Ref: install-tl *-debug-translation*97759
-Ref: install-tl *-force-platform* _platform_98035
-Ref: install-tl *-help*, *--help*, *-?*98279
-Ref: install-tl *-in-place*98692
-Ref: install-tl *-init-from-profile* _profile_file_99237
-Ref: install-tl *-logfile* _file_99506
-Ref: install-tl *-no-cls*99857
-Ref: install-tl *-no-persistent-downloads*100005
-Ref: install-tl *-persistent-downloads*100030
-Ref: install-tl *-no-verify-downloads*100648
-Ref: install-tl *-non-admin*101011
-Ref: install-tl *-portable*101104
-Ref: install-tl *-print-platform*101243
-Ref: install-tl *-profile* _profile_file_101441
-Ref: install-tl *-q*101662
-Ref: install-tl *-scheme* _scheme_101724
-Ref: install-tl *-v*102198
-Ref: install-tl *-version*, *--version*102353
-Node: install-tl PROFILES102487
-Ref: install-tl instopt_adjustpath (default 0 on Unix, 1 on Windows)105353
-Ref: install-tl instopt_adjustrepo (default 1)105429
-Ref: install-tl instopt_letter (default 0)105566
-Ref: install-tl instopt_portable (default 0)105657
-Ref: install-tl instopt_write18_restricted (default 1)105753
-Node: install-tl ENVIRONMENT VARIABLES107092
-Ref: install-tl TEXLIVE_DOWNLOADER107470
-Ref: install-tl TL_DOWNLOAD_PROGRAM107493
-Ref: install-tl TL_DOWNLOAD_ARGS107513
-Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK107717
-Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE107919
-Ref: install-tl TEXLIVE_INSTALL_NO_RESUME108028
-Ref: install-tl TEXLIVE_INSTALL_NO_WELCOME108180
-Ref: install-tl TEXLIVE_INSTALL_PAPER108301
-Ref: install-tl TEXLIVE_INSTALL_PREFIX108447
-Ref: install-tl TEXLIVE_INSTALL_TEXDIR108473
-Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG108504
-Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR108532
-Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME108561
-Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL108591
-Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG108625
-Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR108656
-Ref: install-tl NOPERLDOC109027
-Node: install-tl AUTHORS AND COPYRIGHT109091
-Node: tlmgr109504
-Node: tlmgr NAME109989
-Node: tlmgr SYNOPSIS110121
-Node: tlmgr DESCRIPTION110311
-Node: tlmgr EXAMPLES111410
-Ref: tlmgr tlmgr option repository ctan111661
-Ref: tlmgr tlmgr option repository https://mirror.ctan.org/systems/texlive/tlnet111734
-Ref: tlmgr tlmgr update --list112339
-Ref: tlmgr tlmgr update --all112432
-Ref: tlmgr tlmgr info _what_112589
-Node: tlmgr OPTIONS112851
-Ref: tlmgr *--repository* _url|path_113371
-Ref: tlmgr /some/local/dir114557
-Ref: tlmgr file:/some/local/dir114586
-Ref: tlmgr ctan114659
-Ref: tlmgr https://mirror.ctan.org/systems/texlive/tlnet114713
-Ref: tlmgr http://server/path/to/tlnet115054
-Ref: tlmgr https://server/path/to/tlnet115435
-Ref: tlmgr ftp://server/path/to/tlnet115903
-Ref: tlmgr user@machine:/path/to/tlnet116035
-Ref: tlmgr scp://user@machine/path/to/tlnet116076
-Ref: tlmgr ssh://user@machine/path/to/tlnet116117
-Ref: tlmgr *--gui* [_action_]116510
-Ref: tlmgr *--gui-lang* _llcode_117323
-Ref: tlmgr *--command-logfile* _file_118064
-Ref: tlmgr *--debug-translation*118330
-Ref: tlmgr *--machine-readable*118533
-Ref: tlmgr *--no-execute-actions*118801
-Ref: tlmgr *--package-logfile* _file_118994
-Ref: tlmgr *--pause*119248
-Ref: tlmgr *--persistent-downloads*119403
-Ref: tlmgr *--no-persistent-downloads*119431
-Ref: tlmgr *--pin-file*119925
-Ref: tlmgr *--usermode*120143
-Ref: tlmgr *--usertree* _dir_120263
-Ref: tlmgr *--verify-repo=[none|main|all]*120389
-Node: tlmgr ACTIONS121288
-Node: tlmgr help122149
-Node: tlmgr version122626
-Node: tlmgr backup122889
-Ref: tlmgr *backup [_option_...] --all*123060
-Ref: tlmgr *backup [_option_...] _pkg_...*123093
-Ref: tlmgr *--backupdir* _directory_124159
-Ref: tlmgr *--all*124376
-Ref: tlmgr *--clean*[=_N_]124628
-Ref: tlmgr *--dry-run*124955
-Node: tlmgr candidates _pkg_125085
-Node: tlmgr check [_option_...] [depends|executes|files|runfiles|texmfdbs|all]125440
-Ref: tlmgr *depends*125954
-Ref: tlmgr *executes*126296
-Ref: tlmgr *files*126411
-Ref: tlmgr *runfiles*126547
-Ref: tlmgr *texmfdbs*126684
-Ref: tlmgr - all items in TEXMFDBS have the !! prefix.126914
-Ref: tlmgr - all items in TEXMFBDS have an ls-R file (if they exist at all).126990
-Ref: tlmgr - all items in TEXMF with !! are listed in TEXMFDBS.127055
-Ref: tlmgr - all items in TEXMF with an ls-R file are listed in TEXMFDBS.127130
-Ref: tlmgr *--use-svn*127155
-Node: tlmgr conf127296
-Ref: tlmgr *conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]*127584
-Ref: tlmgr *conf auxtrees [--conffile _file_] [show|add|remove] [_value_]*127648
-Node: tlmgr dump-tlpdb [_option_...] [--json]130063
-Ref: tlmgr *--local*130496
-Ref: tlmgr *--remote*130535
-Ref: tlmgr *--json*130573
-Node: tlmgr generate131144
-Ref: tlmgr *generate [_option_...] language*131340
-Ref: tlmgr *generate [_option_...] language.dat*131379
-Ref: tlmgr *generate [_option_...] language.def*131418
-Ref: tlmgr *generate [_option_...] language.dat.lua*131461
-Ref: tlmgr *--dest* _output_file_133788
-Ref: tlmgr *--localcfg* _local_conf_file_134364
-Ref: tlmgr *--rebuild-sys*134487
-Node: tlmgr gui135302
-Node: tlmgr info135480
-Ref: tlmgr *info [_option_...] _pkg_...*135642
-Ref: tlmgr *info [_option_...] collections*135676
-Ref: tlmgr *info [_option_...] schemes*135706
-Ref: tlmgr *--list*137236
-Ref: tlmgr *--only-installed*137550
-Ref: tlmgr *--only-remote*137738
-Ref: tlmgr *--data item1,item2,...*138042
-Ref: tlmgr *--json* 1139405
-Node: tlmgr init-usertree139788
-Node: tlmgr install [_option_...] _pkg_...140169
-Ref: tlmgr *--dry-run* 1140677
-Ref: tlmgr *--file*140794
-Ref: tlmgr *--force*141016
-Ref: tlmgr *--no-depends*141236
-Ref: tlmgr *--no-depends-at-all*141395
-Ref: tlmgr *--reinstall*141795
-Ref: tlmgr *--with-doc*142173
-Ref: tlmgr *--with-src*142186
-Node: tlmgr key142914
-Ref: tlmgr *key list*143072
-Ref: tlmgr *key add _file_*143090
-Ref: tlmgr *key remove _keyid_*143112
-Node: tlmgr list143706
-Node: tlmgr option143868
-Ref: tlmgr *option [--json] [show]*144023
-Ref: tlmgr *option [--json] showall|help*144054
-Ref: tlmgr *option _key_ [_value_]*144080
-Node: tlmgr paper148659
-Ref: tlmgr *paper [a4|letter]*148808
-Ref: tlmgr *<[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*>148884
-Ref: tlmgr *paper --json*148899
-Node: tlmgr path150114
-Ref: tlmgr *path [--w32mode=user|admin] add*150275
-Ref: tlmgr *path [--w32mode=user|admin] remove*150312
-Node: tlmgr pinning151797
-Ref: tlmgr pinning show152038
-Ref: tlmgr pinning add _repo_ _pkgglob_...152111
-Ref: tlmgr pinning remove _repo_ _pkgglob_...152230
-Ref: tlmgr pinning remove _repo_ --all152383
-Node: tlmgr platform152437
-Ref: tlmgr *platform list|add|remove _platform_...*152623
-Ref: tlmgr *platform set _platform_*152650
-Ref: tlmgr *platform set auto*152671
-Ref: tlmgr *--dry-run* 2153548
-Node: tlmgr postaction153667
-Ref: tlmgr *postaction [_option_...] install [shortcut|fileassoc|script] [_pkg_...]*153897
-Ref: tlmgr *postaction [_option_...] remove [shortcut|fileassoc|script] [_pkg_...]*153971
-Ref: tlmgr *--w32mode=[user|admin]*154286
-Ref: tlmgr *--fileassocmode=[1|2]*154702
-Ref: tlmgr *--all* 1154987
-Node: tlmgr print-platform155042
-Node: tlmgr print-platform-info155373
-Node: tlmgr remove [_option_...] _pkg_...155673
-Ref: tlmgr *--all* 2156157
-Ref: tlmgr *--backup*156267
-Ref: tlmgr *--backupdir* _directory_ 1156293
-Ref: tlmgr *--no-depends* 1156698
-Ref: tlmgr *--no-depends-at-all* 1156760
-Ref: tlmgr *--force* 1156863
-Ref: tlmgr *--dry-run* 3157336
-Node: tlmgr repository157672
-Ref: tlmgr *repository list*157860
-Ref: tlmgr *repository list _path|url|tag_*157894
-Ref: tlmgr *repository add _path_ [_tag_]*157927
-Ref: tlmgr *repository remove _path|tag_*157959
-Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*158013
-Ref: tlmgr *repository status*158034
-Ref: tlmgr The tag (which can be the same as the url);159261
-Node: tlmgr restore159739
-Ref: tlmgr *restore [_option_...] _pkg_ [_rev_]*159918
-Ref: tlmgr *restore [_option_...] --all*159948
-Ref: tlmgr *--all* 3160648
-Ref: tlmgr *--backupdir* _directory_ 2160862
-Ref: tlmgr *--dry-run* 4161043
-Ref: tlmgr *--force* 2161175
-Ref: tlmgr *--json* 2161221
-Node: tlmgr search161548
-Ref: tlmgr *search [_option_...] _what_*161712
-Ref: tlmgr *search [_option_...] --file _what_*161749
-Ref: tlmgr *search [_option_...] --all _what_*161785
-Ref: tlmgr *--file* 1162005
-Ref: tlmgr *--all* 4162067
-Ref: tlmgr *--global*162156
-Ref: tlmgr *--word*162283
-Node: tlmgr shell162598
-Ref: tlmgr protocol163333
-Ref: tlmgr help 1163397
-Ref: tlmgr version 1163450
-Ref: tlmgr quit, end, bye, byebye, EOF163518
-Ref: tlmgr restart163539
-Ref: tlmgr load [local|remote]163662
-Ref: tlmgr save163732
-Ref: tlmgr get [_var_] =item set [_var_ [_val_]]163855
-Node: tlmgr show164456
-Node: tlmgr uninstall164623
-Node: tlmgr update [_option_...] [_pkg_...]164853
-Ref: tlmgr *--all* 5165224
-Ref: tlmgr *--self*167403
-Ref: tlmgr *--dry-run* 5168167
-Ref: tlmgr *--list* [_pkg_]168344
-Ref: tlmgr *--exclude* _pkg_169033
-Ref: tlmgr *--no-auto-remove* [_pkg_...]169833
-Ref: tlmgr *--no-auto-install* [_pkg_...]170317
-Ref: tlmgr *--reinstall-forcibly-removed*171079
-Ref: tlmgr *--backup* 1171614
-Ref: tlmgr *--backupdir* _directory_ 3171640
-Ref: tlmgr *--no-depends* 2172806
-Ref: tlmgr *--no-depends-at-all* 2173009
-Ref: tlmgr *--force* 3173112
-Node: tlmgr CONFIGURATION FILE FOR TLMGR174103
-Ref: tlmgr auto-remove, value 0 or 1 (default 1), same as command-line option.175110
-Ref: tlmgr gui-expertmode, value 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.175247
-Ref: tlmgr gui-lang _llcode_, with a language code value as with the command-line option.175329
-Ref: tlmgr no-checksums, value 0 or 1 (default 0, see below).175383
-Ref: tlmgr persistent-downloads, value 0 or 1 (default 1), same as command-line option.175463
-Ref: tlmgr require-verification, value 0 or 1 (default 0), same as command-line option.175543
-Ref: tlmgr tkfontscale, value any float. Controls the scaling of fonts in the Tk based frontends.175633
-Ref: tlmgr update-exclude, value: comma-separated list of packages (no space allowed). Same as the command line option --exclude for the action update.175781
-Ref: tlmgr verify-downloads, value 0 or 1 (default 1), same as command-line option.175857
-Ref: tlmgr allowed-actions _action1_ [,_action_,...] The value is a comma-separated list of tlmgr actions which are allowed to be executed when tlmgr is invoked in system mode (that is, without --usermode).176126
-Node: tlmgr CRYPTOGRAPHIC VERIFICATION177214
-Node: tlmgr Configuration of GnuPG invocation179387
-Node: tlmgr USER MODE180025
-Node: tlmgr User mode install182871
-Node: tlmgr User mode backup, restore, remove, update184015
-Node: tlmgr User mode generate, option, paper184457
-Node: tlmgr MULTIPLE REPOSITORIES184833
-Node: tlmgr Pinning186562
-Node: tlmgr GUI FOR TLMGR188485
-Node: tlmgr Main display190134
-Node: tlmgr Display configuration area190386
-Ref: tlmgr Status190747
-Ref: tlmgr Category190911
-Ref: tlmgr Match191097
-Ref: tlmgr Selection191278
-Ref: tlmgr Display configuration buttons191482
-Node: tlmgr Package list area191665
-Ref: tlmgr a checkbox192249
-Ref: tlmgr package name192385
-Ref: tlmgr local revision (and version)192484
-Ref: tlmgr remote revision (and version)192859
-Ref: tlmgr short description193156
-Node: tlmgr Main display action buttons193201
-Ref: tlmgr Update all installed193467
-Ref: tlmgr Update193839
-Ref: tlmgr Install193889
-Ref: tlmgr Remove194075
-Ref: tlmgr Backup194253
-Node: tlmgr Menu bar194410
-Ref: tlmgr tlmgr menu194633
-Ref: tlmgr Options menu194941
-Ref: tlmgr Actions menu196024
-Ref: tlmgr Help menu196452
-Node: tlmgr GUI options196586
-Ref: tlmgr -background _color_196832
-Ref: tlmgr -font " _fontname_ _fontsize_ "196897
-Ref: tlmgr -foreground _color_197055
-Ref: tlmgr -geometry _geomspec_197107
-Ref: tlmgr -xrm _xresource_197299
-Node: tlmgr MACHINE-READABLE OUTPUT197568
-Node: tlmgr Machine-readable update and install output198378
-Ref: tlmgr location-url _location_199654
-Ref: tlmgr total-bytes _count_199870
-Ref: tlmgr _pkgname_200280
-Ref: tlmgr _status_200490
-Ref: tlmgr d200568
-Ref: tlmgr f200628
-Ref: tlmgr u200807
-Ref: tlmgr r200853
-Ref: tlmgr a200976
-Ref: tlmgr i201154
-Ref: tlmgr I201273
-Ref: tlmgr _localrev_201375
-Ref: tlmgr _serverrev_201482
-Ref: tlmgr _size_201594
-Ref: tlmgr _runtime_201763
-Ref: tlmgr _esttot_201833
-Node: tlmgr Machine-readable option output201866
-Node: tlmgr ENVIRONMENT VARIABLES202378
-Ref: tlmgr TEXLIVE_COMPRESSOR202889
-Ref: tlmgr TEXLIVE_DOWNLOADER203737
-Ref: tlmgr TL_DOWNLOAD_PROGRAM203760
-Ref: tlmgr TL_DOWNLOAD_ARGS203780
-Ref: tlmgr TEXLIVE_PREFER_OWN204806
-Node: tlmgr AUTHORS AND COPYRIGHT205630
-Node: Index206028
+Node: Overview of build system3943
+Node: Prerequisites5994
+Ref: Prerequisites-Footnote-18993
+Node: Building9296
+Node: Build iteration10638
+Node: Build in parallel11682
+Node: Build distribution12287
+Node: Build one package12935
+Node: Build one engine17647
+Node: Cross compilation20072
+Node: Cross configuring21351
+Node: Cross problems23028
+Node: Installing24690
+Node: Installation directories25710
+Node: Linked scripts27528
+Node: Distro builds29019
+Node: Layout and infrastructure31395
+Node: Build system tools32226
+Node: Top-level directories34443
+Node: Autoconf macros36679
+Node: General setup macros37441
+Node: Macros for programs38316
+Node: Macros for compilers39117
+Node: Macros for libraries40525
+Node: Macros for library and header flags40951
+Node: Macros for Windows42862
+Node: Library modules44449
+Node: png library44938
+Node: zlib library47286
+Node: freetype library47801
+Node: kpathsea library48497
+Node: Program modules49876
+Node: t1utils package50304
+Node: xindy package50849
+Node: xdvik package51965
+Node: asymptote53024
+Node: Extending TeX Live53528
+Node: Adding a new program module54335
+Node: Adding a new engine59098
+Node: Adding a new generic library module60883
+Node: Adding a new TeX-specific library module63104
+Node: Configure options63802
+Node: Global configure options65183
+Node: --disable-native-texlive-build65725
+Node: --prefix --bindir ...66687
+Node: --disable-largefile67227
+Node: --disable-missing67769
+Node: --enable-compiler-warnings=LEVEL68170
+Node: --enable-cxx-runtime-hack68826
+Node: --enable-maintainer-mode69246
+Node: --enable-multiplatform69775
+Node: --enable-shared70348
+Node: --enable-silent-rules70719
+Node: --without-ln-s71171
+Node: --without-x71518
+Node: Program-specific configure options71706
+Node: --enable-PROG --disable-PROG72349
+Node: --disable-all-pkgs72622
+Node: Configure options for texk/web2c73405
+Node: Configure options for texk/bibtex-x75943
+Node: Configure options for texk/dvipdfm-x76486
+Node: Configure options for texk/dvisvgm77262
+Node: Configure options for texk/texlive78143
+Node: Configure options for texk/xdvik78564
+Node: Configure options for utils/xindy79185
+Node: Library-specific configure options80075
+Node: Configure options for kpathsea81036
+Node: Variables for configure81740
+Node: Coding conventions83166
+Node: Declarations and definitions83881
+Node: Const86055
+Node: Continuous integration87919
+Node: Transfer from Subversion to Github88583
+Node: Automatic update of the Git mirror90745
+Node: CI testing on Travis-CI91327
+Node: Releases on Github92036
+Node: install-tl92476
+Node: install-tl NAME92845
+Node: install-tl SYNOPSIS93003
+Node: install-tl DESCRIPTION93219
+Node: install-tl REFERENCES94279
+Node: install-tl OPTIONS94803
+Ref: install-tl *-gui* [[=]_module_]95144
+Ref: install-tl text95352
+Ref: install-tl tcl (or "perltk" or "wizard" or "expert" or nothing)95537
+Ref: install-tl *-no-gui*96169
+Ref: install-tl *-lang* _llcode_96259
+Ref: install-tl *-repository* _url|path_96883
+Ref: install-tl *-select-repository*97772
+Ref: install-tl *-all-options*98190
+Ref: install-tl *-custom-bin* _path_98445
+Ref: install-tl *-debug-fakenet*99275
+Ref: install-tl *-debug-translation*99451
+Ref: install-tl *-force-platform* _platform_99727
+Ref: install-tl *-help*, *--help*, *-?*99971
+Ref: install-tl *-in-place*100384
+Ref: install-tl *-init-from-profile* _profile_file_100929
+Ref: install-tl *-logfile* _file_101198
+Ref: install-tl *-no-cls*101549
+Ref: install-tl *-no-persistent-downloads*101697
+Ref: install-tl *-persistent-downloads*101722
+Ref: install-tl *-no-verify-downloads*102340
+Ref: install-tl *-non-admin*102703
+Ref: install-tl *-portable*102796
+Ref: install-tl *-print-platform*102935
+Ref: install-tl *-profile* _profile_file_103133
+Ref: install-tl *-q*103354
+Ref: install-tl *-scheme* _scheme_103416
+Ref: install-tl *-v*103890
+Ref: install-tl *-version*, *--version*104045
+Node: install-tl PROFILES104179
+Ref: install-tl instopt_adjustpath (default 0 on Unix, 1 on Windows)107045
+Ref: install-tl instopt_adjustrepo (default 1)107121
+Ref: install-tl instopt_letter (default 0)107258
+Ref: install-tl instopt_portable (default 0)107349
+Ref: install-tl instopt_write18_restricted (default 1)107445
+Node: install-tl ENVIRONMENT VARIABLES108784
+Ref: install-tl TEXLIVE_DOWNLOADER109162
+Ref: install-tl TL_DOWNLOAD_PROGRAM109185
+Ref: install-tl TL_DOWNLOAD_ARGS109205
+Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK109409
+Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE109611
+Ref: install-tl TEXLIVE_INSTALL_NO_RESUME109720
+Ref: install-tl TEXLIVE_INSTALL_NO_WELCOME109872
+Ref: install-tl TEXLIVE_INSTALL_PAPER109993
+Ref: install-tl TEXLIVE_INSTALL_PREFIX110139
+Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG110170
+Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR110198
+Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME110227
+Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL110257
+Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG110291
+Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR110322
+Ref: install-tl NOPERLDOC110737
+Node: install-tl AUTHORS AND COPYRIGHT110801
+Node: tlmgr111214
+Node: tlmgr NAME111699
+Node: tlmgr SYNOPSIS111831
+Node: tlmgr DESCRIPTION112021
+Node: tlmgr EXAMPLES113120
+Ref: tlmgr tlmgr option repository ctan113371
+Ref: tlmgr tlmgr option repository https://mirror.ctan.org/systems/texlive/tlnet113444
+Ref: tlmgr tlmgr update --list114049
+Ref: tlmgr tlmgr update --all114142
+Ref: tlmgr tlmgr info _what_114299
+Node: tlmgr OPTIONS114561
+Ref: tlmgr *--repository* _url|path_115081
+Ref: tlmgr /some/local/dir116267
+Ref: tlmgr file:/some/local/dir116296
+Ref: tlmgr ctan116369
+Ref: tlmgr https://mirror.ctan.org/systems/texlive/tlnet116423
+Ref: tlmgr http://server/path/to/tlnet116764
+Ref: tlmgr https://server/path/to/tlnet117145
+Ref: tlmgr ftp://server/path/to/tlnet117613
+Ref: tlmgr user@machine:/path/to/tlnet117745
+Ref: tlmgr scp://user@machine/path/to/tlnet117786
+Ref: tlmgr ssh://user@machine/path/to/tlnet117827
+Ref: tlmgr *--gui* [_action_]118220
+Ref: tlmgr *--gui-lang* _llcode_119033
+Ref: tlmgr *--command-logfile* _file_119774
+Ref: tlmgr *--debug-translation*120040
+Ref: tlmgr *--machine-readable*120243
+Ref: tlmgr *--no-execute-actions*120511
+Ref: tlmgr *--package-logfile* _file_120704
+Ref: tlmgr *--pause*120958
+Ref: tlmgr *--persistent-downloads*121113
+Ref: tlmgr *--no-persistent-downloads*121141
+Ref: tlmgr *--pin-file*121635
+Ref: tlmgr *--usermode*121853
+Ref: tlmgr *--usertree* _dir_121973
+Ref: tlmgr *--verify-repo=[none|main|all]*122099
+Node: tlmgr ACTIONS122998
+Node: tlmgr help123859
+Node: tlmgr version124336
+Node: tlmgr backup124599
+Ref: tlmgr *backup [_option_...] --all*124770
+Ref: tlmgr *backup [_option_...] _pkg_...*124803
+Ref: tlmgr *--backupdir* _directory_125869
+Ref: tlmgr *--all*126086
+Ref: tlmgr *--clean*[=_N_]126338
+Ref: tlmgr *--dry-run*126665
+Node: tlmgr candidates _pkg_126795
+Node: tlmgr check [_option_...] [depends|executes|files|runfiles|texmfdbs|all]127150
+Ref: tlmgr *depends*127664
+Ref: tlmgr *executes*128006
+Ref: tlmgr *files*128121
+Ref: tlmgr *runfiles*128257
+Ref: tlmgr *texmfdbs*128394
+Ref: tlmgr - all items in TEXMFDBS have the !! prefix.128624
+Ref: tlmgr - all items in TEXMFBDS have an ls-R file (if they exist at all).128700
+Ref: tlmgr - all items in TEXMF with !! are listed in TEXMFDBS.128765
+Ref: tlmgr - all items in TEXMF with an ls-R file are listed in TEXMFDBS.128840
+Ref: tlmgr *--use-svn*128865
+Node: tlmgr conf129006
+Ref: tlmgr *conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]*129294
+Ref: tlmgr *conf auxtrees [--conffile _file_] [show|add|remove] [_value_]*129358
+Node: tlmgr dump-tlpdb [_option_...] [--json]131773
+Ref: tlmgr *--local*132206
+Ref: tlmgr *--remote*132245
+Ref: tlmgr *--json*132283
+Node: tlmgr generate132854
+Ref: tlmgr *generate [_option_...] language*133050
+Ref: tlmgr *generate [_option_...] language.dat*133089
+Ref: tlmgr *generate [_option_...] language.def*133128
+Ref: tlmgr *generate [_option_...] language.dat.lua*133171
+Ref: tlmgr *--dest* _output_file_135498
+Ref: tlmgr *--localcfg* _local_conf_file_136074
+Ref: tlmgr *--rebuild-sys*136197
+Node: tlmgr gui137012
+Node: tlmgr info137190
+Ref: tlmgr *info [_option_...] _pkg_...*137352
+Ref: tlmgr *info [_option_...] collections*137386
+Ref: tlmgr *info [_option_...] schemes*137416
+Ref: tlmgr *--list*138946
+Ref: tlmgr *--only-installed*139260
+Ref: tlmgr *--only-remote*139448
+Ref: tlmgr *--data item1,item2,...*139752
+Ref: tlmgr *--json* 1141124
+Node: tlmgr init-usertree141507
+Node: tlmgr install [_option_...] _pkg_...141888
+Ref: tlmgr *--dry-run* 1142396
+Ref: tlmgr *--file*142513
+Ref: tlmgr *--force*142735
+Ref: tlmgr *--no-depends*142955
+Ref: tlmgr *--no-depends-at-all*143114
+Ref: tlmgr *--reinstall*143514
+Ref: tlmgr *--with-doc*143892
+Ref: tlmgr *--with-src*143905
+Node: tlmgr key144633
+Ref: tlmgr *key list*144791
+Ref: tlmgr *key add _file_*144809
+Ref: tlmgr *key remove _keyid_*144831
+Node: tlmgr list145425
+Node: tlmgr option145587
+Ref: tlmgr *option [--json] [show]*145742
+Ref: tlmgr *option [--json] showall|help*145773
+Ref: tlmgr *option _key_ [_value_]*145799
+Node: tlmgr paper150378
+Ref: tlmgr *paper [a4|letter]*150527
+Ref: tlmgr *<[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*>150603
+Ref: tlmgr *paper --json*150618
+Node: tlmgr path151833
+Ref: tlmgr *path [--w32mode=user|admin] add*151994
+Ref: tlmgr *path [--w32mode=user|admin] remove*152031
+Node: tlmgr pinning153516
+Ref: tlmgr pinning show153757
+Ref: tlmgr pinning add _repo_ _pkgglob_...153830
+Ref: tlmgr pinning remove _repo_ _pkgglob_...153949
+Ref: tlmgr pinning remove _repo_ --all154102
+Node: tlmgr platform154156
+Ref: tlmgr *platform list|add|remove _platform_...*154342
+Ref: tlmgr *platform set _platform_*154369
+Ref: tlmgr *platform set auto*154390
+Ref: tlmgr *--dry-run* 2155267
+Node: tlmgr postaction155386
+Ref: tlmgr *postaction [_option_...] install [shortcut|fileassoc|script] [_pkg_...]*155616
+Ref: tlmgr *postaction [_option_...] remove [shortcut|fileassoc|script] [_pkg_...]*155690
+Ref: tlmgr *--w32mode=[user|admin]*156005
+Ref: tlmgr *--fileassocmode=[1|2]*156421
+Ref: tlmgr *--all* 1156706
+Node: tlmgr print-platform156761
+Node: tlmgr print-platform-info157092
+Node: tlmgr remove [_option_...] _pkg_...157392
+Ref: tlmgr *--all* 2157876
+Ref: tlmgr *--backup*157986
+Ref: tlmgr *--backupdir* _directory_ 1158012
+Ref: tlmgr *--no-depends* 1158417
+Ref: tlmgr *--no-depends-at-all* 1158479
+Ref: tlmgr *--force* 1158582
+Ref: tlmgr *--dry-run* 3159055
+Node: tlmgr repository159432
+Ref: tlmgr *repository list*159620
+Ref: tlmgr *repository list _path|url|tag_*159654
+Ref: tlmgr *repository add _path_ [_tag_]*159687
+Ref: tlmgr *repository remove _path|tag_*159719
+Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*159773
+Ref: tlmgr *repository status*159794
+Ref: tlmgr The tag (which can be the same as the url);161021
+Node: tlmgr restore161499
+Ref: tlmgr *restore [_option_...] _pkg_ [_rev_]*161678
+Ref: tlmgr *restore [_option_...] --all*161708
+Ref: tlmgr *--all* 3162408
+Ref: tlmgr *--backupdir* _directory_ 2162622
+Ref: tlmgr *--dry-run* 4162803
+Ref: tlmgr *--force* 2162935
+Ref: tlmgr *--json* 2162981
+Node: tlmgr search163308
+Ref: tlmgr *search [_option_...] _what_*163472
+Ref: tlmgr *search [_option_...] --file _what_*163509
+Ref: tlmgr *search [_option_...] --all _what_*163545
+Ref: tlmgr *--file* 1163765
+Ref: tlmgr *--all* 4163827
+Ref: tlmgr *--global*163916
+Ref: tlmgr *--word*164043
+Node: tlmgr shell164358
+Ref: tlmgr protocol165093
+Ref: tlmgr help 1165157
+Ref: tlmgr version 1165210
+Ref: tlmgr quit, end, bye, byebye, EOF165278
+Ref: tlmgr restart165299
+Ref: tlmgr load [local|remote]165422
+Ref: tlmgr save165492
+Ref: tlmgr get [_var_] =item set [_var_ [_val_]]165615
+Node: tlmgr show166216
+Node: tlmgr uninstall166383
+Node: tlmgr update [_option_...] [_pkg_...]166613
+Ref: tlmgr *--all* 5166984
+Ref: tlmgr *--self*169163
+Ref: tlmgr *--dry-run* 5169927
+Ref: tlmgr *--list* [_pkg_]170104
+Ref: tlmgr *--exclude* _pkg_170793
+Ref: tlmgr *--no-auto-remove* [_pkg_...]171593
+Ref: tlmgr *--no-auto-install* [_pkg_...]172077
+Ref: tlmgr *--reinstall-forcibly-removed*172839
+Ref: tlmgr *--backup* 1173374
+Ref: tlmgr *--backupdir* _directory_ 3173400
+Ref: tlmgr *--no-depends* 2174566
+Ref: tlmgr *--no-depends-at-all* 2174769
+Ref: tlmgr *--force* 3174872
+Node: tlmgr CONFIGURATION FILE FOR TLMGR175863
+Ref: tlmgr auto-remove = 0 or 1 (default 1), same as command-line option.176865
+Ref: tlmgr gui-expertmode = 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.176997
+Ref: tlmgr gui-lang = _llcode_, with a language code value as with the command-line option.177081
+Ref: tlmgr no-checksums = 0 or 1 (default 0, see below).177130
+Ref: tlmgr persistent-downloads = 0 or 1 (default 1), same as command-line option.177205
+Ref: tlmgr require-verification = 0 or 1 (default 0), same as command-line option.177280
+Ref: tlmgr tkfontscale = _floating-point number_ (default 1.0); scaling factor for fonts in the Tk-based frontends.177388
+Ref: tlmgr update-exclude = _comma-separated list of packages_ (no spaces allowed). Same as the command line option --exclude for the update action.177533
+Ref: tlmgr verify-downloads = 0 or 1 (default 1), same as command-line option.177604
+Ref: tlmgr allowed-actions = _action1_[,_action2_,...] The value is a comma-separated list (no spaces) of tlmgr actions which are allowed to be executed when tlmgr is invoked in system mode (that is, without --usermode). This allows distributors to include tlmgr in their packaging, but allow only a restricted set of actions that do not interfere with their distro package manager. For native TeX Live installations, it doesn't make sense to set this.178121
+Node: tlmgr CRYPTOGRAPHIC VERIFICATION178953
+Node: tlmgr Configuration of GnuPG invocation181126
+Node: tlmgr USER MODE181764
+Node: tlmgr User mode install184610
+Node: tlmgr User mode backup, restore, remove, update185754
+Node: tlmgr User mode generate, option, paper186196
+Node: tlmgr MULTIPLE REPOSITORIES186530
+Node: tlmgr Pinning188259
+Node: tlmgr GUI FOR TLMGR190182
+Node: tlmgr Main display191831
+Node: tlmgr Display configuration area192083
+Ref: tlmgr Status192444
+Ref: tlmgr Category192608
+Ref: tlmgr Match192794
+Ref: tlmgr Selection192975
+Ref: tlmgr Display configuration buttons193179
+Node: tlmgr Package list area193362
+Ref: tlmgr a checkbox193946
+Ref: tlmgr package name194082
+Ref: tlmgr local revision (and version)194181
+Ref: tlmgr remote revision (and version)194556
+Ref: tlmgr short description194853
+Node: tlmgr Main display action buttons194898
+Ref: tlmgr Update all installed195164
+Ref: tlmgr Update195536
+Ref: tlmgr Install195586
+Ref: tlmgr Remove195772
+Ref: tlmgr Backup195950
+Node: tlmgr Menu bar196107
+Ref: tlmgr tlmgr menu196330
+Ref: tlmgr Options menu196638
+Ref: tlmgr Actions menu197721
+Ref: tlmgr Help menu198149
+Node: tlmgr GUI options198283
+Ref: tlmgr -background _color_198529
+Ref: tlmgr -font " _fontname_ _fontsize_ "198594
+Ref: tlmgr -foreground _color_198752
+Ref: tlmgr -geometry _geomspec_198804
+Ref: tlmgr -xrm _xresource_198996
+Node: tlmgr MACHINE-READABLE OUTPUT199265
+Node: tlmgr Machine-readable update and install output200075
+Ref: tlmgr location-url _location_201351
+Ref: tlmgr total-bytes _count_201567
+Ref: tlmgr _pkgname_201977
+Ref: tlmgr _status_202187
+Ref: tlmgr d202265
+Ref: tlmgr f202325
+Ref: tlmgr u202504
+Ref: tlmgr r202550
+Ref: tlmgr a202673
+Ref: tlmgr i202851
+Ref: tlmgr I202970
+Ref: tlmgr _localrev_203072
+Ref: tlmgr _serverrev_203179
+Ref: tlmgr _size_203291
+Ref: tlmgr _runtime_203460
+Ref: tlmgr _esttot_203530
+Node: tlmgr Machine-readable option output203563
+Node: tlmgr ENVIRONMENT VARIABLES204075
+Ref: tlmgr TEXLIVE_COMPRESSOR204586
+Ref: tlmgr TEXLIVE_DOWNLOADER205434
+Ref: tlmgr TL_DOWNLOAD_PROGRAM205457
+Ref: tlmgr TL_DOWNLOAD_ARGS205477
+Ref: tlmgr TEXLIVE_PREFER_OWN206503
+Node: tlmgr AUTHORS AND COPYRIGHT207327
+Node: Index207729
 
 End Tag Table
 
diff --git a/source/doc/tlbuild.texi b/source/doc/tlbuild.texi
index aa623d3dd01e68004f99e3bda6456cb857caa36b..3cf1f3e029683e22fc6f04d26625fcbb0bd560da 100644
--- a/source/doc/tlbuild.texi
+++ b/source/doc/tlbuild.texi
@@ -1,8 +1,8 @@
 \input texinfo
 @setfilename tlbuild.info
 
-@set version 2021
-@set month-year January 2022
+@set version 2022
+@set month-year March 2022
 
 @set mytitle Building @TeX{} Live (@value{version})
 @settitle @value{mytitle}
@@ -96,7 +96,6 @@ For an overview of this manual, @pxref{Introduction}.
 @end menu
 @end ifnottex
 
-
 @node Introduction
 @chapter Introduction
 
@@ -148,7 +147,6 @@ to do so.  The same text is available online (linked from
 @url{https://tug.org/texlive/doc.html}, or by invoking the program
 with @samp{--help} (or look at the end of the source).
 
-
 @c The first word of the chapter/section title here is used to
 @c construct the README.* filenames, so choose well.  (Or hack the script.)
 
@@ -210,7 +208,6 @@ All this is for the sake of simplifying both upgrading of modules and
 integrating new modules into the TL build system.  (Despite all
 efforts, neither task is easy.)
 
-
 @node Prerequisites
 @chapter Prerequisites
 
@@ -219,29 +216,45 @@ efforts, neither task is easy.)
 
 @cindex compilers, C and C++11
 Overall, building the @TL{} programs, when using all libraries from
-the TL source tree, requires C and C++11 compilers and GNU
-@code{make}.  If @code{make} from your @code{PATH} is not GNU @code{make,}
-you can set the @code{MAKE} environment variable to whatever is necessary.
+the TL source tree, requires C and C++11 compilers, GNU @code{make},
+and Python.
+
+@itemize
+@item
+If @code{make} from your @code{PATH} is not GNU @code{make}, you can
+set the @code{MAKE} environment variable to whatever is necessary.
 
 @cindex GNU @code{make}, required
 @cindex @code{gmake}, required
-@cindex FreeType
+@cindex FreeType, requires @code{gmake}
 @cindex @code{$@@} target in normal @code{make} rules
-GNU @code{make} is required only because of some third-party
-libraries, notably FreeType; Automake/Autoconf output in general, and
-the TL-maintained directories, work with any reasonable
+GNU @code{make} is required only because of third-party libraries,
+notably FreeType.  Automake/Autoconf output in general, and the
+TL-maintained directories, work with any reasonable
 @code{make}.@footnote{There is one exception in TL: the
 @code{tangle-sh} and related rules use @code{$@@} to mean the target
 name, a feature not present in all @code{make}s. This could be
-alleviated by some laborious editing, but since there's no way to
-avoid GNU @code{make} for the entire tree, it does not seem worth the
+alleviated by laborious editing, but since there's no way to avoid GNU
+@code{make} for builds of the entire tree, it does not seem worth the
 trouble.}
 
+@item
 @cindex C++11, required
+@cindex @code{dvisvgm}, requires C++11
+@cindex HarfBuzz, requires C++11
+@cindex ICU, requires C++11
 A C++11 compiler is similarly required because of the third-party
-library ICU; the program @code{dvisvgm} also requires C++11.  It is
-possible to build everything else with older compilers, but you have
-to remove the C++11-dependent sources.  @xref{Build one package}.
+libraries ICU and HarfBuzz (at least); the program @code{dvisvgm} also
+requires C++11.  It is possible to build what remains with older
+compilers, but you have to remove the C++11-dependent sources.
+@xref{Build one package}.
+
+@item
+@cindex Python, required by ICU
+Python is required by ICU tests.  (If you know how to disable these
+tests and thus eliminate the requirement, please write.)
+
+@end itemize
 
 A few programs in the tree have additional requirements:
 
@@ -249,11 +262,14 @@ A few programs in the tree have additional requirements:
 @item web2c
 @cindex @code{perl}, required by @code{web2c}, etc.
 requires @code{perl} for some tests run by @code{make check}.
+Incidentally, the @TeX{} Live installer (@code{install-tl}) and
+manager (@code{tlmgr}) are also written in Perl, but this does not
+matter for compiling the sources.
 
 @item xdvik
 @itemx xpdfopen
 @cindex X11 development, required by X clients
-require X11 headers and libraries, typically in ``development'' packages
+require X11 headers and libraries, typically in devel(opment) packages
 that are not installed by default.
 
 @item xetex
@@ -261,7 +277,7 @@ that are not installed by default.
 @cindex @code{ApplicationServices} Mac framework, required by @code{xetex}
 @cindex @code{Cocoa} Mac framework, required by @code{xetex}
 requires @file{fontconfig} (again both headers and library), or, for
-MacOSX only, the @code{ApplicationServices} and @code{Cocoa}
+MacOS only, the @code{ApplicationServices} and @code{Cocoa}
 frameworks.
 
 @item xindy
@@ -302,9 +318,8 @@ If you haven't modified any source files, and infrastructure tools
 such as @code{autoconf} or @code{makeinfo} are still being run, check
 your timestamps---notably, @code{use-commit-times} must be set to
 @code{yes} in your Subversion configuration (@pxref{Build system
-tools}).  Barring buggy commits, no infrastructure tools are needed to
-do a normal build.
-
+tools}).  No infrastructure tools are needed to do a normal build
+(barring bugs).
 
 @node Building
 @chapter Building
@@ -333,7 +348,6 @@ Building in the source directory itself is not supported (sorry).
 
 @menu
 * Build iteration::     What @code{configure} and @code{make} do in TL.
-* Build problems::      If the build fails.
 * Build in parallel::   Simultaneous @code{make} processes.
 * Build distribution::  Making a distribution tarball.
 * Build one package::   Example of working on just one program.
@@ -341,7 +355,6 @@ Building in the source directory itself is not supported (sorry).
 * Cross compilation::   Building on host X for target Y.
 @end menu
 
-
 @node Build iteration
 @section Build iteration
 
@@ -374,21 +387,6 @@ Running the top-level @code{make} a second time iterates again over
 all the library and program modules, and finds (should find) nothing
 to be done.
 
-
-@node Build problems
-@section Build problems
-
-@cindex build problems
-@cindex problems with build
-@cindex failure to build
-@vindex --no-clean Build @r{option}
-If configuring or building a module fails, you should first try to
-find and fix the problem.  Failing that, a possible workaround is to
-remove the subdirectory for that module from the build tree (so
-@code{configure} won't try to run there, and finally rerun the top
-level @code{make} (or @file{./Build} @code{--no-clean}).
-
-
 @node Build in parallel
 @section Build in parallel
 
@@ -410,7 +408,6 @@ Incidentally, a noticeable speed-up can be independently gained by
 using a configure cache file, i.e., specifying the @code{configure}
 option @code{-C} (recommended).
 
-
 @node Build distribution
 @section Build distribution
 
@@ -429,7 +426,6 @@ system, since all the support files are lacking; @pxref{Installing}.
 We do not actually distribute any such tarball, and have no plans to
 do so.
 
-
 @node Build one package
 @section Build one package
 
@@ -446,8 +442,8 @@ dependencies and can be invoked to build an individual program or
 library, first building any required libraries.
 
 Here is an example from start to finish for working on
-@code{dvipdfm-x}.  (Unfortunately, this does not suffice for building
-the @TeX{} engines; see the next section.)
+@code{dvipdfm-x}.  Unfortunately, this does not suffice for building
+the @TeX{} engines; see the next section.
 
 @example
 mkdir mydir && cd mydir  # new working directory
@@ -466,11 +462,21 @@ mkdir Work && cd Work
 # Do the make:
 make >&outm || echo fail
 
-# Test:
+# Run the tests:
 cd texk/dvipdfm-x
 make check
+
+# Run the new binary in the buil tree, finding support files
+# in a separate tree for a TeX Live release YYYY
+# (Bourne shell syntax):
+TEXMFROOT=/usr/local/texlive/YYYY \
+TEXMFCNF=$TEXMFROOT/texmf-dist/web2c \
+./xdvipdfmx ...
 @end example
 
+@vindex TEXMFROOT @r{for running standalone}
+@vindex TEXMFCNF @r{for running standalone}
+
 Then you can modify source files in @file{mydir/texk/dvipdfm-x} and
 rerun @code{make} in @file{mydir/Work/texk/dvipdfm-x} to rebuild; that
 build directory is where the binary ends up and where you can run a
@@ -489,8 +495,10 @@ tweak as desired; check the output from @code{configure --help}.  It
 is also a good idea to run @code{make check} after making any changes,
 to ensure that whatever tests have been written still pass.
 
+@subsubheading Reducing source download size
+
 @cindex size of source tree
-Finally, the above retrieves the entire TL source tree (several
+The above retrieves the entire TL source tree (several
 hundred megabytes). It is natural to ask if this is really necessary.
 Strictly speaking, the answer is no, but it is vastly more convenient
 to do so. If you cut down the source tree, you must also give
@@ -502,6 +510,19 @@ in the @code{pdftex} development source (details at
 @url{http://pdftex.org}), which is indeed such a cut-down TL source
 tree.
 
+@subsubheading GCC used by default
+
+@vindex CC=@var{c-compiler}
+@vindex CXX=@var{c++-compiler}
+@vindex OBJCXX=@var{objc-compiler}
+@pindex gcc@r{, default compilers}
+By default, the @code{gcc} compilers will be used if present;
+otherwise, individual packages may use something different.  You can
+explicitly specify the compilers to be used with the environment
+variables @code{CC}, @code{CXX}, and @code{OBJCXX}.
+
+@subsubheading Removing C+11 dependency
+
 @cindex C++11, removing dependent sources
 Some libraries and programs require C++11; one such is XeTeX.  If you
 want to build with an older compiler lacking such support, you need to
@@ -516,23 +537,26 @@ rm -rf libs/icu libs/graphite2 texk/dvisvgm texk/web2c/xetexdir
 
 @vindex --enable-missing @r{to ignore dependencies}
 Also, even with @code{--disable-all-pkgs}, dependencies are (currently)
-checked.  One notable case: if a (non-MacOSX) system does not have
+checked.  One notable case: if a (non-MacOS) system does not have
 @code{fontconfig}, Xe@TeX{} cannot be built (@pxref{Prerequisites}),
 and @code{configure} will terminate even with @code{--disable-xetex}.
 To proceed without such dependencies, specify @code{--enable-missing}
 also.
 
-Patches to improve all this would be most welcome.
+As of 2022, HarfBuzz also requires C++11.  Therefore even more would
+have to be disabled and removed, notably including @code{luahbtex},
+the standard engine used for Lua@LaTeX{}.  Removing that would not
+be acceptable for builds intended for distribution; but perhaps for
+testing the above information could still be useful.
 
-@vindex CC=@var{c-compiler}
-@vindex CXX=@var{c++-compiler}
-@vindex OBJCXX=@var{objc-compiler}
-@pindex gcc@r{, default compilers}
-By default, the @code{gcc} compilers will be used if present;
-otherwise, individual packages may use something different.  You can
-explicitly specify the compilers to be used with the environment
-variables @code{CC}, @code{CXX}, and @code{OBJCXX}.
+@cindex removing build directories
+@cindex @code{configure} problems, work around by removing
+In general, the TL @code{configure} will run in all directories.
+Therefore a general workaround for build problems is to remove failing
+directories from the tree, and also specify the relevant
+@code{--disable-...} option(s).
 
+Patches to improve all this would be most welcome.
 
 @node Build one engine
 @section Build one engine
@@ -576,8 +600,35 @@ accordingly. Either @code{../Build} or @code{../configure} can be run.
 Then it is necessary to again specify the target engine (@code{tex},
 in the above) in the @code{make}.
 
-All this is somewhat unfortunate.  We hope to improve the situation in
-the future.  Patches are welcome.
+All these complications are rather unfortunate.  Patches are welcome.
+
+@subsubheading Testing one engine
+
+To run only the tests for a given engine, say @code{hitex}:
+
+@example
+make -C $ww check SUBDIRS=. TESTS='$(hitex_tests)' 
+@end example
+
+@noindent where @code{$ww} is the web2c build directory, that is,
+@file{ww=/wherever/Build/source/Work/texk/web2c}.
+
+It's also possible to run individual tests the same way, using the test
+name exactly as specified in the @file{.am} file:
+
+@example
+make -C $ww check SUBDIRS=. TESTS=hitexdir/tests/hello.test
+@end example
+
+@vindex --no-print-directory @r{GNU make option}
+If you get tired of looking at the @samp{Entering}/@samp{Leaving
+directory} lines, you can add the (GNU) make option
+@code{--no-print-dir}.
+
+You may find it useful to put lengthy incantations like this into a
+trivial shell script with a short name (say, @code{hitst}).  Then you
+just run @code{hitst} and edit the file when necessary to change
+things around.
 
 @node Cross compilation
 @section Cross compilation
@@ -600,7 +651,7 @@ name, but note that this should @emph{not} be @code{--host=@var{host}}
 (@pxref{Hosts and Cross-Compilation,,, autoconf, GNU Autoconf}).
 
 In order to build, e.g., 32-bit binaries with @command{clang} on a 64-bit
-MacOSX system one could use:
+MacOS system one could use:
 
 @example
 TL_BUILD_ENV="CC='clang -arch i386' \
@@ -727,7 +778,6 @@ and @file{tie}.
 Building @code{xindy} requires running the host system @code{clisp}
 binary, thus cross compilation is painful, but possible.
 
-
 @node Installing
 @chapter Installing
 
@@ -757,7 +807,6 @@ at @url{https://tug.org/texlive/distro.html}.
 * Distro builds::               Configuring and building for OS distributions.
 @end menu
 
-
 @node Installation directories
 @section Installation directories
 
@@ -817,7 +866,6 @@ not directly usable from that location; they need to be copied to
 @file{Master/bin/@var{tl-platform}}.  The other files and directories
 that end up in @file{./inst/} are ignored.
 
-
 @node Linked scripts
 @section Linked scripts
 
@@ -858,7 +906,6 @@ want to add more.  (See @url{https://tug.org/texlive/build.html} for
 information about building those exceptions, as well as the @code{xz}
 and @code{wget} programs that are used in the TL infrastructure.)
 
-
 @node Distro builds
 @section Distro builds
 
@@ -931,7 +978,6 @@ has written a detailed article on adapting TL for distros:
 article needs updating in the future, perhaps we will merge it into
 this document.)
 
-
 @node Layout and infrastructure
 @chapter Layout and infrastructure
 
@@ -953,7 +999,6 @@ files.
 * Extending @TL{}::         Adding a new module.
 @end menu
 
-
 @node Build system tools
 @section Build system tools
 
@@ -1012,7 +1057,6 @@ to @code{touch} first @file{aclocal.m4}, then @file{configure} and
 @file{config.h.in} (or @file{c-auto.in}), and finally all
 @file{Makefile.in} files.
 
-
 @node Top-level directories
 @section Top-level directories
 
@@ -1068,7 +1112,6 @@ These names (and everything else about @file{Build}'s operation) can
 be changed by setting environment variables before running it; see the
 script source.
 
-
 @node Autoconf macros
 @section Autoconf macros
 
@@ -1130,7 +1173,6 @@ headers, types, and structures.  This is used for @TeX{}-specific
 modules.
 @end defmac
 
-
 @node Macros for programs
 @subsection Macros for programs
 
@@ -1158,7 +1200,6 @@ Check for @code{perl} or @code{perl5} in @code{PATH} and set
 Call @code{AC_PROG_LEX} and add the flag @code{-l} for @code{flex}.
 @end defmac
 
-
 @node Macros for compilers
 @subsection Macros for compilers
 
@@ -1205,7 +1246,6 @@ binary.
 This macro caches its result in the @code{kpse_cv_cxx_hack} variable.
 @end defmac
 
-
 @node Macros for libraries
 @subsection Macros for libraries
 
@@ -1218,7 +1258,6 @@ suitable @code{-D} flags (optionally including
 @code{-D@var{extra-define}}) to @var{variable}.
 @end defmac
 
-
 @node Macros for library and header flags
 @subsection Macros for library and header flags
 
@@ -1287,7 +1326,6 @@ KPSE_ADD_FLAGS([libpng])
 KPSE_RESTORE_FLAGS # @r{restore @code{CPPFLAGS} and @code{LIBS}}
 @end example
 
-
 @node Macros for Windows
 @subsection Macros for Windows
 
@@ -1338,7 +1376,6 @@ as @code{@var{bar}.exe} is used on Windows instead of a symlink
 @code{@var{bar}->@var{foo}} for Unix-like systems.
 @end defmac
 
-
 @node Library modules
 @section Library modules
 
@@ -1426,7 +1463,6 @@ for the @code{make} rules to rebuild the library.
 @code{--with-system-libpng}, which then uses @code{pkg-config} to
 determine the flags required for the system library.
 
-
 @node @code{zlib} library
 @subsection The @code{zlib} library in @file{libs/zlib}
 
@@ -1440,7 +1476,6 @@ without the dependency on any other library.  The file
 @code{--with-zlib-libdir} to specify non-standard locations of the
 @code{zlib} headers and/or library.
 
-
 @node @code{freetype} library
 @subsection The @code{freetype} library in @file{libs/freetype2}
 
@@ -1459,7 +1494,6 @@ other words, this actually uses the build system provided by upstream
 The flags required for the system library are obtained through
 @code{freetype-config}.
 
-
 @node @code{kpathsea} library
 @subsection The @code{kpathsea} library in @file{texk/kpathsea}
 
@@ -1495,7 +1529,6 @@ however, the command line options @code{-mktex=tfm} or
 @code{-no-mktex=tfm} for the @TeX{}-like engines override this
 default.
 
-
 @node Program modules
 @section Program modules
 
@@ -1511,7 +1544,6 @@ details for a few of the programs in TL.
 * @code{asymptote}::       @file{utils/asymptote}
 @end menu
 
-
 @node @code{t1utils} package
 @subsection The @code{t1utils} package in @file{utils/t1utils}
 
@@ -1529,7 +1561,6 @@ KPSE_ENABLE_PROG([t1utils])
 @noindent specifying the module name without any dependencies, and
 supplies the configure option @code{--disable-t1utils}.
 
-
 @node @code{xindy} package
 @subsection The @code{xindy} package in @file{utils/xindy}
 
@@ -1560,7 +1591,6 @@ The additional fragments @file{ac/xindy.ac} and @file{ac/clisp.ac}
 specify more @code{configure} options to be seen at the top level,
 with @file{ac/xindy.ac} also included by @file{configure.ac}.
 
-
 @node @code{xdvik} package
 @subsection The @code{xdvik} package in @file{texk/xdvik}
 
@@ -1591,7 +1621,6 @@ The additional fragment @code{ac/xdvik.ac} is also included by
 @file{configure.ac} and supplies the configure option
 @code{--with-xdvi-x-toolkit} also seen at the top level.
 
-
 @node @code{asymptote}
 @subsection The subdirectory @file{utils/asymptote}
 
@@ -1603,8 +1632,7 @@ This subdirectory contains the sources for @file{asy} and @file{xasy}
 but due to its complexity and prerequisites (e.g., OpenGL) it is
 not part of the TL build system.  These programs must be built and
 installed independently, but are included on the TL DVD together with
-their support files.  See @url{https://tug.org/build.html#asymptote}.
-
+their support files.  See @url{https://tug.org/texlive/build.html#asymptote}.
 
 @node Extending @TL{}
 @section Extending @TL{}
@@ -1630,7 +1658,6 @@ Please maintain @file{foo/ChangeLog} for all TL changes.
 * Adding a new @TeX{}-specific library module::
 @end menu
 
-
 @node Adding a new program module
 @subsection Adding a new program module
 
@@ -1854,7 +1881,6 @@ definition of the M4 macro @code{KPSE_ALL_SYSTEM_FLAGS} in
 @file{m4/kpse-pkgs.m4} must be extended by the line:@*@ @ @
 @code{AC_REQUIRE([KPSE_@var{LIB}_SYSTEM_FLAGS])}
 
-
 @node Adding a new @TeX{}-specific library module
 @subsection Adding a new @TeX{}-specific library module
 
@@ -1879,7 +1905,6 @@ The library name @code{@var{lib}} is added to the M4 macro
 The fragment @code{ac/withenable.ac} must use @code{KPSE_WITH_TEXLIB}.
 @end itemize
 
-
 @node Configure options
 @chapter Configure options
 
@@ -1916,7 +1941,6 @@ line are checked for consistency but never modified.
 * Variables for configure::
 @end menu
 
-
 @node Global configure options
 @section Global configure options
 
@@ -1939,7 +1963,6 @@ Here are the global configure options.
 * @code{--without-x}::
 @end menu
 
-
 @node @code{--disable-native-texlive-build}
 @subsection @code{--disable-native-texlive-build}
 
@@ -1962,7 +1985,6 @@ that can also be built independently from the TL tree (such as
 use this option to enable TL-specific adaptations, such as
 installation paths.
 
-
 @node @code{--prefix} @code{--bindir} @dots{}
 @subsection @code{--prefix}, @code{--bindir}, @dots{}
 
@@ -1977,7 +1999,6 @@ Also as usual, all values are prefixed by the value of @code{DESTDIR},
 if set, on the @code{make} command line (@pxref{Staged Installs, ,
 Installation in a temporary location, automake, GNU Automake}).
 
-
 @node @code{--disable-largefile}
 @subsection @code{--disable-largefile}
 
@@ -1995,7 +2016,6 @@ to the file format specifications.
 With LFS, there is no fixed limit on the size of PDF files created by
 @file{pdftex} or PostScript files created by @file{dvips}.
 
-
 @node @code{--disable-missing}
 @subsection @code{--disable-missing}
 
@@ -2004,7 +2024,6 @@ Immediately terminate the build process if a requested program or feature
 must be disabled, e.g., due to missing libraries.  This can help when
 figuring out a specific (sub)set of modules to enable.
 
-
 @node @code{--enable-compiler-warnings=}@var{level}
 @subsection @code{--enable-compiler-warnings=}@var{level}
 
@@ -2017,7 +2036,6 @@ variables @code{WARNING_[OBJ]C[XX]FLAGS}, but these variables are not
 consistently used in all library and program modules.  At present,
 these warning flags assume options from the GNU compilers.
 
-
 @node @code{--enable-cxx-runtime-hack}
 @subsection @code{--enable-cxx-runtime-hack}
 
@@ -2025,7 +2043,6 @@ If enabled (as it is for the native TL build), when using @code{g++},
 try to statically link with @code{libstdc++}, thus improving
 portability of the resulting binary.  @xref{Macros for compilers}.
 
-
 @node @code{--enable-maintainer-mode}
 @subsection @code{--enable-maintainer-mode}
 
@@ -2036,7 +2053,6 @@ GNU build tools (@pxref{Build system tools}), as it automatically
 rebuilds infrastructure files as needed.  @xref{maintainer-mode,,
 @code{missing} and @code{AM_MAINTAINER_MODE}, automake, GNU Automake}.
 
-
 @node @code{--enable-multiplatform}
 @subsection @code{--enable-multiplatform}
 
@@ -2053,7 +2069,6 @@ implied for @code{exec_prefix}.  In any case, the values for
 @code{bindir} and @code{libdir} are automatically propagated to all
 subdirectories.
 
-
 @node @code{--enable-shared}
 @subsection @code{--enable-shared}
 
@@ -2062,7 +2077,6 @@ Build shared versions of the @TeX{}-specific libraries such as
 @file{libkpathsea}.  This is not allowed for a native TL build (i.e.,
 @code{--disable-native-texlive-build} must also be specified).
 
-
 @node @code{--enable-silent-rules}
 @subsection @code{--enable-silent-rules}
 
@@ -2074,7 +2088,6 @@ variable expansions), you can specify @code{V=1} on the @code{make}
 command line to get more verbosity, or @code{V=0} to get less,
 regardless of this option.
 
-
 @node @code{--without-ln-s}
 @subsection @code{--without-ln-s}
 
@@ -2083,14 +2096,12 @@ Required when using a system without a working @code{ln -s} to build
 binaries for a Unix-like system.  However, @code{make install} will
 not create anything useful, and might fail.
 
-
 @node @code{--without-x}
 @subsection @code{--without-x}
 
 @vindex --without-x
 Disable all programs using the X Window System.
 
-
 @node Program-specific configure options
 @section Program-specific configure options
 
@@ -2110,7 +2121,6 @@ Here are (some of) the program-specific @code{configure} options.
 * Configure options for @file{utils/xindy}::
 @end menu
 
-
 @node @code{--enable-@var{prog}} @code{--disable-@var{prog}}
 @subsection @code{--enable-@var{prog}}, @code{--disable-@var{prog}}
 
@@ -2118,7 +2128,6 @@ Here are (some of) the program-specific @code{configure} options.
 @vindex --disable-@var{prog}
 Do or do not build and install the program(s) of module @code{@var{prog}}.
 
-
 @node @code{--disable-all-pkgs}
 @subsection @code{--disable-all-pkgs}
 
@@ -2134,7 +2143,6 @@ Without this option, all modules are built except those that are
 explicitly disabled or specify @code{disable} in their
 @file{ac/withenable.ac} fragment.
 
-
 @node Configure options for @file{texk/web2c}
 @subsection Configure options for @file{texk/web2c}
 
@@ -2231,7 +2239,6 @@ support; ignored for a native @TL{} build.  Defaults are defined in
 @noindent @code{--disable-synctex}
 @*Do not build the @code{SyncTeX} library and tool.
 
-
 @node Configure options for @file{texk/bibtex-x}
 @subsection Configure options for @file{texk/bibtex-x}
 
@@ -2249,7 +2256,6 @@ module @code{bibtex-x} (extended Bib@TeX{}).
 @noindent @code{--disable-bibtexu}@*Do not build the @file{bibtexu} program
 (building @file{bibtexu} requires @code{ICU} libraries).
 
-
 @node Configure options for @file{texk/dvipdfm-x}
 @subsection Configure options for @file{texk/dvipdfm-x}
 
@@ -2273,7 +2279,6 @@ program or make the @file{dvipdfm} symlink.
 @noindent @code{--disable-xdvipdfmx}@*Do not build the @file{xdvipdfmx}
 program.
 
-
 @node Configure options for @file{texk/dvisvgm}
 @subsection Configure options for @file{texk/dvisvgm}
 
@@ -2297,7 +2302,6 @@ incompatibilities, e.g., on CentOS 5.
 @code{--with-libgs-libdir=@var{dir}}@*Specify non-standard locations
 of the Ghostscript headers and library.
 
-
 @node Configure options for @file{texk/texlive}
 @subsection Configure options for @file{texk/texlive}
 
@@ -2307,7 +2311,6 @@ of the Ghostscript headers and library.
 scripts'' (@pxref{Linked scripts}), except for the TL scripts required
 to run @code{texlinks}.
 
-
 @node Configure options for @file{texk/xdvik}
 @subsection Configure options for @file{texk/xdvik}
 
@@ -2332,7 +2335,6 @@ neXtaw}.  The default is @code{motif} if available, else @code{xaw}.
 @noindent @code{--enable-xi2-scrolling}@*Use XInput 2.1 ``smooth scrolling''
 if available (default: yes, except for a native TL build).
 
-
 @node Configure options for @file{utils/xindy}
 @subsection Configure options for @file{utils/xindy}
 
@@ -2359,7 +2361,6 @@ build, but the default otherwise) indicates that @file{xindy} will use
 the installed version of @file{clisp} (which must be identical to the
 one used to build @file{xindy}).
 
-
 @node Library-specific configure options
 @section Library-specific configure options
 
@@ -2473,7 +2474,6 @@ commands used, e.g., to build the @code{xindy} documentation.
 
 @end vtable
 
-
 @node Coding conventions
 @chapter Coding conventions
 
@@ -2494,7 +2494,6 @@ other packages whose maintainers are willing to accept patches.
 * Const::
 @end menu
 
-
 @node Declarations and definitions
 @section Declarations and definitions
 
@@ -2607,7 +2606,6 @@ them.  Therefore such casts should be avoided whenever possible and
 otherwise must be carefully analyzed to make sure that they cannot
 cause the modification of quantities supposed to be constant.
 
-
 @node Continuous integration
 @chapter Continuous integration
 
@@ -2628,7 +2626,6 @@ commit pushed is tested on Travis-CI.
 * Releases on Github::
 @end menu
 
-
 @node Transfer from Subversion to Github
 @section Transfer from Subversion to Github
 
diff --git a/source/libs/Makefile.in b/source/libs/Makefile.in
index c81bc8f0859771df91d500cddaf6c5630dc37455..80c1ed5aa4ece99046bdb27e37298ed710071f8c 100644
--- a/source/libs/Makefile.in
+++ b/source/libs/Makefile.in
@@ -89,35 +89,107 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
+	$(top_srcdir)/../m4/kpse-common.m4 \
 	$(top_srcdir)/../m4/kpse-cxx-hack.m4 \
+	$(top_srcdir)/../m4/kpse-freetype2-flags.m4 \
+	$(top_srcdir)/../m4/kpse-gd-flags.m4 \
+	$(top_srcdir)/../m4/kpse-gmp-flags.m4 \
 	$(top_srcdir)/../m4/kpse-graphite2-flags.m4 \
 	$(top_srcdir)/../m4/kpse-harfbuzz-flags.m4 \
+	$(top_srcdir)/../m4/kpse-icu-flags.m4 \
 	$(top_srcdir)/../m4/kpse-kpathsea-flags.m4 \
+	$(top_srcdir)/../m4/kpse-libpaper-flags.m4 \
 	$(top_srcdir)/../m4/kpse-libpng-flags.m4 \
 	$(top_srcdir)/../m4/kpse-lt-hack.m4 \
 	$(top_srcdir)/../m4/kpse-mktex.m4 \
+	$(top_srcdir)/../m4/kpse-mpfr-flags.m4 \
 	$(top_srcdir)/../m4/kpse-options.m4 \
+	$(top_srcdir)/../m4/kpse-pixman-flags.m4 \
 	$(top_srcdir)/../m4/kpse-pkgs.m4 \
+	$(top_srcdir)/../m4/kpse-ptexenc-flags.m4 \
 	$(top_srcdir)/../m4/kpse-setup.m4 \
+	$(top_srcdir)/../m4/kpse-teckit-flags.m4 \
 	$(top_srcdir)/../m4/kpse-warnings.m4 \
 	$(top_srcdir)/../m4/kpse-web2c.m4 \
 	$(top_srcdir)/../m4/kpse-win32.m4 \
+	$(top_srcdir)/../m4/kpse-xpdf-flags.m4 \
 	$(top_srcdir)/../m4/kpse-zlib-flags.m4 \
 	$(top_srcdir)/../m4/kpse-zziplib-flags.m4 \
 	$(top_srcdir)/../version.ac \
+	$(top_srcdir)/../utils/autosp/ac/withenable.ac \
+	$(top_srcdir)/../utils/axodraw2/ac/withenable.ac \
+	$(top_srcdir)/../utils/devnag/ac/withenable.ac \
+	$(top_srcdir)/../utils/lacheck/ac/withenable.ac \
+	$(top_srcdir)/../utils/m-tx/ac/withenable.ac \
+	$(top_srcdir)/../utils/pmx/ac/withenable.ac \
+	$(top_srcdir)/../utils/ps2eps/ac/withenable.ac \
+	$(top_srcdir)/../utils/t1utils/ac/withenable.ac \
+	$(top_srcdir)/../utils/texdoctk/ac/withenable.ac \
+	$(top_srcdir)/../utils/tpic2pdftex/ac/withenable.ac \
+	$(top_srcdir)/../utils/vlna/ac/withenable.ac \
+	$(top_srcdir)/../utils/xindy/ac/withenable.ac \
+	$(top_srcdir)/../utils/xindy/ac/xindy.ac \
+	$(top_srcdir)/../utils/xindy/ac/clisp.ac \
+	$(top_srcdir)/../utils/xml2pmx/ac/withenable.ac \
+	$(top_srcdir)/../utils/xpdfopen/ac/withenable.ac \
 	$(top_srcdir)/../texk/web2c/ac/withenable.ac \
 	$(top_srcdir)/../texk/web2c/ac/web2c.ac \
+	$(top_srcdir)/../texk/afm2pl/ac/withenable.ac \
+	$(top_srcdir)/../texk/bibtex-x/ac/withenable.ac \
+	$(top_srcdir)/../texk/bibtex-x/ac/bibtex-x.ac \
+	$(top_srcdir)/../texk/chktex/ac/withenable.ac \
+	$(top_srcdir)/../texk/cjkutils/ac/withenable.ac \
+	$(top_srcdir)/../texk/detex/ac/withenable.ac \
+	$(top_srcdir)/../texk/dtl/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvi2tty/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvidvi/ac/withenable.ac \
+	$(top_srcdir)/../texk/dviljk/ac/withenable.ac \
+	$(top_srcdir)/../texk/dviout-util/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvipdfm-x/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvipng/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvipng/ac/dvipng.ac \
+	$(top_srcdir)/../texk/dvipos/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvipsk/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvisvgm/ac/withenable.ac \
+	$(top_srcdir)/../texk/gregorio/ac/withenable.ac \
+	$(top_srcdir)/../texk/gsftopk/ac/withenable.ac \
+	$(top_srcdir)/../texk/lcdf-typetools/ac/withenable.ac \
+	$(top_srcdir)/../texk/lcdf-typetools/ac/lcdf-typetools.ac \
+	$(top_srcdir)/../texk/makeindexk/ac/withenable.ac \
+	$(top_srcdir)/../texk/makejvf/ac/withenable.ac \
+	$(top_srcdir)/../texk/mendexk/ac/withenable.ac \
+	$(top_srcdir)/../texk/musixtnt/ac/withenable.ac \
+	$(top_srcdir)/../texk/ps2pk/ac/withenable.ac \
+	$(top_srcdir)/../texk/psutils/ac/withenable.ac \
+	$(top_srcdir)/../texk/seetexk/ac/withenable.ac \
+	$(top_srcdir)/../texk/tex4htk/ac/withenable.ac \
+	$(top_srcdir)/../texk/ttf2pk2/ac/withenable.ac \
+	$(top_srcdir)/../texk/ttfdump/ac/withenable.ac \
+	$(top_srcdir)/../texk/upmendex/ac/withenable.ac \
+	$(top_srcdir)/../texk/xdvik/ac/withenable.ac \
+	$(top_srcdir)/../texk/xdvik/ac/xdvik.ac \
 	$(top_srcdir)/../texk/texlive/ac/withenable.ac \
 	$(top_srcdir)/../texk/texlive/ac/texlive.ac \
 	$(top_srcdir)/../libs/pplib/ac/withenable.ac \
 	$(top_srcdir)/../libs/harfbuzz/ac/withenable.ac \
+	$(top_srcdir)/../libs/icu/ac/withenable.ac \
+	$(top_srcdir)/../libs/teckit/ac/withenable.ac \
 	$(top_srcdir)/../libs/graphite2/ac/withenable.ac \
 	$(top_srcdir)/../libs/zziplib/ac/withenable.ac \
+	$(top_srcdir)/../libs/xpdf/ac/withenable.ac \
+	$(top_srcdir)/../libs/mpfr/ac/withenable.ac \
+	$(top_srcdir)/../libs/gmp/ac/withenable.ac \
+	$(top_srcdir)/../libs/cairo/ac/withenable.ac \
+	$(top_srcdir)/../libs/pixman/ac/withenable.ac \
+	$(top_srcdir)/../libs/gd/ac/withenable.ac \
+	$(top_srcdir)/../libs/freetype2/ac/withenable.ac \
 	$(top_srcdir)/../libs/libpng/ac/withenable.ac \
+	$(top_srcdir)/../libs/libpaper/ac/withenable.ac \
 	$(top_srcdir)/../libs/luajit/ac/withenable.ac \
 	$(top_srcdir)/../libs/lua53/ac/withenable.ac \
 	$(top_srcdir)/../libs/zlib/ac/withenable.ac \
+	$(top_srcdir)/../texk/ptexenc/ac/withenable.ac \
 	$(top_srcdir)/../texk/kpathsea/ac/withenable.ac \
 	$(top_srcdir)/../texk/kpathsea/ac/mktex.ac \
 	$(top_srcdir)/configure.ac
diff --git a/source/libs/aclocal.m4 b/source/libs/aclocal.m4
index 235bab8fa455f966cf5afd17303da261d91ed013..aad8d747bf7a108fdc79465eff1f8b52c3d27af7 100644
--- a/source/libs/aclocal.m4
+++ b/source/libs/aclocal.m4
@@ -1184,19 +1184,30 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([../m4/kpse-cairo-flags.m4])
 m4_include([../m4/kpse-common.m4])
 m4_include([../m4/kpse-cxx-hack.m4])
+m4_include([../m4/kpse-freetype2-flags.m4])
+m4_include([../m4/kpse-gd-flags.m4])
+m4_include([../m4/kpse-gmp-flags.m4])
 m4_include([../m4/kpse-graphite2-flags.m4])
 m4_include([../m4/kpse-harfbuzz-flags.m4])
+m4_include([../m4/kpse-icu-flags.m4])
 m4_include([../m4/kpse-kpathsea-flags.m4])
+m4_include([../m4/kpse-libpaper-flags.m4])
 m4_include([../m4/kpse-libpng-flags.m4])
 m4_include([../m4/kpse-lt-hack.m4])
 m4_include([../m4/kpse-mktex.m4])
+m4_include([../m4/kpse-mpfr-flags.m4])
 m4_include([../m4/kpse-options.m4])
+m4_include([../m4/kpse-pixman-flags.m4])
 m4_include([../m4/kpse-pkgs.m4])
+m4_include([../m4/kpse-ptexenc-flags.m4])
 m4_include([../m4/kpse-setup.m4])
+m4_include([../m4/kpse-teckit-flags.m4])
 m4_include([../m4/kpse-warnings.m4])
 m4_include([../m4/kpse-web2c.m4])
 m4_include([../m4/kpse-win32.m4])
+m4_include([../m4/kpse-xpdf-flags.m4])
 m4_include([../m4/kpse-zlib-flags.m4])
 m4_include([../m4/kpse-zziplib-flags.m4])
diff --git a/source/libs/configure b/source/libs/configure
index ddfecefac97e0174540334f673ecb3bf31bf7ae7..48c0018cfd0d7e7b32c631875288a91444e28d76 100755
--- a/source/libs/configure
+++ b/source/libs/configure
@@ -729,6 +729,23 @@ enable_native_texlive_build
 enable_multiplatform
 enable_cxx_runtime_hack
 enable_libtool_hack
+enable_autosp
+enable_axodraw2
+enable_devnag
+enable_lacheck
+enable_m_tx
+enable_pmx
+enable_ps2eps
+enable_t1utils
+enable_texdoctk
+enable_tpic2pdftex
+enable_vlna
+enable_xindy
+enable_xindy_rules
+enable_xindy_docs
+with_clisp_runtime
+enable_xml2pmx
+enable_xpdfopen
 enable_web2c
 with_banner_add
 with_editor
@@ -777,15 +794,81 @@ enable_tektronixwin
 enable_unitermwin
 enable_web_progs
 enable_synctex
+enable_afm2pl
+enable_bibtex_x
+enable_bibtex8
+enable_bibtexu
+enable_chktex
+enable_cjkutils
+enable_detex
+enable_dtl
+enable_dvi2tty
+enable_dvidvi
+enable_dviljk
+enable_dviout_util
+enable_dvipdfm_x
+enable_dvipng
+enable_debug
+enable_timing
+with_gs
+enable_dvipos
+enable_dvipsk
+enable_dvisvgm
+enable_gregorio
+enable_gsftopk
+enable_lcdf_typetools
+enable_cfftot1
+enable_mmafm
+enable_mmpfb
+enable_otfinfo
+enable_otftotfm
+enable_t1dotlessj
+enable_t1lint
+enable_t1rawafm
+enable_t1reencode
+enable_t1testpage
+enable_ttftotype42
+enable_updmap
+enable_makeindexk
+enable_makejvf
+enable_mendexk
+enable_musixtnt
+enable_ps2pk
+enable_psutils
+enable_seetexk
+enable_tex4htk
+enable_ttf2pk2
+enable_ttfdump
+enable_upmendex
+enable_xdvik
+with_xdvi_x_toolkit
 enable_texlive
 enable_linked_scripts
 with_system_harfbuzz
+with_system_icu
+with_system_teckit
 with_system_graphite2
 with_system_zziplib
+with_system_mpfr
+with_mpfr_includes
+with_mpfr_libdir
+with_system_gmp
+with_gmp_includes
+with_gmp_libdir
+with_system_cairo
+with_system_pixman
+with_system_gd
+with_gd_includes
+with_gd_libdir
+with_system_freetype2
 with_system_libpng
+with_system_libpaper
+with_libpaper_includes
+with_libpaper_libdir
 with_system_zlib
 with_zlib_includes
 with_zlib_libdir
+with_system_ptexenc
 with_system_kpathsea
 enable_mktexmf_default
 enable_mktexpk_default
@@ -1443,6 +1526,22 @@ Optional Features:
                           lib/PLATFORM
   --enable-cxx-runtime-hack  link C++ runtime statically
   --enable-libtool-hack   ignore libtool dependency_libs
+  --disable-autosp        do not build the autosp package
+  --disable-axodraw2      do not build the axodraw2 package
+  --disable-devnag        do not build the devnag package
+  --disable-lacheck       do not build the lacheck package
+  --disable-m-tx          do not build the m-tx package
+  --disable-pmx           do not build the pmx package
+  --disable-ps2eps        do not build the ps2eps package
+  --disable-t1utils       do not build the t1utils package
+  --disable-texdoctk      do not build the texdoctk package
+  --disable-tpic2pdftex   do not build the tpic2pdftex package
+  --disable-vlna          do not build the vlna package
+  --enable-xindy          build the xindy package
+  --enable-xindy-rules      build and install make-rules package
+  --enable-xindy-docs       build and install documentation
+  --disable-xml2pmx       do not build the xml2pmx package
+  --disable-xpdfopen      do not build the xpdfopen package
   --disable-web2c         do not build the web2c (TeX & Co.) package
   --enable-auto-core        cause TeX&MF to dump core, given a certain
                             filename
@@ -1491,6 +1590,57 @@ Optional Features:
   --enable-unitermwin         include Uniterm window support
   --disable-web-progs       do not build WEB programs bibtex ... weave
   --disable-synctex         do not build the SyncTeX library and tool
+  --disable-afm2pl        do not build the afm2pl package
+  --disable-bibtex-x      do not build the bibtex-x package
+  --disable-bibtex8         do not build the bibtex8 program
+  --disable-bibtexu         do not build the bibtexu program
+  --disable-chktex        do not build the chktex package
+  --disable-cjkutils      do not build the cjkutils package
+  --disable-detex         do not build the detex package
+  --disable-dtl           do not build the dtl package
+  --disable-dvi2tty       do not build the dvi2tty package
+  --disable-dvidvi        do not build the dvidvi package
+  --disable-dviljk        do not build the dviljk package
+  --disable-dviout-util   do not build the dviout-util package
+  --disable-dvipdfm-x     do not build the dvipdfm-x package
+  --disable-dvipng        do not build the dvipng package
+  --disable-debug           Compile without debug (-d) option
+  --enable-timing           Output execution time of dvipng
+  --disable-dvipos        do not build the dvipos package
+  --disable-dvipsk        do not build the dvipsk package
+  --disable-dvisvgm       do not build the dvisvgm package
+  --disable-gregorio      do not build the gregorio package
+  --disable-gsftopk       do not build the gsftopk package
+  --disable-lcdf-typetools
+                          do not build the lcdf-typetools package
+  --disable-cfftot1         do not build the cfftot1 program
+  --disable-mmafm           do not build the mmafm program
+  --disable-mmpfb           do not build the mmpfb program
+  --disable-otfinfo         do not build the otfinfo program
+  --disable-otftotfm        do not build the otftotfm program
+  --disable-t1dotlessj      do not build the t1dotlessj program
+  --disable-t1lint          do not build the t1lint program
+  --disable-t1rawafm        do not build the t1rawafm program
+  --disable-t1reencode      do not build the t1reencode program
+  --disable-t1testpage      do not build the t1testpage program
+  --disable-ttftotype42     do not build the ttftotype42 program
+  --disable-auto-cfftot1    disable running cfftot1 from otftotfm
+  --disable-auto-t1dotlessj disable running t1dotlessj from otftotfm
+  --disable-auto-ttftotype42
+                            disable running ttftotype42 from otftotfm
+  --disable-auto-updmap     disable running updmap from otftotfm
+  --disable-makeindexk    do not build the makeindexk package
+  --disable-makejvf       do not build the makejvf package
+  --disable-mendexk       do not build the mendexk package
+  --disable-musixtnt      do not build the musixtnt package
+  --disable-ps2pk         do not build the ps2pk package
+  --disable-psutils       do not build the psutils package
+  --disable-seetexk       do not build the seetexk package
+  --disable-tex4htk       do not build the tex4htk package
+  --disable-ttf2pk2       do not build the ttf2pk2 package
+  --disable-ttfdump       do not build the ttfdump package
+  --disable-upmendex      do not build the upmendex package
+  --disable-xdvik         do not build the xdvik package
   --disable-texlive       do not build the texlive (TeX Live scripts) package
   --disable-linked-scripts  do not install the linked scripts
   --disable-mktexmf-default   do not run mktexmf if MF source missing
@@ -1516,22 +1666,57 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-clisp-runtime=PATH
+                          pathname of clisp runtime to install for `xindy',
+                          `default' to derive from clisp, or `system' to use
+                          installed version
   --with-banner-add=STR   add STR to version string appended to banner lines
   --with-editor=CMD       invoke CMD from the `e' option [vi +%d '%s'] or
                           [texworks --position=%d "%s"]
   --with-mf-x-toolkit     use X toolkit for METAFONT
+  --with-gs=/PATH/TO/gs   Hard-wire the location of GhostScript
+  --with-xdvi-x-toolkit=KIT
+                          Use toolkit KIT (xaw/motif/xaw3d/neXtaw) for xdvi
+                          [default: Xaw]
   --with-system-harfbuzz  use installed harfbuzz headers and library (requires
                           pkg-config)
+  --with-system-icu       use installed ICU headers and libraries (requires
+                          pkg-config or icu-config)
+  --with-system-teckit    use installed teckit headers and library (requires
+                          pkg-config)
   --with-system-graphite2 use installed graphite2 headers and library
                           (requires pkg-config)
   --with-system-zziplib   use installed zziplib headers and library (requires
                           pkg-config)
+  --with-system-mpfr      use installed mpfr headers and library
+  --with-mpfr-includes=DIR
+                          mpfr headers installed in DIR
+  --with-mpfr-libdir=DIR  mpfr library installed in DIR
+  --with-system-gmp       use installed gmp headers and library
+  --with-gmp-includes=DIR gmp headers installed in DIR
+  --with-gmp-libdir=DIR   gmp library installed in DIR
+  --with-system-cairo     use installed cairo headers and library (requires
+                          pkg-config)
+  --with-system-pixman    use installed pixman headers and library (requires
+                          pkg-config)
+  --with-system-gd        use installed gd headers and library
+  --with-gd-includes=DIR  gd headers installed in DIR
+  --with-gd-libdir=DIR    gd library installed in DIR
+  --with-system-freetype2 use installed freetype2 headers and library
+                          (requires freetype-config)
   --with-system-libpng    use installed libpng headers and library (requires
                           pkg-config)
+  --with-system-libpaper  use installed libpaper headers and library
+  --with-libpaper-includes=DIR
+                          libpaper headers installed in DIR
+  --with-libpaper-libdir=DIR
+                          libpaper library installed in DIR
   --with-system-zlib      use installed zlib headers and library
   --with-zlib-includes=DIR
                           zlib headers installed in DIR
   --with-zlib-libdir=DIR  zlib library installed in DIR
+  --with-system-ptexenc   use installed ptexenc headers and library (requires
+                          pkg-config)
   --with-system-kpathsea  use installed kpathsea headers and library (requires
                           pkg-config)
 
@@ -3859,6 +4044,332 @@ printf "%s\n" "$as_me: $host -> \`--disable-mfluajit-nowin'" >&6;}
 esac ;;
 esac
 
+## utils/autosp/ac/withenable.ac: configure.ac fragment for Tl subdir
+## configure options and TL libraries required for autosp.
+# Check whether --enable-autosp was given.
+if test ${enable_autosp+y}
+then :
+  enableval=$enable_autosp;
+fi
+case $enable_autosp in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_autosp=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-autosp=$enable_autosp'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-autosp=$enable_autosp'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-autosp=$enable_autosp'"
+    ;;
+esac
+
+## utils/axodraw2/ac/withenable.ac: configure.ac fragment for TL subdir
+## configure options and TL libraries for axodraw2.
+# Check whether --enable-axodraw2 was given.
+if test ${enable_axodraw2+y}
+then :
+  enableval=$enable_axodraw2;
+fi
+case $enable_axodraw2 in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_axodraw2=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-axodraw2=$enable_axodraw2'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-axodraw2=$enable_axodraw2'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-axodraw2=$enable_axodraw2'"
+    ;;
+esac
+
+## utils/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/devnag/
+## configure options and TL libraries required for devnag
+# Check whether --enable-devnag was given.
+if test ${enable_devnag+y}
+then :
+  enableval=$enable_devnag;
+fi
+case $enable_devnag in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_devnag=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-devnag=$enable_devnag'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-devnag=$enable_devnag'"
+    ;;
+esac
+
+## utils/lacheck/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/lacheck/
+## configure options and TL libraries required for lacheck
+# Check whether --enable-lacheck was given.
+if test ${enable_lacheck+y}
+then :
+  enableval=$enable_lacheck;
+fi
+case $enable_lacheck in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_lacheck=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-lacheck=$enable_lacheck'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-lacheck=$enable_lacheck'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-lacheck=$enable_lacheck'"
+    ;;
+esac
+
+## utils/m-tx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/m-tx/
+## configure options and TL libraries required for mtx
+# Check whether --enable-m-tx was given.
+if test ${enable_m_tx+y}
+then :
+  enableval=$enable_m_tx;
+fi
+case $enable_m_tx in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_m_tx=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-m-tx=$enable_m_tx'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-m-tx=$enable_m_tx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-m-tx=$enable_m_tx'"
+    ;;
+esac
+
+## utils/pmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/pmx/
+## configure options and TL libraries required for pmx
+# Check whether --enable-pmx was given.
+if test ${enable_pmx+y}
+then :
+  enableval=$enable_pmx;
+fi
+case $enable_pmx in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_pmx=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-pmx=$enable_pmx'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-pmx=$enable_pmx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-pmx=$enable_pmx'"
+    ;;
+esac
+
+## utils/ps2eps/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ps2eps/
+## configure options and TL libraries required for ps2eps
+# Check whether --enable-ps2eps was given.
+if test ${enable_ps2eps+y}
+then :
+  enableval=$enable_ps2eps;
+fi
+case $enable_ps2eps in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ps2eps=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ps2eps=$enable_ps2eps'"
+    ;;
+esac
+
+## utils/t1utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/t1utils/
+## configure options and TL libraries required for t1utils
+# Check whether --enable-t1utils was given.
+if test ${enable_t1utils+y}
+then :
+  enableval=$enable_t1utils;
+fi
+case $enable_t1utils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_t1utils=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-t1utils=$enable_t1utils'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-t1utils=$enable_t1utils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-t1utils=$enable_t1utils'"
+    ;;
+esac
+
+## utils/texdoctk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/texdoctk/
+## configure options and TL libraries required for texdoctk
+# Check whether --enable-texdoctk was given.
+if test ${enable_texdoctk+y}
+then :
+  enableval=$enable_texdoctk;
+fi
+case $enable_texdoctk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_texdoctk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texdoctk=$enable_texdoctk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-texdoctk=$enable_texdoctk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-texdoctk=$enable_texdoctk'"
+    ;;
+esac
+
+## utils/tpic2pdftex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/tpic2pdftex/
+## configure options and TL libraries required for tpic2pdftex
+# Check whether --enable-tpic2pdftex was given.
+if test ${enable_tpic2pdftex+y}
+then :
+  enableval=$enable_tpic2pdftex;
+fi
+case $enable_tpic2pdftex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_tpic2pdftex=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-tpic2pdftex=$enable_tpic2pdftex'"
+    ;;
+esac
+
+## utils/vlna/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/vlna/
+## configure options and TL libraries required for vlna
+# Check whether --enable-vlna was given.
+if test ${enable_vlna+y}
+then :
+  enableval=$enable_vlna;
+fi
+case $enable_vlna in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_vlna=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-vlna=$enable_vlna'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-vlna=$enable_vlna'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-vlna=$enable_vlna'"
+    ;;
+esac
+
+## utils/xindy/ac/withenable.ac: configure.ac fragment for TL subdir
+## configure options and TL libraries required for xindy.
+# Check whether --enable-xindy was given.
+if test ${enable_xindy+y}
+then :
+  enableval=$enable_xindy;
+fi
+case $enable_xindy in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_xindy=no
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xindy=$enable_xindy'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'"
+    ;;
+esac
+
+## utils/xindy/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
+## configure options for xindy
+# Check whether --enable-xindy-rules was given.
+if test ${enable_xindy_rules+y}
+then :
+  enableval=$enable_xindy_rules;
+fi
+# Check whether --enable-xindy-docs was given.
+if test ${enable_xindy_docs+y}
+then :
+  enableval=$enable_xindy_docs;
+fi
+
+# Check whether --with-clisp-runtime was given.
+if test ${with_clisp_runtime+y}
+then :
+  withval=$with_clisp_runtime;
+fi
+
+## utils/xindy/ac/clisp.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
+## configure checks for xindy and clisp
+case $with_clisp_runtime in #(
+  default) :
+     ;; #(
+  system) :
+    if test "x$enable_native_texlive_build" = xyes
+then :
+  as_fn_error $? "you can not use the installed clisp for a native TeX Live build" "$LINENO" 5
+fi ;; #(
+  "") :
+    if test "x$enable_native_texlive_build" = xyes
+then :
+  with_clisp_runtime=default
+else $as_nop
+  with_clisp_runtime=system
+fi
+               { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--with-clisp-runtime=$with_clisp_runtime'" >&5
+printf "%s\n" "$as_me: Assuming \`--with-clisp-runtime=$with_clisp_runtime'" >&6;}
+               ac_configure_args="$ac_configure_args '--with-clisp-runtime=$with_clisp_runtime'" ;; #(
+  *) :
+    if test ! -f "$with_clisp_runtime"
+then :
+  as_fn_error $? "no such file: \"$with_clisp_runtime\"" "$LINENO" 5
+fi ;;
+esac
+
+## utils/xml2pmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xml2pmx/
+## configure options and TL libraries required for xml2pmx
+# Check whether --enable-xml2pmx was given.
+if test ${enable_xml2pmx+y}
+then :
+  enableval=$enable_xml2pmx;
+fi
+case $enable_xml2pmx in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_xml2pmx=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xml2pmx=$enable_xml2pmx'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-xml2pmx=$enable_xml2pmx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xml2pmx=$enable_xml2pmx'"
+    ;;
+esac
+
+## utils/xpdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xpdfopen/
+## configure options and TL libraries required for xpdfopen
+# Check whether --enable-xpdfopen was given.
+if test ${enable_xpdfopen+y}
+then :
+  enableval=$enable_xpdfopen;
+fi
+if test "x$with_x" = xno
+then :
+  case $enable_xpdfopen in #(
+  "") :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \`--without-x' -> \`--disable-xpdfopen'" >&5
+printf "%s\n" "$as_me: \`--without-x' -> \`--disable-xpdfopen'" >&6;}
+                      enable_xpdfopen=no
+                      ac_configure_args="$ac_configure_args '--disable-xpdfopen'" ;; #(
+  yes) :
+    as_fn_error $? "Sorry, incompatible options \`--without-x' and \`--enable-xpdfopen'" "$LINENO" 5 ;; #(
+  *) :
+     ;;
+esac
+fi
+case $enable_xpdfopen in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_xpdfopen=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xpdfopen=$enable_xpdfopen'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-xpdfopen=$enable_xpdfopen'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xpdfopen=$enable_xpdfopen'"
+    ;;
+esac
+
 
 ## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 ## configure options and TL libraries required for web2c
@@ -4379,105 +4890,1016 @@ then :
 fi
 
 
-## texk/texlive/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
-## configure options and TL libraries required for texlive
-# Check whether --enable-texlive was given.
-if test ${enable_texlive+y}
+## texk/afm2pl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/afm2pl/
+## configure options and TL libraries required for afm2pl
+# Check whether --enable-afm2pl was given.
+if test ${enable_afm2pl+y}
 then :
-  enableval=$enable_texlive;
+  enableval=$enable_afm2pl;
 fi
-case $enable_texlive in #(
+case $enable_afm2pl in #(
   yes|no) :
      ;; #(
   *) :
 
-   enable_texlive=$enable_all_pkgs
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texlive=$enable_texlive'" >&5
-printf "%s\n" "$as_me: Assuming \`--enable-texlive=$enable_texlive'" >&6;}
-     ac_configure_args="$ac_configure_args '--enable-texlive=$enable_texlive'"
+   enable_afm2pl=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-afm2pl=$enable_afm2pl'"
     ;;
 esac
 
-## texk/texlive/ac/texlive.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
-## configure options for texlive
-# Check whether --enable-linked-scripts was given.
-if test ${enable_linked_scripts+y}
+test "x$enable_afm2pl" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/bibtex-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex-x/
+## configure options and TL libraries required for bibtex-x
+# Check whether --enable-bibtex-x was given.
+if test ${enable_bibtex_x+y}
 then :
-  enableval=$enable_linked_scripts;
+  enableval=$enable_bibtex_x;
 fi
+case $enable_bibtex_x in #(
+  yes|no) :
+     ;; #(
+  *) :
 
+   enable_bibtex_x=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-bibtex-x=$enable_bibtex_x'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-bibtex-x=$enable_bibtex_x'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-bibtex-x=$enable_bibtex_x'"
+    ;;
+esac
 
-## libs/pplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/pplib/
-## configure options and TL libraries required for pplib
-
-## libs/harfbuzz/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/
-## configure options and TL libraries required for harfbuzz
+test "x$enable_bibtex_x" = xno || {
+  need_kpathsea=yes
+}
 
-# Check whether --with-system-harfbuzz was given.
-if test ${with_system_harfbuzz+y}
+## texk/bibtex-x/ac/bibtex-x.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex-x/
+## configure options for bibtex-x
+# Check whether --enable-bibtex8 was given.
+if test ${enable_bibtex8+y}
 then :
-  withval=$with_system_harfbuzz;
-fi
-if test "x$with_system_harfbuzz" = x; then
-  if test -f $srcdir/../libs/harfbuzz/configure; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`harfbuzz' headers and library from TL tree" >&5
-printf "%s\n" "$as_me: Assuming \`harfbuzz' headers and library from TL tree" >&6;}
-    with_system_harfbuzz=no
-  else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`harfbuzz' headers and library" >&5
-printf "%s\n" "$as_me: Assuming installed \`harfbuzz' headers and library" >&6;}
-    with_system_harfbuzz=yes
-  fi
-  ac_configure_args="$ac_configure_args '--with-system-harfbuzz=$with_system_harfbuzz'"
+  enableval=$enable_bibtex8;
 fi
-if test "x$with_system_harfbuzz" = xyes; then
-  if test "x$with_system_graphite2" = x; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`graphite2' headers and library" >&5
-printf "%s\n" "$as_me:   ->  installed \`graphite2' headers and library" >&6;}
-    with_system_graphite2=yes
-    ac_configure_args="$ac_configure_args '--with-system-graphite2'"
-  elif test "x$with_system_graphite2" != xyes; then
-    as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-graphite2'" "$LINENO" 5
-  fi
-  if test "x$with_system_icu" = x; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`icu' headers and library" >&5
-printf "%s\n" "$as_me:   ->  installed \`icu' headers and library" >&6;}
-    with_system_icu=yes
-    ac_configure_args="$ac_configure_args '--with-system-icu'"
-  elif test "x$with_system_icu" != xyes; then
-    as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-icu'" "$LINENO" 5
-  fi
+
+case $enable_bibtex8 in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_bibtex8=yes ;;
+esac
+# Check whether --enable-bibtexu was given.
+if test ${enable_bibtexu+y}
+then :
+  enableval=$enable_bibtexu;
 fi
 
-test "x$need_harfbuzz" = xyes && {
-  need_graphite2=yes
-  need_icu=yes
-}
+case $enable_bibtexu in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_bibtexu=yes ;;
+esac
 
-## libs/graphite2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite2/
-## configure options and TL libraries required for graphite2
+test "x$enable_bibtex_x:$enable_bibtexu" = xyes:yes && need_icu=yes
 
-# Check whether --with-system-graphite2 was given.
-if test ${with_system_graphite2+y}
+## texk/chktex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/chktex/
+## configure options and TL libraries required for chktex
+# Check whether --enable-chktex was given.
+if test ${enable_chktex+y}
 then :
-  withval=$with_system_graphite2;
-fi
-if test "x$with_system_graphite2" = x; then
-  if test -f $srcdir/../libs/graphite2/configure; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`graphite2' headers and library from TL tree" >&5
-printf "%s\n" "$as_me: Assuming \`graphite2' headers and library from TL tree" >&6;}
-    with_system_graphite2=no
-  else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`graphite2' headers and library" >&5
-printf "%s\n" "$as_me: Assuming installed \`graphite2' headers and library" >&6;}
-    with_system_graphite2=yes
-  fi
-  ac_configure_args="$ac_configure_args '--with-system-graphite2=$with_system_graphite2'"
+  enableval=$enable_chktex;
 fi
+case $enable_chktex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_chktex=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-chktex=$enable_chktex'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-chktex=$enable_chktex'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-chktex=$enable_chktex'"
+    ;;
+esac
+
+test "x$enable_chktex" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/cjkutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/cjkutils/
+## configure options and TL libraries required for cjkutils
+# Check whether --enable-cjkutils was given.
+if test ${enable_cjkutils+y}
+then :
+  enableval=$enable_cjkutils;
+fi
+case $enable_cjkutils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_cjkutils=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-cjkutils=$enable_cjkutils'"
+    ;;
+esac
+
+test "x$enable_cjkutils" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/detex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/detex/
+## configure options and TL libraries required for detex
+# Check whether --enable-detex was given.
+if test ${enable_detex+y}
+then :
+  enableval=$enable_detex;
+fi
+case $enable_detex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_detex=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-detex=$enable_detex'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-detex=$enable_detex'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-detex=$enable_detex'"
+    ;;
+esac
+
+test "x$enable_detex" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/dtl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dtl/
+## configure options and TL libraries required for dtl
+# Check whether --enable-dtl was given.
+if test ${enable_dtl+y}
+then :
+  enableval=$enable_dtl;
+fi
+case $enable_dtl in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dtl=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dtl=$enable_dtl'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dtl=$enable_dtl'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dtl=$enable_dtl'"
+    ;;
+esac
+
+test "x$enable_dtl" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/dvi2tty/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvi2tty/
+## configure options and TL libraries required for dvi2tty
+# Check whether --enable-dvi2tty was given.
+if test ${enable_dvi2tty+y}
+then :
+  enableval=$enable_dvi2tty;
+fi
+case $enable_dvi2tty in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvi2tty=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvi2tty=$enable_dvi2tty'"
+    ;;
+esac
+
+test "x$enable_dvi2tty" = xno || {
+  need_ptexenc=yes
+}
+
+## texk/dvidvi/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvidvi/
+## configure options and TL libraries required for dvidvi
+# Check whether --enable-dvidvi was given.
+if test ${enable_dvidvi+y}
+then :
+  enableval=$enable_dvidvi;
+fi
+case $enable_dvidvi in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvidvi=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvidvi=$enable_dvidvi'"
+    ;;
+esac
+
+test "x$enable_dvidvi" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/dviljk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviljk/
+## configure options and TL libraries required for dviljk
+# Check whether --enable-dviljk was given.
+if test ${enable_dviljk+y}
+then :
+  enableval=$enable_dviljk;
+fi
+case $enable_dviljk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dviljk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dviljk=$enable_dviljk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dviljk=$enable_dviljk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dviljk=$enable_dviljk'"
+    ;;
+esac
+
+test "x$enable_dviljk" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/dviout-util/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviout-util/
+## configure options and TL libraries required for dviout-util
+# Check whether --enable-dviout-util was given.
+if test ${enable_dviout_util+y}
+then :
+  enableval=$enable_dviout_util;
+fi
+case $enable_dviout_util in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dviout_util=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dviout-util=$enable_dviout_util'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dviout-util=$enable_dviout_util'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dviout-util=$enable_dviout_util'"
+    ;;
+esac
+
+test "x$enable_dviout_util" = xno || {
+  need_ptexenc=yes
+}
+
+## texk/dvipdfm-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm-x/
+## configure options and TL libraries required for dvipdfm-x
+# Check whether --enable-dvipdfm-x was given.
+if test ${enable_dvipdfm_x+y}
+then :
+  enableval=$enable_dvipdfm_x;
+fi
+case $enable_dvipdfm_x in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipdfm_x=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipdfm-x=$enable_dvipdfm_x'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvipdfm-x=$enable_dvipdfm_x'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipdfm-x=$enable_dvipdfm_x'"
+    ;;
+esac
+
+test "x$enable_dvipdfm_x" = xno || {
+  need_kpathsea=yes
+  need_libpng=yes
+  need_libpaper=yes
+}
+
+## texk/dvipng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/
+## configure options and TL libraries required for dvipng
+# Check whether --enable-dvipng was given.
+if test ${enable_dvipng+y}
+then :
+  enableval=$enable_dvipng;
+fi
+case $enable_dvipng in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipng=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipng=$enable_dvipng'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvipng=$enable_dvipng'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipng=$enable_dvipng'"
+    ;;
+esac
+
+test "x$enable_dvipng" = xno || {
+  need_kpathsea=yes
+  need_gd=yes
+}
+
+## texk/dvipng/ac/dvipng.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/
+## configure options for dvipng
+# Check whether --enable-debug was given.
+if test ${enable_debug+y}
+then :
+  enableval=$enable_debug;
+fi
+
+# Check whether --enable-timing was given.
+if test ${enable_timing+y}
+then :
+  enableval=$enable_timing;
+fi
+
+
+# Check whether --with-gs was given.
+if test ${with_gs+y}
+then :
+  withval=$with_gs;
+fi
+
+
+## texk/dvipos/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipos/
+## configure options and TL libraries required for dvipos
+# Check whether --enable-dvipos was given.
+if test ${enable_dvipos+y}
+then :
+  enableval=$enable_dvipos;
+fi
+case $enable_dvipos in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipos=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipos=$enable_dvipos'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvipos=$enable_dvipos'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipos=$enable_dvipos'"
+    ;;
+esac
+
+test "x$enable_dvipos" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/dvipsk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipsk/
+## configure options and TL libraries required for dvipsk
+# Check whether --enable-dvipsk was given.
+if test ${enable_dvipsk+y}
+then :
+  enableval=$enable_dvipsk;
+fi
+case $enable_dvipsk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipsk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipsk=$enable_dvipsk'"
+    ;;
+esac
+
+test "x$enable_dvipsk" = xno || {
+  need_kpathsea=yes
+}
+
+# texk/dvisvgm/ac/withenable.ac: configure.ac fragment
+## configure options and TL libraries required for dvisvgm
+# Check whether --enable-dvisvgm was given.
+if test ${enable_dvisvgm+y}
+then :
+  enableval=$enable_dvisvgm;
+fi
+case $enable_dvisvgm in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvisvgm=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvisvgm=$enable_dvisvgm'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvisvgm=$enable_dvisvgm'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvisvgm=$enable_dvisvgm'"
+    ;;
+esac
+
+test "x$enable_dvisvgm" = xno || {
+  need_kpathsea=yes
+  need_potrace=yes
+  need_freetype2=yes
+  need_zlib=yes
+}
+
+## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/
+## configure options and TL libraries required for gregorio
+# Check whether --enable-gregorio was given.
+if test ${enable_gregorio+y}
+then :
+  enableval=$enable_gregorio;
+fi
+case $enable_gregorio in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_gregorio=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-gregorio=$enable_gregorio'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-gregorio=$enable_gregorio'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-gregorio=$enable_gregorio'"
+    ;;
+esac
+
+test "x$enable_gregorio" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
+## configure options and TL libraries required for gsftopk
+# Check whether --enable-gsftopk was given.
+if test ${enable_gsftopk+y}
+then :
+  enableval=$enable_gsftopk;
+fi
+case $enable_gsftopk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_gsftopk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-gsftopk=$enable_gsftopk'"
+    ;;
+esac
+
+test "x$enable_gsftopk" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/lcdf-typetools/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/
+## configure options and TL libraries required for lcdf-typetools
+# Check whether --enable-lcdf-typetools was given.
+if test ${enable_lcdf_typetools+y}
+then :
+  enableval=$enable_lcdf_typetools;
+fi
+case $enable_lcdf_typetools in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_lcdf_typetools=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-lcdf-typetools=$enable_lcdf_typetools'"
+    ;;
+esac
+
+test "x$enable_lcdf_typetools" = xno || {
+  need_kpathsea=yes
+}
+
+## Define configure options for lcdf-typetools.  Extracted from configure.ac
+## for ease of building TeX Live.
+# Check whether --enable-cfftot1 was given.
+if test ${enable_cfftot1+y}
+then :
+  enableval=$enable_cfftot1;
+fi
+# Check whether --enable-mmafm was given.
+if test ${enable_mmafm+y}
+then :
+  enableval=$enable_mmafm;
+fi
+# Check whether --enable-mmpfb was given.
+if test ${enable_mmpfb+y}
+then :
+  enableval=$enable_mmpfb;
+fi
+# Check whether --enable-otfinfo was given.
+if test ${enable_otfinfo+y}
+then :
+  enableval=$enable_otfinfo;
+fi
+# Check whether --enable-otftotfm was given.
+if test ${enable_otftotfm+y}
+then :
+  enableval=$enable_otftotfm;
+fi
+# Check whether --enable-t1dotlessj was given.
+if test ${enable_t1dotlessj+y}
+then :
+  enableval=$enable_t1dotlessj;
+fi
+# Check whether --enable-t1lint was given.
+if test ${enable_t1lint+y}
+then :
+  enableval=$enable_t1lint;
+fi
+# Check whether --enable-t1rawafm was given.
+if test ${enable_t1rawafm+y}
+then :
+  enableval=$enable_t1rawafm;
+fi
+# Check whether --enable-t1reencode was given.
+if test ${enable_t1reencode+y}
+then :
+  enableval=$enable_t1reencode;
+fi
+# Check whether --enable-t1testpage was given.
+if test ${enable_t1testpage+y}
+then :
+  enableval=$enable_t1testpage;
+fi
+# Check whether --enable-ttftotype42 was given.
+if test ${enable_ttftotype42+y}
+then :
+  enableval=$enable_ttftotype42;
+fi
+
+# Check whether --enable-cfftot1 was given.
+if test ${enable_cfftot1+y}
+then :
+  enableval=$enable_cfftot1;
+fi
+# Check whether --enable-t1dotlessj was given.
+if test ${enable_t1dotlessj+y}
+then :
+  enableval=$enable_t1dotlessj;
+fi
+# Check whether --enable-ttftotype42 was given.
+if test ${enable_ttftotype42+y}
+then :
+  enableval=$enable_ttftotype42;
+fi
+# Check whether --enable-updmap was given.
+if test ${enable_updmap+y}
+then :
+  enableval=$enable_updmap;
+fi
+
+
+## texk/makeindexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makeindexk/
+## configure options and TL libraries required for makeindexk
+# Check whether --enable-makeindexk was given.
+if test ${enable_makeindexk+y}
+then :
+  enableval=$enable_makeindexk;
+fi
+case $enable_makeindexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_makeindexk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-makeindexk=$enable_makeindexk'"
+    ;;
+esac
+
+test "x$enable_makeindexk" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/makejvf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makejvf/
+## configure options and TL libraries required for makejvf
+# Check whether --enable-makejvf was given.
+if test ${enable_makejvf+y}
+then :
+  enableval=$enable_makejvf;
+fi
+case $enable_makejvf in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_makejvf=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-makejvf=$enable_makejvf'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-makejvf=$enable_makejvf'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-makejvf=$enable_makejvf'"
+    ;;
+esac
+
+test "x$enable_makejvf" = xno || {
+  need_ptexenc=yes
+}
+
+## texk/mendexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/mendexk/
+## configure options and TL libraries required for mendexk
+# Check whether --enable-mendexk was given.
+if test ${enable_mendexk+y}
+then :
+  enableval=$enable_mendexk;
+fi
+case $enable_mendexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_mendexk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-mendexk=$enable_mendexk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-mendexk=$enable_mendexk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-mendexk=$enable_mendexk'"
+    ;;
+esac
+
+test "x$enable_mendexk" = xno || {
+  need_ptexenc=yes
+}
+
+## texk/musixtnt/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/musixtnt/
+## configure options and TL libraries required for musixtnt
+# Check whether --enable-musixtnt was given.
+if test ${enable_musixtnt+y}
+then :
+  enableval=$enable_musixtnt;
+fi
+case $enable_musixtnt in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_musixtnt=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-musixtnt=$enable_musixtnt'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-musixtnt=$enable_musixtnt'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-musixtnt=$enable_musixtnt'"
+    ;;
+esac
+
+test "x$enable_musixtnt" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/ps2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pk/
+## configure options and TL libraries required for ps2pk
+# Check whether --enable-ps2pk was given.
+if test ${enable_ps2pk+y}
+then :
+  enableval=$enable_ps2pk;
+fi
+case $enable_ps2pk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ps2pk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ps2pk=$enable_ps2pk'"
+    ;;
+esac
+
+test "x$enable_ps2pk" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/psutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/psutils/
+## configure options and TL libraries required for psutils
+# Check whether --enable-psutils was given.
+if test ${enable_psutils+y}
+then :
+  enableval=$enable_psutils;
+fi
+case $enable_psutils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_psutils=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-psutils=$enable_psutils'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-psutils=$enable_psutils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-psutils=$enable_psutils'"
+    ;;
+esac
+
+test "x$enable_psutils" = xno || {
+  need_kpathsea=yes
+  need_libpaper=yes
+}
+
+## texk/seetexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/seetexk/
+## configure options and TL libraries required for seetexk
+# Check whether --enable-seetexk was given.
+if test ${enable_seetexk+y}
+then :
+  enableval=$enable_seetexk;
+fi
+case $enable_seetexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_seetexk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-seetexk=$enable_seetexk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-seetexk=$enable_seetexk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-seetexk=$enable_seetexk'"
+    ;;
+esac
+
+test "x$enable_seetexk" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/tex4htk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tex4htk/
+## configure options and TL libraries required for tex4htk
+# Check whether --enable-tex4htk was given.
+if test ${enable_tex4htk+y}
+then :
+  enableval=$enable_tex4htk;
+fi
+case $enable_tex4htk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_tex4htk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-tex4htk=$enable_tex4htk'"
+    ;;
+esac
+
+test "x$enable_tex4htk" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/ttf2pk2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk2/
+## configure options and TL libraries required for ttf2pk
+# Check whether --enable-ttf2pk2 was given.
+if test ${enable_ttf2pk2+y}
+then :
+  enableval=$enable_ttf2pk2;
+fi
+case $enable_ttf2pk2 in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ttf2pk2=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ttf2pk2=$enable_ttf2pk2'"
+    ;;
+esac
+
+test "x$enable_ttf2pk2" = xno || {
+  need_kpathsea=yes
+  need_freetype2=yes
+}
+
+## texk/ttfdump/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttfdump/
+## configure options and TL libraries required for ttfdump
+# Check whether --enable-ttfdump was given.
+if test ${enable_ttfdump+y}
+then :
+  enableval=$enable_ttfdump;
+fi
+case $enable_ttfdump in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ttfdump=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ttfdump=$enable_ttfdump'"
+    ;;
+esac
+
+test "x$enable_ttfdump" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/upmendex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/upmendex/
+## configure options and TL libraries required for upmendex
+# Check whether --enable-upmendex was given.
+if test ${enable_upmendex+y}
+then :
+  enableval=$enable_upmendex;
+fi
+case $enable_upmendex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_upmendex=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-upmendex=$enable_upmendex'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-upmendex=$enable_upmendex'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-upmendex=$enable_upmendex'"
+    ;;
+esac
+
+test "x$enable_upmendex" = xno || {
+  need_kpathsea=yes
+  need_icu=yes
+}
+
+## texk/xdvik/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/
+## configure options and TL libraries required for xdvik
+# Check whether --enable-xdvik was given.
+if test ${enable_xdvik+y}
+then :
+  enableval=$enable_xdvik;
+fi
+if test "x$with_x" = xno
+then :
+  case $enable_xdvik in #(
+  "") :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \`--without-x' -> \`--disable-xdvik'" >&5
+printf "%s\n" "$as_me: \`--without-x' -> \`--disable-xdvik'" >&6;}
+                      enable_xdvik=no
+                      ac_configure_args="$ac_configure_args '--disable-xdvik'" ;; #(
+  yes) :
+    as_fn_error $? "Sorry, incompatible options \`--without-x' and \`--enable-xdvik'" "$LINENO" 5 ;; #(
+  *) :
+     ;;
+esac
+fi
+case $enable_xdvik in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_xdvik=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xdvik=$enable_xdvik'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-xdvik=$enable_xdvik'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xdvik=$enable_xdvik'"
+    ;;
+esac
+
+test "x$enable_xdvik" = xno || {
+  need_kpathsea=yes
+  need_freetype2=yes
+}
+
+## texk/xdvik/ac/xdvik.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/
+## configure options for xdvik
+
+# Check whether --with-xdvi-x-toolkit was given.
+if test ${with_xdvi_x_toolkit+y}
+then :
+  withval=$with_xdvi_x_toolkit;
+fi
+
+
+## texk/texlive/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
+## configure options and TL libraries required for texlive
+# Check whether --enable-texlive was given.
+if test ${enable_texlive+y}
+then :
+  enableval=$enable_texlive;
+fi
+case $enable_texlive in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_texlive=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texlive=$enable_texlive'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-texlive=$enable_texlive'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-texlive=$enable_texlive'"
+    ;;
+esac
+
+## texk/texlive/ac/texlive.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
+## configure options for texlive
+# Check whether --enable-linked-scripts was given.
+if test ${enable_linked_scripts+y}
+then :
+  enableval=$enable_linked_scripts;
+fi
+
+
+## libs/pplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/pplib/
+## configure options and TL libraries required for pplib
+
+## libs/harfbuzz/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/
+## configure options and TL libraries required for harfbuzz
+
+# Check whether --with-system-harfbuzz was given.
+if test ${with_system_harfbuzz+y}
+then :
+  withval=$with_system_harfbuzz;
+fi
+if test "x$with_system_harfbuzz" = x; then
+  if test -f $srcdir/../libs/harfbuzz/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`harfbuzz' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`harfbuzz' headers and library from TL tree" >&6;}
+    with_system_harfbuzz=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`harfbuzz' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`harfbuzz' headers and library" >&6;}
+    with_system_harfbuzz=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-harfbuzz=$with_system_harfbuzz'"
+fi
+if test "x$with_system_harfbuzz" = xyes; then
+  if test "x$with_system_graphite2" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`graphite2' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`graphite2' headers and library" >&6;}
+    with_system_graphite2=yes
+    ac_configure_args="$ac_configure_args '--with-system-graphite2'"
+  elif test "x$with_system_graphite2" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-graphite2'" "$LINENO" 5
+  fi
+  if test "x$with_system_icu" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`icu' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`icu' headers and library" >&6;}
+    with_system_icu=yes
+    ac_configure_args="$ac_configure_args '--with-system-icu'"
+  elif test "x$with_system_icu" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-icu'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_harfbuzz" = xyes && {
+  need_graphite2=yes
+  need_icu=yes
+}
+
+## libs/icu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/
+## configure options and TL libraries required for icu (modified for XeTeX)
+
+# Check whether --with-system-icu was given.
+if test ${with_system_icu+y}
+then :
+  withval=$with_system_icu;
+fi
+if test "x$with_system_icu" = x; then
+  if test -f $srcdir/../libs/icu/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`icu' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`icu' headers and library from TL tree" >&6;}
+    with_system_icu=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`icu' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`icu' headers and library" >&6;}
+    with_system_icu=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-icu=$with_system_icu'"
+fi
+
+## libs/teckit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/
+## configure options and TL libraries required for teckit
+
+# Check whether --with-system-teckit was given.
+if test ${with_system_teckit+y}
+then :
+  withval=$with_system_teckit;
+fi
+if test "x$with_system_teckit" = x; then
+  if test -f $srcdir/../libs/teckit/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`teckit' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`teckit' headers and library from TL tree" >&6;}
+    with_system_teckit=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`teckit' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`teckit' headers and library" >&6;}
+    with_system_teckit=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-teckit=$with_system_teckit'"
+fi
+if test "x$with_system_teckit" = xyes; then
+  if test "x$with_system_zlib" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`zlib' headers and library" >&6;}
+    with_system_zlib=yes
+    ac_configure_args="$ac_configure_args '--with-system-zlib'"
+  elif test "x$with_system_zlib" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_teckit" = xyes && {
+  need_zlib=yes
+}
+
+## libs/graphite2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite2/
+## configure options and TL libraries required for graphite2
+
+# Check whether --with-system-graphite2 was given.
+if test ${with_system_graphite2+y}
+then :
+  withval=$with_system_graphite2;
+fi
+if test "x$with_system_graphite2" = x; then
+  if test -f $srcdir/../libs/graphite2/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`graphite2' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`graphite2' headers and library from TL tree" >&6;}
+    with_system_graphite2=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`graphite2' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`graphite2' headers and library" >&6;}
+    with_system_graphite2=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-graphite2=$with_system_graphite2'"
+fi
+
+## libs/zziplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zziplib/
+## configure options and TL libraries required for zziplib
 
-## libs/zziplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zziplib/
-## configure options and TL libraries required for zziplib
-
 # Check whether --with-system-zziplib was given.
 if test ${with_system_zziplib+y}
 then :
@@ -4510,6 +5932,249 @@ test "x$need_zziplib" = xyes && {
   need_zlib=yes
 }
 
+## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/
+## configure options and TL libraries required for xpdf
+: "kpse_xpdf_options - no-op"
+if test "x$with_system_xpdf" = x; then
+  if test -f $srcdir/../libs/xpdf/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`xpdf' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`xpdf' headers and library from TL tree" >&6;}
+    with_system_xpdf=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`xpdf' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`xpdf' headers and library" >&6;}
+    with_system_xpdf=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-xpdf=$with_system_xpdf'"
+fi
+
+## libs/mpfr/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/mpfr/
+## configure options and TL libraries required for mpfr
+
+# Check whether --with-system-mpfr was given.
+if test ${with_system_mpfr+y}
+then :
+  withval=$with_system_mpfr;
+fi
+
+# Check whether --with-mpfr-includes was given.
+if test ${with_mpfr_includes+y}
+then :
+  withval=$with_mpfr_includes;
+fi
+
+# Check whether --with-mpfr-libdir was given.
+if test ${with_mpfr_libdir+y}
+then :
+  withval=$with_mpfr_libdir;
+fi
+if test "x$with_system_mpfr" = x; then
+  if test -f $srcdir/../libs/mpfr/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`mpfr' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`mpfr' headers and library from TL tree" >&6;}
+    with_system_mpfr=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`mpfr' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`mpfr' headers and library" >&6;}
+    with_system_mpfr=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-mpfr=$with_system_mpfr'"
+fi
+if test "x$with_system_mpfr" = xyes; then
+  if test "x$with_system_gmp" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`gmp' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`gmp' headers and library" >&6;}
+    with_system_gmp=yes
+    ac_configure_args="$ac_configure_args '--with-system-gmp'"
+  elif test "x$with_system_gmp" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-mpfr' requires \`--with-system-gmp'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_mpfr" = xyes && {
+  need_gmp=yes
+}
+
+## libs/gmp/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gmp/
+## configure options and TL libraries required for gmp
+
+# Check whether --with-system-gmp was given.
+if test ${with_system_gmp+y}
+then :
+  withval=$with_system_gmp;
+fi
+
+# Check whether --with-gmp-includes was given.
+if test ${with_gmp_includes+y}
+then :
+  withval=$with_gmp_includes;
+fi
+
+# Check whether --with-gmp-libdir was given.
+if test ${with_gmp_libdir+y}
+then :
+  withval=$with_gmp_libdir;
+fi
+if test "x$with_system_gmp" = x; then
+  if test -f $srcdir/../libs/gmp/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`gmp' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`gmp' headers and library from TL tree" >&6;}
+    with_system_gmp=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`gmp' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`gmp' headers and library" >&6;}
+    with_system_gmp=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-gmp=$with_system_gmp'"
+fi
+
+## libs/cairo/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/cairo/
+## configure options and TL libraries required for cairo
+
+# Check whether --with-system-cairo was given.
+if test ${with_system_cairo+y}
+then :
+  withval=$with_system_cairo;
+fi
+if test "x$with_system_cairo" = x; then
+  if test -f $srcdir/../libs/cairo/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`cairo' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`cairo' headers and library from TL tree" >&6;}
+    with_system_cairo=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`cairo' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`cairo' headers and library" >&6;}
+    with_system_cairo=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-cairo=$with_system_cairo'"
+fi
+if test "x$with_system_cairo" = xyes; then
+  if test "x$with_system_pixman" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`pixman' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`pixman' headers and library" >&6;}
+    with_system_pixman=yes
+    ac_configure_args="$ac_configure_args '--with-system-pixman'"
+  elif test "x$with_system_pixman" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-cairo' requires \`--with-system-pixman'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_cairo" = xyes && {
+  need_pixman=yes
+}
+
+## libs/pixman/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/pixman/
+## configure options and TL libraries required for pixman
+
+# Check whether --with-system-pixman was given.
+if test ${with_system_pixman+y}
+then :
+  withval=$with_system_pixman;
+fi
+if test "x$with_system_pixman" = x; then
+  if test -f $srcdir/../libs/pixman/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`pixman' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`pixman' headers and library from TL tree" >&6;}
+    with_system_pixman=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`pixman' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`pixman' headers and library" >&6;}
+    with_system_pixman=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-pixman=$with_system_pixman'"
+fi
+
+## libs/gd/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
+## configure options and TL libraries required for gd
+
+# Check whether --with-system-gd was given.
+if test ${with_system_gd+y}
+then :
+  withval=$with_system_gd;
+fi
+
+# Check whether --with-gd-includes was given.
+if test ${with_gd_includes+y}
+then :
+  withval=$with_gd_includes;
+fi
+
+# Check whether --with-gd-libdir was given.
+if test ${with_gd_libdir+y}
+then :
+  withval=$with_gd_libdir;
+fi
+if test "x$with_system_gd" = x; then
+  if test -f $srcdir/../libs/gd/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`gd' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`gd' headers and library from TL tree" >&6;}
+    with_system_gd=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`gd' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`gd' headers and library" >&6;}
+    with_system_gd=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-gd=$with_system_gd'"
+fi
+if test "x$with_system_gd" = xyes; then
+  if test "x$with_system_libpng" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`libpng' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`libpng' headers and library" >&6;}
+    with_system_libpng=yes
+    ac_configure_args="$ac_configure_args '--with-system-libpng'"
+  elif test "x$with_system_libpng" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-gd' requires \`--with-system-libpng'" "$LINENO" 5
+  fi
+  if test "x$with_system_freetype2" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`freetype2' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`freetype2' headers and library" >&6;}
+    with_system_freetype2=yes
+    ac_configure_args="$ac_configure_args '--with-system-freetype2'"
+  elif test "x$with_system_freetype2" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-gd' requires \`--with-system-freetype2'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_gd" = xyes && {
+  need_libpng=yes
+  need_freetype2=yes
+}
+
+## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/
+## configure options and TL libraries required for freetype2
+
+# Check whether --with-system-freetype2 was given.
+if test ${with_system_freetype2+y}
+then :
+  withval=$with_system_freetype2;
+fi
+if test "x$with_system_freetype2" = x; then
+  if test -f $srcdir/../libs/freetype2/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`freetype2' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`freetype2' headers and library from TL tree" >&6;}
+    with_system_freetype2=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`freetype2' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`freetype2' headers and library" >&6;}
+    with_system_freetype2=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-freetype2=$with_system_freetype2'"
+fi
+if test "x$with_system_freetype2" = xyes; then
+  if test "x$with_system_zlib" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`zlib' headers and library" >&6;}
+    with_system_zlib=yes
+    ac_configure_args="$ac_configure_args '--with-system-zlib'"
+  elif test "x$with_system_zlib" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_freetype2" = xyes && {
+  need_zlib=yes
+}
+
 ## libs/libpng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/
 ## configure options and TL libraries required for libpng
 
@@ -4545,6 +6210,39 @@ test "x$need_libpng" = xyes && {
   need_zlib=yes
 }
 
+## libs/libpaper/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpaper/
+## configure options and TL libraries required for libpaper
+
+# Check whether --with-system-libpaper was given.
+if test ${with_system_libpaper+y}
+then :
+  withval=$with_system_libpaper;
+fi
+
+# Check whether --with-libpaper-includes was given.
+if test ${with_libpaper_includes+y}
+then :
+  withval=$with_libpaper_includes;
+fi
+
+# Check whether --with-libpaper-libdir was given.
+if test ${with_libpaper_libdir+y}
+then :
+  withval=$with_libpaper_libdir;
+fi
+if test "x$with_system_libpaper" = x; then
+  if test -f $srcdir/../libs/libpaper/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`libpaper' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`libpaper' headers and library from TL tree" >&6;}
+    with_system_libpaper=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`libpaper' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`libpaper' headers and library" >&6;}
+    with_system_libpaper=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-libpaper=$with_system_libpaper'"
+fi
+
 ## libs/luajit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/luajit/
 ## configure options and TL libraries required for luajit
 
@@ -4585,6 +6283,41 @@ printf "%s\n" "$as_me: Assuming installed \`zlib' headers and library" >&6;}
 fi
 
 
+## texk/ptexenc/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/
+## configure options and TL libraries required for ptexenc
+
+# Check whether --with-system-ptexenc was given.
+if test ${with_system_ptexenc+y}
+then :
+  withval=$with_system_ptexenc;
+fi
+if test "x$with_system_ptexenc" = x; then
+  if test -f $srcdir/../texk/ptexenc/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`ptexenc' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`ptexenc' headers and library from TL tree" >&6;}
+    with_system_ptexenc=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`ptexenc' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`ptexenc' headers and library" >&6;}
+    with_system_ptexenc=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-ptexenc=$with_system_ptexenc'"
+fi
+if test "x$with_system_ptexenc" = xyes; then
+  if test "x$with_system_kpathsea" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`kpathsea' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`kpathsea' headers and library" >&6;}
+    with_system_kpathsea=yes
+    ac_configure_args="$ac_configure_args '--with-system-kpathsea'"
+  elif test "x$with_system_kpathsea" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-ptexenc' requires \`--with-system-kpathsea'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_ptexenc" = xyes && {
+  need_kpathsea=yes
+}
+
 ## texk/kpathsea/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
 ## configure options and TL libraries required for kpathsea
 
@@ -5603,6 +7336,18 @@ if test -x $srcdir/harfbuzz/configure; then
 else
   echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/harfbuzz/configure' >&5
 fi
+if test -x $srcdir/icu/configure; then
+  test "x$with_system_icu" != xyes && test "x$need_icu" = xyes && MAKE_SUBDIRS="icu $MAKE_SUBDIRS"
+  CONF_SUBDIRS="icu $CONF_SUBDIRS"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/icu/configure' >&5
+fi
+if test -x $srcdir/teckit/configure; then
+  test "x$with_system_teckit" != xyes && test "x$need_teckit" = xyes && MAKE_SUBDIRS="teckit $MAKE_SUBDIRS"
+  CONF_SUBDIRS="teckit $CONF_SUBDIRS"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/teckit/configure' >&5
+fi
 if test -x $srcdir/graphite2/configure; then
   test "x$with_system_graphite2" != xyes && test "x$need_graphite2" = xyes && MAKE_SUBDIRS="graphite2 $MAKE_SUBDIRS"
   CONF_SUBDIRS="graphite2 $CONF_SUBDIRS"
@@ -5615,12 +7360,60 @@ if test -x $srcdir/zziplib/configure; then
 else
   echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/zziplib/configure' >&5
 fi
+if test -x $srcdir/xpdf/configure; then
+  test "x$with_system_xpdf" != xyes && test "x$need_xpdf" = xyes && MAKE_SUBDIRS="xpdf $MAKE_SUBDIRS"
+  CONF_SUBDIRS="xpdf $CONF_SUBDIRS"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/xpdf/configure' >&5
+fi
+if test -x $srcdir/mpfr/configure; then
+  test "x$with_system_mpfr" != xyes && test "x$need_mpfr" = xyes && MAKE_SUBDIRS="mpfr $MAKE_SUBDIRS"
+  CONF_SUBDIRS="mpfr $CONF_SUBDIRS"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/mpfr/configure' >&5
+fi
+if test -x $srcdir/gmp/configure; then
+  test "x$with_system_gmp" != xyes && test "x$need_gmp" = xyes && MAKE_SUBDIRS="gmp $MAKE_SUBDIRS"
+  CONF_SUBDIRS="gmp $CONF_SUBDIRS"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/gmp/configure' >&5
+fi
+if test -x $srcdir/cairo/configure; then
+  test "x$with_system_cairo" != xyes && test "x$need_cairo" = xyes && MAKE_SUBDIRS="cairo $MAKE_SUBDIRS"
+  CONF_SUBDIRS="cairo $CONF_SUBDIRS"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/cairo/configure' >&5
+fi
+if test -x $srcdir/pixman/configure; then
+  test "x$with_system_pixman" != xyes && test "x$need_pixman" = xyes && MAKE_SUBDIRS="pixman $MAKE_SUBDIRS"
+  CONF_SUBDIRS="pixman $CONF_SUBDIRS"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/pixman/configure' >&5
+fi
+if test -x $srcdir/gd/configure; then
+  test "x$with_system_gd" != xyes && test "x$need_gd" = xyes && MAKE_SUBDIRS="gd $MAKE_SUBDIRS"
+  CONF_SUBDIRS="gd $CONF_SUBDIRS"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/gd/configure' >&5
+fi
+if test -x $srcdir/freetype2/configure; then
+  test "x$with_system_freetype2" != xyes && test "x$need_freetype2" = xyes && MAKE_SUBDIRS="freetype2 $MAKE_SUBDIRS"
+  CONF_SUBDIRS="freetype2 $CONF_SUBDIRS"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/freetype2/configure' >&5
+fi
 if test -x $srcdir/libpng/configure; then
   test "x$with_system_libpng" != xyes && test "x$need_libpng" = xyes && MAKE_SUBDIRS="libpng $MAKE_SUBDIRS"
   CONF_SUBDIRS="libpng $CONF_SUBDIRS"
 else
   echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/libpng/configure' >&5
 fi
+if test -x $srcdir/libpaper/configure; then
+  test "x$with_system_libpaper" != xyes && test "x$need_libpaper" = xyes && MAKE_SUBDIRS="libpaper $MAKE_SUBDIRS"
+  CONF_SUBDIRS="libpaper $CONF_SUBDIRS"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/libpaper/configure' >&5
+fi
 if test -x $srcdir/luajit/configure; then
   test "x$with_system_luajit" != xyes && test "x$need_luajit" = xyes && MAKE_SUBDIRS="luajit $MAKE_SUBDIRS"
   CONF_SUBDIRS="luajit $CONF_SUBDIRS"
diff --git a/source/tardate.ac b/source/tardate.ac
index 8238e2fd7ecb84e96e1e561400aa24034df92e2c..72d35b7d59e498bea885b9fcd3d262a7f8c03c14 100644
--- a/source/tardate.ac
+++ b/source/tardate.ac
@@ -1,5 +1,5 @@
-dnl $Id: tardate.ac 58686 2021-03-24 21:28:22Z karl $
-dnl   Copyright 2016-2021 Karl Berry <tex-live@tug.org>
+dnl $Id: tardate.ac 62855 2022-03-21 15:11:58Z karl $
+dnl   Copyright 2016-2022 Karl Berry <tex-live@tug.org>
 dnl   Copyright 2010-2015 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
@@ -9,4 +9,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current TeX Live tarball version
-m4_define([tex_live_tardate], [2021-03-23])
+m4_define([tex_live_tardate], [2022-03-21])
diff --git a/source/texk/Makefile.in b/source/texk/Makefile.in
index e9a06842ee0f4a1f69431a9ecb9b41c11582669b..b44cc7fb3c5e1af76f7d96463270a4e0c25f728e 100644
--- a/source/texk/Makefile.in
+++ b/source/texk/Makefile.in
@@ -89,35 +89,107 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
+	$(top_srcdir)/../m4/kpse-common.m4 \
 	$(top_srcdir)/../m4/kpse-cxx-hack.m4 \
+	$(top_srcdir)/../m4/kpse-freetype2-flags.m4 \
+	$(top_srcdir)/../m4/kpse-gd-flags.m4 \
+	$(top_srcdir)/../m4/kpse-gmp-flags.m4 \
 	$(top_srcdir)/../m4/kpse-graphite2-flags.m4 \
 	$(top_srcdir)/../m4/kpse-harfbuzz-flags.m4 \
+	$(top_srcdir)/../m4/kpse-icu-flags.m4 \
 	$(top_srcdir)/../m4/kpse-kpathsea-flags.m4 \
+	$(top_srcdir)/../m4/kpse-libpaper-flags.m4 \
 	$(top_srcdir)/../m4/kpse-libpng-flags.m4 \
 	$(top_srcdir)/../m4/kpse-lt-hack.m4 \
 	$(top_srcdir)/../m4/kpse-mktex.m4 \
+	$(top_srcdir)/../m4/kpse-mpfr-flags.m4 \
 	$(top_srcdir)/../m4/kpse-options.m4 \
+	$(top_srcdir)/../m4/kpse-pixman-flags.m4 \
 	$(top_srcdir)/../m4/kpse-pkgs.m4 \
+	$(top_srcdir)/../m4/kpse-ptexenc-flags.m4 \
 	$(top_srcdir)/../m4/kpse-setup.m4 \
+	$(top_srcdir)/../m4/kpse-teckit-flags.m4 \
 	$(top_srcdir)/../m4/kpse-warnings.m4 \
 	$(top_srcdir)/../m4/kpse-web2c.m4 \
 	$(top_srcdir)/../m4/kpse-win32.m4 \
+	$(top_srcdir)/../m4/kpse-xpdf-flags.m4 \
 	$(top_srcdir)/../m4/kpse-zlib-flags.m4 \
 	$(top_srcdir)/../m4/kpse-zziplib-flags.m4 \
 	$(top_srcdir)/../version.ac \
+	$(top_srcdir)/../utils/autosp/ac/withenable.ac \
+	$(top_srcdir)/../utils/axodraw2/ac/withenable.ac \
+	$(top_srcdir)/../utils/devnag/ac/withenable.ac \
+	$(top_srcdir)/../utils/lacheck/ac/withenable.ac \
+	$(top_srcdir)/../utils/m-tx/ac/withenable.ac \
+	$(top_srcdir)/../utils/pmx/ac/withenable.ac \
+	$(top_srcdir)/../utils/ps2eps/ac/withenable.ac \
+	$(top_srcdir)/../utils/t1utils/ac/withenable.ac \
+	$(top_srcdir)/../utils/texdoctk/ac/withenable.ac \
+	$(top_srcdir)/../utils/tpic2pdftex/ac/withenable.ac \
+	$(top_srcdir)/../utils/vlna/ac/withenable.ac \
+	$(top_srcdir)/../utils/xindy/ac/withenable.ac \
+	$(top_srcdir)/../utils/xindy/ac/xindy.ac \
+	$(top_srcdir)/../utils/xindy/ac/clisp.ac \
+	$(top_srcdir)/../utils/xml2pmx/ac/withenable.ac \
+	$(top_srcdir)/../utils/xpdfopen/ac/withenable.ac \
 	$(top_srcdir)/../texk/web2c/ac/withenable.ac \
 	$(top_srcdir)/../texk/web2c/ac/web2c.ac \
+	$(top_srcdir)/../texk/afm2pl/ac/withenable.ac \
+	$(top_srcdir)/../texk/bibtex-x/ac/withenable.ac \
+	$(top_srcdir)/../texk/bibtex-x/ac/bibtex-x.ac \
+	$(top_srcdir)/../texk/chktex/ac/withenable.ac \
+	$(top_srcdir)/../texk/cjkutils/ac/withenable.ac \
+	$(top_srcdir)/../texk/detex/ac/withenable.ac \
+	$(top_srcdir)/../texk/dtl/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvi2tty/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvidvi/ac/withenable.ac \
+	$(top_srcdir)/../texk/dviljk/ac/withenable.ac \
+	$(top_srcdir)/../texk/dviout-util/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvipdfm-x/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvipng/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvipng/ac/dvipng.ac \
+	$(top_srcdir)/../texk/dvipos/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvipsk/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvisvgm/ac/withenable.ac \
+	$(top_srcdir)/../texk/gregorio/ac/withenable.ac \
+	$(top_srcdir)/../texk/gsftopk/ac/withenable.ac \
+	$(top_srcdir)/../texk/lcdf-typetools/ac/withenable.ac \
+	$(top_srcdir)/../texk/lcdf-typetools/ac/lcdf-typetools.ac \
+	$(top_srcdir)/../texk/makeindexk/ac/withenable.ac \
+	$(top_srcdir)/../texk/makejvf/ac/withenable.ac \
+	$(top_srcdir)/../texk/mendexk/ac/withenable.ac \
+	$(top_srcdir)/../texk/musixtnt/ac/withenable.ac \
+	$(top_srcdir)/../texk/ps2pk/ac/withenable.ac \
+	$(top_srcdir)/../texk/psutils/ac/withenable.ac \
+	$(top_srcdir)/../texk/seetexk/ac/withenable.ac \
+	$(top_srcdir)/../texk/tex4htk/ac/withenable.ac \
+	$(top_srcdir)/../texk/ttf2pk2/ac/withenable.ac \
+	$(top_srcdir)/../texk/ttfdump/ac/withenable.ac \
+	$(top_srcdir)/../texk/upmendex/ac/withenable.ac \
+	$(top_srcdir)/../texk/xdvik/ac/withenable.ac \
+	$(top_srcdir)/../texk/xdvik/ac/xdvik.ac \
 	$(top_srcdir)/../texk/texlive/ac/withenable.ac \
 	$(top_srcdir)/../texk/texlive/ac/texlive.ac \
 	$(top_srcdir)/../libs/pplib/ac/withenable.ac \
 	$(top_srcdir)/../libs/harfbuzz/ac/withenable.ac \
+	$(top_srcdir)/../libs/icu/ac/withenable.ac \
+	$(top_srcdir)/../libs/teckit/ac/withenable.ac \
 	$(top_srcdir)/../libs/graphite2/ac/withenable.ac \
 	$(top_srcdir)/../libs/zziplib/ac/withenable.ac \
+	$(top_srcdir)/../libs/xpdf/ac/withenable.ac \
+	$(top_srcdir)/../libs/mpfr/ac/withenable.ac \
+	$(top_srcdir)/../libs/gmp/ac/withenable.ac \
+	$(top_srcdir)/../libs/cairo/ac/withenable.ac \
+	$(top_srcdir)/../libs/pixman/ac/withenable.ac \
+	$(top_srcdir)/../libs/gd/ac/withenable.ac \
+	$(top_srcdir)/../libs/freetype2/ac/withenable.ac \
 	$(top_srcdir)/../libs/libpng/ac/withenable.ac \
+	$(top_srcdir)/../libs/libpaper/ac/withenable.ac \
 	$(top_srcdir)/../libs/luajit/ac/withenable.ac \
 	$(top_srcdir)/../libs/lua53/ac/withenable.ac \
 	$(top_srcdir)/../libs/zlib/ac/withenable.ac \
+	$(top_srcdir)/../texk/ptexenc/ac/withenable.ac \
 	$(top_srcdir)/../texk/kpathsea/ac/withenable.ac \
 	$(top_srcdir)/../texk/kpathsea/ac/mktex.ac \
 	$(top_srcdir)/configure.ac
diff --git a/source/texk/README b/source/texk/README
index a83d8a871f29f7e5412ac891a9b401ae3e1892bd..9b33c1372d867603a2445dfa4b4a32e0a2d7a8ba 100644
--- a/source/texk/README
+++ b/source/texk/README
@@ -1,4 +1,4 @@
-$Id: README 61755 2022-01-26 23:21:49Z karl $
+$Id: README 62463 2022-03-06 01:07:46Z hironobu $
 Copyright 2006-2022 TeX Users Group.
 You may freely use, modify and/or distribute this file.
 
@@ -64,7 +64,7 @@ dvipos - maintained here, by us
 
 dvipsk - maintained here, by us
 
-dvisvgm 2.13.1 - checked 26jan22
+dvisvgm 2.13.3 - checked 28feb22
   https://dvisvgm.de/Downloads/
   https://github.com/mgieseki/dvisvgm
   https://ctan.org/pkg/dvisvgm
@@ -125,6 +125,7 @@ web2c - maintained here, by us - core web2c, plain tex, etc.
                also: https://osdn.jp/projects/eptex
         etex - maintained here
       euptex - http://www.t-lab.opal.ne.jp/tex/uptex_en.html
+       hitex - https://hint.userweb.mwn.de/hint/hitex.html
   mflua[jit] - https://serveur-svn.lri.fr/svn/modhel/mflua
                also: http://www.luatex.org/download.html
     mplibdir - http://tug.org/metapost/
@@ -138,7 +139,7 @@ web2c - maintained here, by us - core web2c, plain tex, etc.
        uptex - http://www.t-lab.opal.ne.jp/tex/uptex_en.html
        xetex - http://tug.org/xetex/
    
-xdvik 22.87.04 - checked 15mar20
+xdvik 22.87.06 - checked 18feb22
   http://sourceforge.net/projects/xdvi/files/xdvik/
   Procedure for updating xdvik from sourceforge release:
 tar xf ...
diff --git a/source/texk/aclocal.m4 b/source/texk/aclocal.m4
index 235bab8fa455f966cf5afd17303da261d91ed013..aad8d747bf7a108fdc79465eff1f8b52c3d27af7 100644
--- a/source/texk/aclocal.m4
+++ b/source/texk/aclocal.m4
@@ -1184,19 +1184,30 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([../m4/kpse-cairo-flags.m4])
 m4_include([../m4/kpse-common.m4])
 m4_include([../m4/kpse-cxx-hack.m4])
+m4_include([../m4/kpse-freetype2-flags.m4])
+m4_include([../m4/kpse-gd-flags.m4])
+m4_include([../m4/kpse-gmp-flags.m4])
 m4_include([../m4/kpse-graphite2-flags.m4])
 m4_include([../m4/kpse-harfbuzz-flags.m4])
+m4_include([../m4/kpse-icu-flags.m4])
 m4_include([../m4/kpse-kpathsea-flags.m4])
+m4_include([../m4/kpse-libpaper-flags.m4])
 m4_include([../m4/kpse-libpng-flags.m4])
 m4_include([../m4/kpse-lt-hack.m4])
 m4_include([../m4/kpse-mktex.m4])
+m4_include([../m4/kpse-mpfr-flags.m4])
 m4_include([../m4/kpse-options.m4])
+m4_include([../m4/kpse-pixman-flags.m4])
 m4_include([../m4/kpse-pkgs.m4])
+m4_include([../m4/kpse-ptexenc-flags.m4])
 m4_include([../m4/kpse-setup.m4])
+m4_include([../m4/kpse-teckit-flags.m4])
 m4_include([../m4/kpse-warnings.m4])
 m4_include([../m4/kpse-web2c.m4])
 m4_include([../m4/kpse-win32.m4])
+m4_include([../m4/kpse-xpdf-flags.m4])
 m4_include([../m4/kpse-zlib-flags.m4])
 m4_include([../m4/kpse-zziplib-flags.m4])
diff --git a/source/texk/configure b/source/texk/configure
index 9ca71b25702613f724b764048364236b42adc4b5..56604ff135626cb0457176c8c642b74b8beebb77 100755
--- a/source/texk/configure
+++ b/source/texk/configure
@@ -729,6 +729,23 @@ enable_native_texlive_build
 enable_multiplatform
 enable_cxx_runtime_hack
 enable_libtool_hack
+enable_autosp
+enable_axodraw2
+enable_devnag
+enable_lacheck
+enable_m_tx
+enable_pmx
+enable_ps2eps
+enable_t1utils
+enable_texdoctk
+enable_tpic2pdftex
+enable_vlna
+enable_xindy
+enable_xindy_rules
+enable_xindy_docs
+with_clisp_runtime
+enable_xml2pmx
+enable_xpdfopen
 enable_web2c
 with_banner_add
 with_editor
@@ -777,15 +794,81 @@ enable_tektronixwin
 enable_unitermwin
 enable_web_progs
 enable_synctex
+enable_afm2pl
+enable_bibtex_x
+enable_bibtex8
+enable_bibtexu
+enable_chktex
+enable_cjkutils
+enable_detex
+enable_dtl
+enable_dvi2tty
+enable_dvidvi
+enable_dviljk
+enable_dviout_util
+enable_dvipdfm_x
+enable_dvipng
+enable_debug
+enable_timing
+with_gs
+enable_dvipos
+enable_dvipsk
+enable_dvisvgm
+enable_gregorio
+enable_gsftopk
+enable_lcdf_typetools
+enable_cfftot1
+enable_mmafm
+enable_mmpfb
+enable_otfinfo
+enable_otftotfm
+enable_t1dotlessj
+enable_t1lint
+enable_t1rawafm
+enable_t1reencode
+enable_t1testpage
+enable_ttftotype42
+enable_updmap
+enable_makeindexk
+enable_makejvf
+enable_mendexk
+enable_musixtnt
+enable_ps2pk
+enable_psutils
+enable_seetexk
+enable_tex4htk
+enable_ttf2pk2
+enable_ttfdump
+enable_upmendex
+enable_xdvik
+with_xdvi_x_toolkit
 enable_texlive
 enable_linked_scripts
 with_system_harfbuzz
+with_system_icu
+with_system_teckit
 with_system_graphite2
 with_system_zziplib
+with_system_mpfr
+with_mpfr_includes
+with_mpfr_libdir
+with_system_gmp
+with_gmp_includes
+with_gmp_libdir
+with_system_cairo
+with_system_pixman
+with_system_gd
+with_gd_includes
+with_gd_libdir
+with_system_freetype2
 with_system_libpng
+with_system_libpaper
+with_libpaper_includes
+with_libpaper_libdir
 with_system_zlib
 with_zlib_includes
 with_zlib_libdir
+with_system_ptexenc
 with_system_kpathsea
 enable_mktexmf_default
 enable_mktexpk_default
@@ -1443,6 +1526,22 @@ Optional Features:
                           lib/PLATFORM
   --enable-cxx-runtime-hack  link C++ runtime statically
   --enable-libtool-hack   ignore libtool dependency_libs
+  --disable-autosp        do not build the autosp package
+  --disable-axodraw2      do not build the axodraw2 package
+  --disable-devnag        do not build the devnag package
+  --disable-lacheck       do not build the lacheck package
+  --disable-m-tx          do not build the m-tx package
+  --disable-pmx           do not build the pmx package
+  --disable-ps2eps        do not build the ps2eps package
+  --disable-t1utils       do not build the t1utils package
+  --disable-texdoctk      do not build the texdoctk package
+  --disable-tpic2pdftex   do not build the tpic2pdftex package
+  --disable-vlna          do not build the vlna package
+  --enable-xindy          build the xindy package
+  --enable-xindy-rules      build and install make-rules package
+  --enable-xindy-docs       build and install documentation
+  --disable-xml2pmx       do not build the xml2pmx package
+  --disable-xpdfopen      do not build the xpdfopen package
   --disable-web2c         do not build the web2c (TeX & Co.) package
   --enable-auto-core        cause TeX&MF to dump core, given a certain
                             filename
@@ -1491,6 +1590,57 @@ Optional Features:
   --enable-unitermwin         include Uniterm window support
   --disable-web-progs       do not build WEB programs bibtex ... weave
   --disable-synctex         do not build the SyncTeX library and tool
+  --disable-afm2pl        do not build the afm2pl package
+  --disable-bibtex-x      do not build the bibtex-x package
+  --disable-bibtex8         do not build the bibtex8 program
+  --disable-bibtexu         do not build the bibtexu program
+  --disable-chktex        do not build the chktex package
+  --disable-cjkutils      do not build the cjkutils package
+  --disable-detex         do not build the detex package
+  --disable-dtl           do not build the dtl package
+  --disable-dvi2tty       do not build the dvi2tty package
+  --disable-dvidvi        do not build the dvidvi package
+  --disable-dviljk        do not build the dviljk package
+  --disable-dviout-util   do not build the dviout-util package
+  --disable-dvipdfm-x     do not build the dvipdfm-x package
+  --disable-dvipng        do not build the dvipng package
+  --disable-debug           Compile without debug (-d) option
+  --enable-timing           Output execution time of dvipng
+  --disable-dvipos        do not build the dvipos package
+  --disable-dvipsk        do not build the dvipsk package
+  --disable-dvisvgm       do not build the dvisvgm package
+  --disable-gregorio      do not build the gregorio package
+  --disable-gsftopk       do not build the gsftopk package
+  --disable-lcdf-typetools
+                          do not build the lcdf-typetools package
+  --disable-cfftot1         do not build the cfftot1 program
+  --disable-mmafm           do not build the mmafm program
+  --disable-mmpfb           do not build the mmpfb program
+  --disable-otfinfo         do not build the otfinfo program
+  --disable-otftotfm        do not build the otftotfm program
+  --disable-t1dotlessj      do not build the t1dotlessj program
+  --disable-t1lint          do not build the t1lint program
+  --disable-t1rawafm        do not build the t1rawafm program
+  --disable-t1reencode      do not build the t1reencode program
+  --disable-t1testpage      do not build the t1testpage program
+  --disable-ttftotype42     do not build the ttftotype42 program
+  --disable-auto-cfftot1    disable running cfftot1 from otftotfm
+  --disable-auto-t1dotlessj disable running t1dotlessj from otftotfm
+  --disable-auto-ttftotype42
+                            disable running ttftotype42 from otftotfm
+  --disable-auto-updmap     disable running updmap from otftotfm
+  --disable-makeindexk    do not build the makeindexk package
+  --disable-makejvf       do not build the makejvf package
+  --disable-mendexk       do not build the mendexk package
+  --disable-musixtnt      do not build the musixtnt package
+  --disable-ps2pk         do not build the ps2pk package
+  --disable-psutils       do not build the psutils package
+  --disable-seetexk       do not build the seetexk package
+  --disable-tex4htk       do not build the tex4htk package
+  --disable-ttf2pk2       do not build the ttf2pk2 package
+  --disable-ttfdump       do not build the ttfdump package
+  --disable-upmendex      do not build the upmendex package
+  --disable-xdvik         do not build the xdvik package
   --disable-texlive       do not build the texlive (TeX Live scripts) package
   --disable-linked-scripts  do not install the linked scripts
   --disable-mktexmf-default   do not run mktexmf if MF source missing
@@ -1516,22 +1666,57 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-clisp-runtime=PATH
+                          pathname of clisp runtime to install for `xindy',
+                          `default' to derive from clisp, or `system' to use
+                          installed version
   --with-banner-add=STR   add STR to version string appended to banner lines
   --with-editor=CMD       invoke CMD from the `e' option [vi +%d '%s'] or
                           [texworks --position=%d "%s"]
   --with-mf-x-toolkit     use X toolkit for METAFONT
+  --with-gs=/PATH/TO/gs   Hard-wire the location of GhostScript
+  --with-xdvi-x-toolkit=KIT
+                          Use toolkit KIT (xaw/motif/xaw3d/neXtaw) for xdvi
+                          [default: Xaw]
   --with-system-harfbuzz  use installed harfbuzz headers and library (requires
                           pkg-config)
+  --with-system-icu       use installed ICU headers and libraries (requires
+                          pkg-config or icu-config)
+  --with-system-teckit    use installed teckit headers and library (requires
+                          pkg-config)
   --with-system-graphite2 use installed graphite2 headers and library
                           (requires pkg-config)
   --with-system-zziplib   use installed zziplib headers and library (requires
                           pkg-config)
+  --with-system-mpfr      use installed mpfr headers and library
+  --with-mpfr-includes=DIR
+                          mpfr headers installed in DIR
+  --with-mpfr-libdir=DIR  mpfr library installed in DIR
+  --with-system-gmp       use installed gmp headers and library
+  --with-gmp-includes=DIR gmp headers installed in DIR
+  --with-gmp-libdir=DIR   gmp library installed in DIR
+  --with-system-cairo     use installed cairo headers and library (requires
+                          pkg-config)
+  --with-system-pixman    use installed pixman headers and library (requires
+                          pkg-config)
+  --with-system-gd        use installed gd headers and library
+  --with-gd-includes=DIR  gd headers installed in DIR
+  --with-gd-libdir=DIR    gd library installed in DIR
+  --with-system-freetype2 use installed freetype2 headers and library
+                          (requires freetype-config)
   --with-system-libpng    use installed libpng headers and library (requires
                           pkg-config)
+  --with-system-libpaper  use installed libpaper headers and library
+  --with-libpaper-includes=DIR
+                          libpaper headers installed in DIR
+  --with-libpaper-libdir=DIR
+                          libpaper library installed in DIR
   --with-system-zlib      use installed zlib headers and library
   --with-zlib-includes=DIR
                           zlib headers installed in DIR
   --with-zlib-libdir=DIR  zlib library installed in DIR
+  --with-system-ptexenc   use installed ptexenc headers and library (requires
+                          pkg-config)
   --with-system-kpathsea  use installed kpathsea headers and library (requires
                           pkg-config)
 
@@ -3859,6 +4044,332 @@ printf "%s\n" "$as_me: $host -> \`--disable-mfluajit-nowin'" >&6;}
 esac ;;
 esac
 
+## utils/autosp/ac/withenable.ac: configure.ac fragment for Tl subdir
+## configure options and TL libraries required for autosp.
+# Check whether --enable-autosp was given.
+if test ${enable_autosp+y}
+then :
+  enableval=$enable_autosp;
+fi
+case $enable_autosp in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_autosp=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-autosp=$enable_autosp'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-autosp=$enable_autosp'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-autosp=$enable_autosp'"
+    ;;
+esac
+
+## utils/axodraw2/ac/withenable.ac: configure.ac fragment for TL subdir
+## configure options and TL libraries for axodraw2.
+# Check whether --enable-axodraw2 was given.
+if test ${enable_axodraw2+y}
+then :
+  enableval=$enable_axodraw2;
+fi
+case $enable_axodraw2 in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_axodraw2=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-axodraw2=$enable_axodraw2'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-axodraw2=$enable_axodraw2'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-axodraw2=$enable_axodraw2'"
+    ;;
+esac
+
+## utils/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/devnag/
+## configure options and TL libraries required for devnag
+# Check whether --enable-devnag was given.
+if test ${enable_devnag+y}
+then :
+  enableval=$enable_devnag;
+fi
+case $enable_devnag in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_devnag=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-devnag=$enable_devnag'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-devnag=$enable_devnag'"
+    ;;
+esac
+
+## utils/lacheck/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/lacheck/
+## configure options and TL libraries required for lacheck
+# Check whether --enable-lacheck was given.
+if test ${enable_lacheck+y}
+then :
+  enableval=$enable_lacheck;
+fi
+case $enable_lacheck in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_lacheck=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-lacheck=$enable_lacheck'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-lacheck=$enable_lacheck'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-lacheck=$enable_lacheck'"
+    ;;
+esac
+
+## utils/m-tx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/m-tx/
+## configure options and TL libraries required for mtx
+# Check whether --enable-m-tx was given.
+if test ${enable_m_tx+y}
+then :
+  enableval=$enable_m_tx;
+fi
+case $enable_m_tx in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_m_tx=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-m-tx=$enable_m_tx'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-m-tx=$enable_m_tx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-m-tx=$enable_m_tx'"
+    ;;
+esac
+
+## utils/pmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/pmx/
+## configure options and TL libraries required for pmx
+# Check whether --enable-pmx was given.
+if test ${enable_pmx+y}
+then :
+  enableval=$enable_pmx;
+fi
+case $enable_pmx in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_pmx=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-pmx=$enable_pmx'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-pmx=$enable_pmx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-pmx=$enable_pmx'"
+    ;;
+esac
+
+## utils/ps2eps/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ps2eps/
+## configure options and TL libraries required for ps2eps
+# Check whether --enable-ps2eps was given.
+if test ${enable_ps2eps+y}
+then :
+  enableval=$enable_ps2eps;
+fi
+case $enable_ps2eps in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ps2eps=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ps2eps=$enable_ps2eps'"
+    ;;
+esac
+
+## utils/t1utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/t1utils/
+## configure options and TL libraries required for t1utils
+# Check whether --enable-t1utils was given.
+if test ${enable_t1utils+y}
+then :
+  enableval=$enable_t1utils;
+fi
+case $enable_t1utils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_t1utils=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-t1utils=$enable_t1utils'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-t1utils=$enable_t1utils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-t1utils=$enable_t1utils'"
+    ;;
+esac
+
+## utils/texdoctk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/texdoctk/
+## configure options and TL libraries required for texdoctk
+# Check whether --enable-texdoctk was given.
+if test ${enable_texdoctk+y}
+then :
+  enableval=$enable_texdoctk;
+fi
+case $enable_texdoctk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_texdoctk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texdoctk=$enable_texdoctk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-texdoctk=$enable_texdoctk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-texdoctk=$enable_texdoctk'"
+    ;;
+esac
+
+## utils/tpic2pdftex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/tpic2pdftex/
+## configure options and TL libraries required for tpic2pdftex
+# Check whether --enable-tpic2pdftex was given.
+if test ${enable_tpic2pdftex+y}
+then :
+  enableval=$enable_tpic2pdftex;
+fi
+case $enable_tpic2pdftex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_tpic2pdftex=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-tpic2pdftex=$enable_tpic2pdftex'"
+    ;;
+esac
+
+## utils/vlna/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/vlna/
+## configure options and TL libraries required for vlna
+# Check whether --enable-vlna was given.
+if test ${enable_vlna+y}
+then :
+  enableval=$enable_vlna;
+fi
+case $enable_vlna in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_vlna=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-vlna=$enable_vlna'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-vlna=$enable_vlna'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-vlna=$enable_vlna'"
+    ;;
+esac
+
+## utils/xindy/ac/withenable.ac: configure.ac fragment for TL subdir
+## configure options and TL libraries required for xindy.
+# Check whether --enable-xindy was given.
+if test ${enable_xindy+y}
+then :
+  enableval=$enable_xindy;
+fi
+case $enable_xindy in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_xindy=no
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xindy=$enable_xindy'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'"
+    ;;
+esac
+
+## utils/xindy/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
+## configure options for xindy
+# Check whether --enable-xindy-rules was given.
+if test ${enable_xindy_rules+y}
+then :
+  enableval=$enable_xindy_rules;
+fi
+# Check whether --enable-xindy-docs was given.
+if test ${enable_xindy_docs+y}
+then :
+  enableval=$enable_xindy_docs;
+fi
+
+# Check whether --with-clisp-runtime was given.
+if test ${with_clisp_runtime+y}
+then :
+  withval=$with_clisp_runtime;
+fi
+
+## utils/xindy/ac/clisp.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
+## configure checks for xindy and clisp
+case $with_clisp_runtime in #(
+  default) :
+     ;; #(
+  system) :
+    if test "x$enable_native_texlive_build" = xyes
+then :
+  as_fn_error $? "you can not use the installed clisp for a native TeX Live build" "$LINENO" 5
+fi ;; #(
+  "") :
+    if test "x$enable_native_texlive_build" = xyes
+then :
+  with_clisp_runtime=default
+else $as_nop
+  with_clisp_runtime=system
+fi
+               { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--with-clisp-runtime=$with_clisp_runtime'" >&5
+printf "%s\n" "$as_me: Assuming \`--with-clisp-runtime=$with_clisp_runtime'" >&6;}
+               ac_configure_args="$ac_configure_args '--with-clisp-runtime=$with_clisp_runtime'" ;; #(
+  *) :
+    if test ! -f "$with_clisp_runtime"
+then :
+  as_fn_error $? "no such file: \"$with_clisp_runtime\"" "$LINENO" 5
+fi ;;
+esac
+
+## utils/xml2pmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xml2pmx/
+## configure options and TL libraries required for xml2pmx
+# Check whether --enable-xml2pmx was given.
+if test ${enable_xml2pmx+y}
+then :
+  enableval=$enable_xml2pmx;
+fi
+case $enable_xml2pmx in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_xml2pmx=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xml2pmx=$enable_xml2pmx'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-xml2pmx=$enable_xml2pmx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xml2pmx=$enable_xml2pmx'"
+    ;;
+esac
+
+## utils/xpdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xpdfopen/
+## configure options and TL libraries required for xpdfopen
+# Check whether --enable-xpdfopen was given.
+if test ${enable_xpdfopen+y}
+then :
+  enableval=$enable_xpdfopen;
+fi
+if test "x$with_x" = xno
+then :
+  case $enable_xpdfopen in #(
+  "") :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \`--without-x' -> \`--disable-xpdfopen'" >&5
+printf "%s\n" "$as_me: \`--without-x' -> \`--disable-xpdfopen'" >&6;}
+                      enable_xpdfopen=no
+                      ac_configure_args="$ac_configure_args '--disable-xpdfopen'" ;; #(
+  yes) :
+    as_fn_error $? "Sorry, incompatible options \`--without-x' and \`--enable-xpdfopen'" "$LINENO" 5 ;; #(
+  *) :
+     ;;
+esac
+fi
+case $enable_xpdfopen in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_xpdfopen=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xpdfopen=$enable_xpdfopen'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-xpdfopen=$enable_xpdfopen'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xpdfopen=$enable_xpdfopen'"
+    ;;
+esac
+
 
 ## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 ## configure options and TL libraries required for web2c
@@ -4379,105 +4890,1016 @@ then :
 fi
 
 
-## texk/texlive/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
-## configure options and TL libraries required for texlive
-# Check whether --enable-texlive was given.
-if test ${enable_texlive+y}
+## texk/afm2pl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/afm2pl/
+## configure options and TL libraries required for afm2pl
+# Check whether --enable-afm2pl was given.
+if test ${enable_afm2pl+y}
 then :
-  enableval=$enable_texlive;
+  enableval=$enable_afm2pl;
 fi
-case $enable_texlive in #(
+case $enable_afm2pl in #(
   yes|no) :
      ;; #(
   *) :
 
-   enable_texlive=$enable_all_pkgs
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texlive=$enable_texlive'" >&5
-printf "%s\n" "$as_me: Assuming \`--enable-texlive=$enable_texlive'" >&6;}
-     ac_configure_args="$ac_configure_args '--enable-texlive=$enable_texlive'"
+   enable_afm2pl=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-afm2pl=$enable_afm2pl'"
     ;;
 esac
 
-## texk/texlive/ac/texlive.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
-## configure options for texlive
-# Check whether --enable-linked-scripts was given.
-if test ${enable_linked_scripts+y}
+test "x$enable_afm2pl" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/bibtex-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex-x/
+## configure options and TL libraries required for bibtex-x
+# Check whether --enable-bibtex-x was given.
+if test ${enable_bibtex_x+y}
 then :
-  enableval=$enable_linked_scripts;
+  enableval=$enable_bibtex_x;
 fi
+case $enable_bibtex_x in #(
+  yes|no) :
+     ;; #(
+  *) :
 
+   enable_bibtex_x=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-bibtex-x=$enable_bibtex_x'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-bibtex-x=$enable_bibtex_x'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-bibtex-x=$enable_bibtex_x'"
+    ;;
+esac
 
-## libs/pplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/pplib/
-## configure options and TL libraries required for pplib
-
-## libs/harfbuzz/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/
-## configure options and TL libraries required for harfbuzz
+test "x$enable_bibtex_x" = xno || {
+  need_kpathsea=yes
+}
 
-# Check whether --with-system-harfbuzz was given.
-if test ${with_system_harfbuzz+y}
+## texk/bibtex-x/ac/bibtex-x.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex-x/
+## configure options for bibtex-x
+# Check whether --enable-bibtex8 was given.
+if test ${enable_bibtex8+y}
 then :
-  withval=$with_system_harfbuzz;
-fi
-if test "x$with_system_harfbuzz" = x; then
-  if test -f $srcdir/../libs/harfbuzz/configure; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`harfbuzz' headers and library from TL tree" >&5
-printf "%s\n" "$as_me: Assuming \`harfbuzz' headers and library from TL tree" >&6;}
-    with_system_harfbuzz=no
-  else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`harfbuzz' headers and library" >&5
-printf "%s\n" "$as_me: Assuming installed \`harfbuzz' headers and library" >&6;}
-    with_system_harfbuzz=yes
-  fi
-  ac_configure_args="$ac_configure_args '--with-system-harfbuzz=$with_system_harfbuzz'"
+  enableval=$enable_bibtex8;
 fi
-if test "x$with_system_harfbuzz" = xyes; then
-  if test "x$with_system_graphite2" = x; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`graphite2' headers and library" >&5
-printf "%s\n" "$as_me:   ->  installed \`graphite2' headers and library" >&6;}
-    with_system_graphite2=yes
-    ac_configure_args="$ac_configure_args '--with-system-graphite2'"
-  elif test "x$with_system_graphite2" != xyes; then
-    as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-graphite2'" "$LINENO" 5
-  fi
-  if test "x$with_system_icu" = x; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`icu' headers and library" >&5
-printf "%s\n" "$as_me:   ->  installed \`icu' headers and library" >&6;}
-    with_system_icu=yes
-    ac_configure_args="$ac_configure_args '--with-system-icu'"
-  elif test "x$with_system_icu" != xyes; then
-    as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-icu'" "$LINENO" 5
-  fi
+
+case $enable_bibtex8 in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_bibtex8=yes ;;
+esac
+# Check whether --enable-bibtexu was given.
+if test ${enable_bibtexu+y}
+then :
+  enableval=$enable_bibtexu;
 fi
 
-test "x$need_harfbuzz" = xyes && {
-  need_graphite2=yes
-  need_icu=yes
-}
+case $enable_bibtexu in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_bibtexu=yes ;;
+esac
 
-## libs/graphite2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite2/
-## configure options and TL libraries required for graphite2
+test "x$enable_bibtex_x:$enable_bibtexu" = xyes:yes && need_icu=yes
 
-# Check whether --with-system-graphite2 was given.
-if test ${with_system_graphite2+y}
+## texk/chktex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/chktex/
+## configure options and TL libraries required for chktex
+# Check whether --enable-chktex was given.
+if test ${enable_chktex+y}
 then :
-  withval=$with_system_graphite2;
-fi
-if test "x$with_system_graphite2" = x; then
-  if test -f $srcdir/../libs/graphite2/configure; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`graphite2' headers and library from TL tree" >&5
-printf "%s\n" "$as_me: Assuming \`graphite2' headers and library from TL tree" >&6;}
-    with_system_graphite2=no
-  else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`graphite2' headers and library" >&5
-printf "%s\n" "$as_me: Assuming installed \`graphite2' headers and library" >&6;}
-    with_system_graphite2=yes
-  fi
-  ac_configure_args="$ac_configure_args '--with-system-graphite2=$with_system_graphite2'"
+  enableval=$enable_chktex;
 fi
+case $enable_chktex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_chktex=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-chktex=$enable_chktex'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-chktex=$enable_chktex'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-chktex=$enable_chktex'"
+    ;;
+esac
+
+test "x$enable_chktex" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/cjkutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/cjkutils/
+## configure options and TL libraries required for cjkutils
+# Check whether --enable-cjkutils was given.
+if test ${enable_cjkutils+y}
+then :
+  enableval=$enable_cjkutils;
+fi
+case $enable_cjkutils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_cjkutils=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-cjkutils=$enable_cjkutils'"
+    ;;
+esac
+
+test "x$enable_cjkutils" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/detex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/detex/
+## configure options and TL libraries required for detex
+# Check whether --enable-detex was given.
+if test ${enable_detex+y}
+then :
+  enableval=$enable_detex;
+fi
+case $enable_detex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_detex=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-detex=$enable_detex'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-detex=$enable_detex'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-detex=$enable_detex'"
+    ;;
+esac
+
+test "x$enable_detex" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/dtl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dtl/
+## configure options and TL libraries required for dtl
+# Check whether --enable-dtl was given.
+if test ${enable_dtl+y}
+then :
+  enableval=$enable_dtl;
+fi
+case $enable_dtl in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dtl=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dtl=$enable_dtl'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dtl=$enable_dtl'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dtl=$enable_dtl'"
+    ;;
+esac
+
+test "x$enable_dtl" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/dvi2tty/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvi2tty/
+## configure options and TL libraries required for dvi2tty
+# Check whether --enable-dvi2tty was given.
+if test ${enable_dvi2tty+y}
+then :
+  enableval=$enable_dvi2tty;
+fi
+case $enable_dvi2tty in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvi2tty=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvi2tty=$enable_dvi2tty'"
+    ;;
+esac
+
+test "x$enable_dvi2tty" = xno || {
+  need_ptexenc=yes
+}
+
+## texk/dvidvi/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvidvi/
+## configure options and TL libraries required for dvidvi
+# Check whether --enable-dvidvi was given.
+if test ${enable_dvidvi+y}
+then :
+  enableval=$enable_dvidvi;
+fi
+case $enable_dvidvi in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvidvi=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvidvi=$enable_dvidvi'"
+    ;;
+esac
+
+test "x$enable_dvidvi" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/dviljk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviljk/
+## configure options and TL libraries required for dviljk
+# Check whether --enable-dviljk was given.
+if test ${enable_dviljk+y}
+then :
+  enableval=$enable_dviljk;
+fi
+case $enable_dviljk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dviljk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dviljk=$enable_dviljk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dviljk=$enable_dviljk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dviljk=$enable_dviljk'"
+    ;;
+esac
+
+test "x$enable_dviljk" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/dviout-util/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviout-util/
+## configure options and TL libraries required for dviout-util
+# Check whether --enable-dviout-util was given.
+if test ${enable_dviout_util+y}
+then :
+  enableval=$enable_dviout_util;
+fi
+case $enable_dviout_util in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dviout_util=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dviout-util=$enable_dviout_util'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dviout-util=$enable_dviout_util'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dviout-util=$enable_dviout_util'"
+    ;;
+esac
+
+test "x$enable_dviout_util" = xno || {
+  need_ptexenc=yes
+}
+
+## texk/dvipdfm-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm-x/
+## configure options and TL libraries required for dvipdfm-x
+# Check whether --enable-dvipdfm-x was given.
+if test ${enable_dvipdfm_x+y}
+then :
+  enableval=$enable_dvipdfm_x;
+fi
+case $enable_dvipdfm_x in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipdfm_x=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipdfm-x=$enable_dvipdfm_x'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvipdfm-x=$enable_dvipdfm_x'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipdfm-x=$enable_dvipdfm_x'"
+    ;;
+esac
+
+test "x$enable_dvipdfm_x" = xno || {
+  need_kpathsea=yes
+  need_libpng=yes
+  need_libpaper=yes
+}
+
+## texk/dvipng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/
+## configure options and TL libraries required for dvipng
+# Check whether --enable-dvipng was given.
+if test ${enable_dvipng+y}
+then :
+  enableval=$enable_dvipng;
+fi
+case $enable_dvipng in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipng=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipng=$enable_dvipng'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvipng=$enable_dvipng'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipng=$enable_dvipng'"
+    ;;
+esac
+
+test "x$enable_dvipng" = xno || {
+  need_kpathsea=yes
+  need_gd=yes
+}
+
+## texk/dvipng/ac/dvipng.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/
+## configure options for dvipng
+# Check whether --enable-debug was given.
+if test ${enable_debug+y}
+then :
+  enableval=$enable_debug;
+fi
+
+# Check whether --enable-timing was given.
+if test ${enable_timing+y}
+then :
+  enableval=$enable_timing;
+fi
+
+
+# Check whether --with-gs was given.
+if test ${with_gs+y}
+then :
+  withval=$with_gs;
+fi
+
+
+## texk/dvipos/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipos/
+## configure options and TL libraries required for dvipos
+# Check whether --enable-dvipos was given.
+if test ${enable_dvipos+y}
+then :
+  enableval=$enable_dvipos;
+fi
+case $enable_dvipos in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipos=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipos=$enable_dvipos'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvipos=$enable_dvipos'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipos=$enable_dvipos'"
+    ;;
+esac
+
+test "x$enable_dvipos" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/dvipsk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipsk/
+## configure options and TL libraries required for dvipsk
+# Check whether --enable-dvipsk was given.
+if test ${enable_dvipsk+y}
+then :
+  enableval=$enable_dvipsk;
+fi
+case $enable_dvipsk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipsk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipsk=$enable_dvipsk'"
+    ;;
+esac
+
+test "x$enable_dvipsk" = xno || {
+  need_kpathsea=yes
+}
+
+# texk/dvisvgm/ac/withenable.ac: configure.ac fragment
+## configure options and TL libraries required for dvisvgm
+# Check whether --enable-dvisvgm was given.
+if test ${enable_dvisvgm+y}
+then :
+  enableval=$enable_dvisvgm;
+fi
+case $enable_dvisvgm in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvisvgm=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvisvgm=$enable_dvisvgm'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvisvgm=$enable_dvisvgm'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvisvgm=$enable_dvisvgm'"
+    ;;
+esac
+
+test "x$enable_dvisvgm" = xno || {
+  need_kpathsea=yes
+  need_potrace=yes
+  need_freetype2=yes
+  need_zlib=yes
+}
+
+## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/
+## configure options and TL libraries required for gregorio
+# Check whether --enable-gregorio was given.
+if test ${enable_gregorio+y}
+then :
+  enableval=$enable_gregorio;
+fi
+case $enable_gregorio in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_gregorio=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-gregorio=$enable_gregorio'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-gregorio=$enable_gregorio'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-gregorio=$enable_gregorio'"
+    ;;
+esac
+
+test "x$enable_gregorio" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
+## configure options and TL libraries required for gsftopk
+# Check whether --enable-gsftopk was given.
+if test ${enable_gsftopk+y}
+then :
+  enableval=$enable_gsftopk;
+fi
+case $enable_gsftopk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_gsftopk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-gsftopk=$enable_gsftopk'"
+    ;;
+esac
+
+test "x$enable_gsftopk" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/lcdf-typetools/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/
+## configure options and TL libraries required for lcdf-typetools
+# Check whether --enable-lcdf-typetools was given.
+if test ${enable_lcdf_typetools+y}
+then :
+  enableval=$enable_lcdf_typetools;
+fi
+case $enable_lcdf_typetools in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_lcdf_typetools=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-lcdf-typetools=$enable_lcdf_typetools'"
+    ;;
+esac
+
+test "x$enable_lcdf_typetools" = xno || {
+  need_kpathsea=yes
+}
+
+## Define configure options for lcdf-typetools.  Extracted from configure.ac
+## for ease of building TeX Live.
+# Check whether --enable-cfftot1 was given.
+if test ${enable_cfftot1+y}
+then :
+  enableval=$enable_cfftot1;
+fi
+# Check whether --enable-mmafm was given.
+if test ${enable_mmafm+y}
+then :
+  enableval=$enable_mmafm;
+fi
+# Check whether --enable-mmpfb was given.
+if test ${enable_mmpfb+y}
+then :
+  enableval=$enable_mmpfb;
+fi
+# Check whether --enable-otfinfo was given.
+if test ${enable_otfinfo+y}
+then :
+  enableval=$enable_otfinfo;
+fi
+# Check whether --enable-otftotfm was given.
+if test ${enable_otftotfm+y}
+then :
+  enableval=$enable_otftotfm;
+fi
+# Check whether --enable-t1dotlessj was given.
+if test ${enable_t1dotlessj+y}
+then :
+  enableval=$enable_t1dotlessj;
+fi
+# Check whether --enable-t1lint was given.
+if test ${enable_t1lint+y}
+then :
+  enableval=$enable_t1lint;
+fi
+# Check whether --enable-t1rawafm was given.
+if test ${enable_t1rawafm+y}
+then :
+  enableval=$enable_t1rawafm;
+fi
+# Check whether --enable-t1reencode was given.
+if test ${enable_t1reencode+y}
+then :
+  enableval=$enable_t1reencode;
+fi
+# Check whether --enable-t1testpage was given.
+if test ${enable_t1testpage+y}
+then :
+  enableval=$enable_t1testpage;
+fi
+# Check whether --enable-ttftotype42 was given.
+if test ${enable_ttftotype42+y}
+then :
+  enableval=$enable_ttftotype42;
+fi
+
+# Check whether --enable-cfftot1 was given.
+if test ${enable_cfftot1+y}
+then :
+  enableval=$enable_cfftot1;
+fi
+# Check whether --enable-t1dotlessj was given.
+if test ${enable_t1dotlessj+y}
+then :
+  enableval=$enable_t1dotlessj;
+fi
+# Check whether --enable-ttftotype42 was given.
+if test ${enable_ttftotype42+y}
+then :
+  enableval=$enable_ttftotype42;
+fi
+# Check whether --enable-updmap was given.
+if test ${enable_updmap+y}
+then :
+  enableval=$enable_updmap;
+fi
+
+
+## texk/makeindexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makeindexk/
+## configure options and TL libraries required for makeindexk
+# Check whether --enable-makeindexk was given.
+if test ${enable_makeindexk+y}
+then :
+  enableval=$enable_makeindexk;
+fi
+case $enable_makeindexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_makeindexk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-makeindexk=$enable_makeindexk'"
+    ;;
+esac
+
+test "x$enable_makeindexk" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/makejvf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makejvf/
+## configure options and TL libraries required for makejvf
+# Check whether --enable-makejvf was given.
+if test ${enable_makejvf+y}
+then :
+  enableval=$enable_makejvf;
+fi
+case $enable_makejvf in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_makejvf=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-makejvf=$enable_makejvf'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-makejvf=$enable_makejvf'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-makejvf=$enable_makejvf'"
+    ;;
+esac
+
+test "x$enable_makejvf" = xno || {
+  need_ptexenc=yes
+}
+
+## texk/mendexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/mendexk/
+## configure options and TL libraries required for mendexk
+# Check whether --enable-mendexk was given.
+if test ${enable_mendexk+y}
+then :
+  enableval=$enable_mendexk;
+fi
+case $enable_mendexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_mendexk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-mendexk=$enable_mendexk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-mendexk=$enable_mendexk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-mendexk=$enable_mendexk'"
+    ;;
+esac
+
+test "x$enable_mendexk" = xno || {
+  need_ptexenc=yes
+}
+
+## texk/musixtnt/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/musixtnt/
+## configure options and TL libraries required for musixtnt
+# Check whether --enable-musixtnt was given.
+if test ${enable_musixtnt+y}
+then :
+  enableval=$enable_musixtnt;
+fi
+case $enable_musixtnt in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_musixtnt=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-musixtnt=$enable_musixtnt'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-musixtnt=$enable_musixtnt'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-musixtnt=$enable_musixtnt'"
+    ;;
+esac
+
+test "x$enable_musixtnt" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/ps2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pk/
+## configure options and TL libraries required for ps2pk
+# Check whether --enable-ps2pk was given.
+if test ${enable_ps2pk+y}
+then :
+  enableval=$enable_ps2pk;
+fi
+case $enable_ps2pk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ps2pk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ps2pk=$enable_ps2pk'"
+    ;;
+esac
+
+test "x$enable_ps2pk" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/psutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/psutils/
+## configure options and TL libraries required for psutils
+# Check whether --enable-psutils was given.
+if test ${enable_psutils+y}
+then :
+  enableval=$enable_psutils;
+fi
+case $enable_psutils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_psutils=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-psutils=$enable_psutils'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-psutils=$enable_psutils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-psutils=$enable_psutils'"
+    ;;
+esac
+
+test "x$enable_psutils" = xno || {
+  need_kpathsea=yes
+  need_libpaper=yes
+}
+
+## texk/seetexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/seetexk/
+## configure options and TL libraries required for seetexk
+# Check whether --enable-seetexk was given.
+if test ${enable_seetexk+y}
+then :
+  enableval=$enable_seetexk;
+fi
+case $enable_seetexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_seetexk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-seetexk=$enable_seetexk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-seetexk=$enable_seetexk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-seetexk=$enable_seetexk'"
+    ;;
+esac
+
+test "x$enable_seetexk" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/tex4htk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tex4htk/
+## configure options and TL libraries required for tex4htk
+# Check whether --enable-tex4htk was given.
+if test ${enable_tex4htk+y}
+then :
+  enableval=$enable_tex4htk;
+fi
+case $enable_tex4htk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_tex4htk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-tex4htk=$enable_tex4htk'"
+    ;;
+esac
+
+test "x$enable_tex4htk" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/ttf2pk2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk2/
+## configure options and TL libraries required for ttf2pk
+# Check whether --enable-ttf2pk2 was given.
+if test ${enable_ttf2pk2+y}
+then :
+  enableval=$enable_ttf2pk2;
+fi
+case $enable_ttf2pk2 in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ttf2pk2=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ttf2pk2=$enable_ttf2pk2'"
+    ;;
+esac
+
+test "x$enable_ttf2pk2" = xno || {
+  need_kpathsea=yes
+  need_freetype2=yes
+}
+
+## texk/ttfdump/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttfdump/
+## configure options and TL libraries required for ttfdump
+# Check whether --enable-ttfdump was given.
+if test ${enable_ttfdump+y}
+then :
+  enableval=$enable_ttfdump;
+fi
+case $enable_ttfdump in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ttfdump=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ttfdump=$enable_ttfdump'"
+    ;;
+esac
+
+test "x$enable_ttfdump" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/upmendex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/upmendex/
+## configure options and TL libraries required for upmendex
+# Check whether --enable-upmendex was given.
+if test ${enable_upmendex+y}
+then :
+  enableval=$enable_upmendex;
+fi
+case $enable_upmendex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_upmendex=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-upmendex=$enable_upmendex'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-upmendex=$enable_upmendex'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-upmendex=$enable_upmendex'"
+    ;;
+esac
+
+test "x$enable_upmendex" = xno || {
+  need_kpathsea=yes
+  need_icu=yes
+}
+
+## texk/xdvik/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/
+## configure options and TL libraries required for xdvik
+# Check whether --enable-xdvik was given.
+if test ${enable_xdvik+y}
+then :
+  enableval=$enable_xdvik;
+fi
+if test "x$with_x" = xno
+then :
+  case $enable_xdvik in #(
+  "") :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \`--without-x' -> \`--disable-xdvik'" >&5
+printf "%s\n" "$as_me: \`--without-x' -> \`--disable-xdvik'" >&6;}
+                      enable_xdvik=no
+                      ac_configure_args="$ac_configure_args '--disable-xdvik'" ;; #(
+  yes) :
+    as_fn_error $? "Sorry, incompatible options \`--without-x' and \`--enable-xdvik'" "$LINENO" 5 ;; #(
+  *) :
+     ;;
+esac
+fi
+case $enable_xdvik in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_xdvik=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xdvik=$enable_xdvik'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-xdvik=$enable_xdvik'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xdvik=$enable_xdvik'"
+    ;;
+esac
+
+test "x$enable_xdvik" = xno || {
+  need_kpathsea=yes
+  need_freetype2=yes
+}
+
+## texk/xdvik/ac/xdvik.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/
+## configure options for xdvik
+
+# Check whether --with-xdvi-x-toolkit was given.
+if test ${with_xdvi_x_toolkit+y}
+then :
+  withval=$with_xdvi_x_toolkit;
+fi
+
+
+## texk/texlive/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
+## configure options and TL libraries required for texlive
+# Check whether --enable-texlive was given.
+if test ${enable_texlive+y}
+then :
+  enableval=$enable_texlive;
+fi
+case $enable_texlive in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_texlive=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texlive=$enable_texlive'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-texlive=$enable_texlive'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-texlive=$enable_texlive'"
+    ;;
+esac
+
+## texk/texlive/ac/texlive.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
+## configure options for texlive
+# Check whether --enable-linked-scripts was given.
+if test ${enable_linked_scripts+y}
+then :
+  enableval=$enable_linked_scripts;
+fi
+
+
+## libs/pplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/pplib/
+## configure options and TL libraries required for pplib
+
+## libs/harfbuzz/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/
+## configure options and TL libraries required for harfbuzz
+
+# Check whether --with-system-harfbuzz was given.
+if test ${with_system_harfbuzz+y}
+then :
+  withval=$with_system_harfbuzz;
+fi
+if test "x$with_system_harfbuzz" = x; then
+  if test -f $srcdir/../libs/harfbuzz/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`harfbuzz' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`harfbuzz' headers and library from TL tree" >&6;}
+    with_system_harfbuzz=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`harfbuzz' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`harfbuzz' headers and library" >&6;}
+    with_system_harfbuzz=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-harfbuzz=$with_system_harfbuzz'"
+fi
+if test "x$with_system_harfbuzz" = xyes; then
+  if test "x$with_system_graphite2" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`graphite2' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`graphite2' headers and library" >&6;}
+    with_system_graphite2=yes
+    ac_configure_args="$ac_configure_args '--with-system-graphite2'"
+  elif test "x$with_system_graphite2" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-graphite2'" "$LINENO" 5
+  fi
+  if test "x$with_system_icu" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`icu' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`icu' headers and library" >&6;}
+    with_system_icu=yes
+    ac_configure_args="$ac_configure_args '--with-system-icu'"
+  elif test "x$with_system_icu" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-icu'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_harfbuzz" = xyes && {
+  need_graphite2=yes
+  need_icu=yes
+}
+
+## libs/icu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/
+## configure options and TL libraries required for icu (modified for XeTeX)
+
+# Check whether --with-system-icu was given.
+if test ${with_system_icu+y}
+then :
+  withval=$with_system_icu;
+fi
+if test "x$with_system_icu" = x; then
+  if test -f $srcdir/../libs/icu/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`icu' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`icu' headers and library from TL tree" >&6;}
+    with_system_icu=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`icu' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`icu' headers and library" >&6;}
+    with_system_icu=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-icu=$with_system_icu'"
+fi
+
+## libs/teckit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/
+## configure options and TL libraries required for teckit
+
+# Check whether --with-system-teckit was given.
+if test ${with_system_teckit+y}
+then :
+  withval=$with_system_teckit;
+fi
+if test "x$with_system_teckit" = x; then
+  if test -f $srcdir/../libs/teckit/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`teckit' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`teckit' headers and library from TL tree" >&6;}
+    with_system_teckit=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`teckit' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`teckit' headers and library" >&6;}
+    with_system_teckit=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-teckit=$with_system_teckit'"
+fi
+if test "x$with_system_teckit" = xyes; then
+  if test "x$with_system_zlib" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`zlib' headers and library" >&6;}
+    with_system_zlib=yes
+    ac_configure_args="$ac_configure_args '--with-system-zlib'"
+  elif test "x$with_system_zlib" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_teckit" = xyes && {
+  need_zlib=yes
+}
+
+## libs/graphite2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite2/
+## configure options and TL libraries required for graphite2
+
+# Check whether --with-system-graphite2 was given.
+if test ${with_system_graphite2+y}
+then :
+  withval=$with_system_graphite2;
+fi
+if test "x$with_system_graphite2" = x; then
+  if test -f $srcdir/../libs/graphite2/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`graphite2' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`graphite2' headers and library from TL tree" >&6;}
+    with_system_graphite2=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`graphite2' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`graphite2' headers and library" >&6;}
+    with_system_graphite2=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-graphite2=$with_system_graphite2'"
+fi
+
+## libs/zziplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zziplib/
+## configure options and TL libraries required for zziplib
 
-## libs/zziplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zziplib/
-## configure options and TL libraries required for zziplib
-
 # Check whether --with-system-zziplib was given.
 if test ${with_system_zziplib+y}
 then :
@@ -4510,6 +5932,249 @@ test "x$need_zziplib" = xyes && {
   need_zlib=yes
 }
 
+## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/
+## configure options and TL libraries required for xpdf
+: "kpse_xpdf_options - no-op"
+if test "x$with_system_xpdf" = x; then
+  if test -f $srcdir/../libs/xpdf/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`xpdf' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`xpdf' headers and library from TL tree" >&6;}
+    with_system_xpdf=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`xpdf' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`xpdf' headers and library" >&6;}
+    with_system_xpdf=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-xpdf=$with_system_xpdf'"
+fi
+
+## libs/mpfr/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/mpfr/
+## configure options and TL libraries required for mpfr
+
+# Check whether --with-system-mpfr was given.
+if test ${with_system_mpfr+y}
+then :
+  withval=$with_system_mpfr;
+fi
+
+# Check whether --with-mpfr-includes was given.
+if test ${with_mpfr_includes+y}
+then :
+  withval=$with_mpfr_includes;
+fi
+
+# Check whether --with-mpfr-libdir was given.
+if test ${with_mpfr_libdir+y}
+then :
+  withval=$with_mpfr_libdir;
+fi
+if test "x$with_system_mpfr" = x; then
+  if test -f $srcdir/../libs/mpfr/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`mpfr' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`mpfr' headers and library from TL tree" >&6;}
+    with_system_mpfr=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`mpfr' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`mpfr' headers and library" >&6;}
+    with_system_mpfr=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-mpfr=$with_system_mpfr'"
+fi
+if test "x$with_system_mpfr" = xyes; then
+  if test "x$with_system_gmp" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`gmp' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`gmp' headers and library" >&6;}
+    with_system_gmp=yes
+    ac_configure_args="$ac_configure_args '--with-system-gmp'"
+  elif test "x$with_system_gmp" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-mpfr' requires \`--with-system-gmp'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_mpfr" = xyes && {
+  need_gmp=yes
+}
+
+## libs/gmp/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gmp/
+## configure options and TL libraries required for gmp
+
+# Check whether --with-system-gmp was given.
+if test ${with_system_gmp+y}
+then :
+  withval=$with_system_gmp;
+fi
+
+# Check whether --with-gmp-includes was given.
+if test ${with_gmp_includes+y}
+then :
+  withval=$with_gmp_includes;
+fi
+
+# Check whether --with-gmp-libdir was given.
+if test ${with_gmp_libdir+y}
+then :
+  withval=$with_gmp_libdir;
+fi
+if test "x$with_system_gmp" = x; then
+  if test -f $srcdir/../libs/gmp/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`gmp' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`gmp' headers and library from TL tree" >&6;}
+    with_system_gmp=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`gmp' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`gmp' headers and library" >&6;}
+    with_system_gmp=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-gmp=$with_system_gmp'"
+fi
+
+## libs/cairo/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/cairo/
+## configure options and TL libraries required for cairo
+
+# Check whether --with-system-cairo was given.
+if test ${with_system_cairo+y}
+then :
+  withval=$with_system_cairo;
+fi
+if test "x$with_system_cairo" = x; then
+  if test -f $srcdir/../libs/cairo/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`cairo' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`cairo' headers and library from TL tree" >&6;}
+    with_system_cairo=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`cairo' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`cairo' headers and library" >&6;}
+    with_system_cairo=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-cairo=$with_system_cairo'"
+fi
+if test "x$with_system_cairo" = xyes; then
+  if test "x$with_system_pixman" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`pixman' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`pixman' headers and library" >&6;}
+    with_system_pixman=yes
+    ac_configure_args="$ac_configure_args '--with-system-pixman'"
+  elif test "x$with_system_pixman" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-cairo' requires \`--with-system-pixman'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_cairo" = xyes && {
+  need_pixman=yes
+}
+
+## libs/pixman/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/pixman/
+## configure options and TL libraries required for pixman
+
+# Check whether --with-system-pixman was given.
+if test ${with_system_pixman+y}
+then :
+  withval=$with_system_pixman;
+fi
+if test "x$with_system_pixman" = x; then
+  if test -f $srcdir/../libs/pixman/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`pixman' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`pixman' headers and library from TL tree" >&6;}
+    with_system_pixman=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`pixman' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`pixman' headers and library" >&6;}
+    with_system_pixman=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-pixman=$with_system_pixman'"
+fi
+
+## libs/gd/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
+## configure options and TL libraries required for gd
+
+# Check whether --with-system-gd was given.
+if test ${with_system_gd+y}
+then :
+  withval=$with_system_gd;
+fi
+
+# Check whether --with-gd-includes was given.
+if test ${with_gd_includes+y}
+then :
+  withval=$with_gd_includes;
+fi
+
+# Check whether --with-gd-libdir was given.
+if test ${with_gd_libdir+y}
+then :
+  withval=$with_gd_libdir;
+fi
+if test "x$with_system_gd" = x; then
+  if test -f $srcdir/../libs/gd/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`gd' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`gd' headers and library from TL tree" >&6;}
+    with_system_gd=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`gd' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`gd' headers and library" >&6;}
+    with_system_gd=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-gd=$with_system_gd'"
+fi
+if test "x$with_system_gd" = xyes; then
+  if test "x$with_system_libpng" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`libpng' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`libpng' headers and library" >&6;}
+    with_system_libpng=yes
+    ac_configure_args="$ac_configure_args '--with-system-libpng'"
+  elif test "x$with_system_libpng" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-gd' requires \`--with-system-libpng'" "$LINENO" 5
+  fi
+  if test "x$with_system_freetype2" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`freetype2' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`freetype2' headers and library" >&6;}
+    with_system_freetype2=yes
+    ac_configure_args="$ac_configure_args '--with-system-freetype2'"
+  elif test "x$with_system_freetype2" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-gd' requires \`--with-system-freetype2'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_gd" = xyes && {
+  need_libpng=yes
+  need_freetype2=yes
+}
+
+## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/
+## configure options and TL libraries required for freetype2
+
+# Check whether --with-system-freetype2 was given.
+if test ${with_system_freetype2+y}
+then :
+  withval=$with_system_freetype2;
+fi
+if test "x$with_system_freetype2" = x; then
+  if test -f $srcdir/../libs/freetype2/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`freetype2' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`freetype2' headers and library from TL tree" >&6;}
+    with_system_freetype2=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`freetype2' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`freetype2' headers and library" >&6;}
+    with_system_freetype2=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-freetype2=$with_system_freetype2'"
+fi
+if test "x$with_system_freetype2" = xyes; then
+  if test "x$with_system_zlib" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`zlib' headers and library" >&6;}
+    with_system_zlib=yes
+    ac_configure_args="$ac_configure_args '--with-system-zlib'"
+  elif test "x$with_system_zlib" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_freetype2" = xyes && {
+  need_zlib=yes
+}
+
 ## libs/libpng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/
 ## configure options and TL libraries required for libpng
 
@@ -4545,6 +6210,39 @@ test "x$need_libpng" = xyes && {
   need_zlib=yes
 }
 
+## libs/libpaper/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpaper/
+## configure options and TL libraries required for libpaper
+
+# Check whether --with-system-libpaper was given.
+if test ${with_system_libpaper+y}
+then :
+  withval=$with_system_libpaper;
+fi
+
+# Check whether --with-libpaper-includes was given.
+if test ${with_libpaper_includes+y}
+then :
+  withval=$with_libpaper_includes;
+fi
+
+# Check whether --with-libpaper-libdir was given.
+if test ${with_libpaper_libdir+y}
+then :
+  withval=$with_libpaper_libdir;
+fi
+if test "x$with_system_libpaper" = x; then
+  if test -f $srcdir/../libs/libpaper/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`libpaper' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`libpaper' headers and library from TL tree" >&6;}
+    with_system_libpaper=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`libpaper' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`libpaper' headers and library" >&6;}
+    with_system_libpaper=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-libpaper=$with_system_libpaper'"
+fi
+
 ## libs/luajit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/luajit/
 ## configure options and TL libraries required for luajit
 
@@ -4585,6 +6283,41 @@ printf "%s\n" "$as_me: Assuming installed \`zlib' headers and library" >&6;}
 fi
 
 
+## texk/ptexenc/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/
+## configure options and TL libraries required for ptexenc
+
+# Check whether --with-system-ptexenc was given.
+if test ${with_system_ptexenc+y}
+then :
+  withval=$with_system_ptexenc;
+fi
+if test "x$with_system_ptexenc" = x; then
+  if test -f $srcdir/../texk/ptexenc/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`ptexenc' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`ptexenc' headers and library from TL tree" >&6;}
+    with_system_ptexenc=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`ptexenc' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`ptexenc' headers and library" >&6;}
+    with_system_ptexenc=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-ptexenc=$with_system_ptexenc'"
+fi
+if test "x$with_system_ptexenc" = xyes; then
+  if test "x$with_system_kpathsea" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`kpathsea' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`kpathsea' headers and library" >&6;}
+    with_system_kpathsea=yes
+    ac_configure_args="$ac_configure_args '--with-system-kpathsea'"
+  elif test "x$with_system_kpathsea" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-ptexenc' requires \`--with-system-kpathsea'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_ptexenc" = xyes && {
+  need_kpathsea=yes
+}
+
 ## texk/kpathsea/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
 ## configure options and TL libraries required for kpathsea
 
@@ -5597,6 +7330,186 @@ if test -x $srcdir/web2c/configure; then
 else
   echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/web2c/configure' >&5
 fi
+if test -x $srcdir/afm2pl/configure; then
+  test "x$enable_afm2pl" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS afm2pl"
+  CONF_SUBDIRS="$CONF_SUBDIRS afm2pl"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/afm2pl/configure' >&5
+fi
+if test -x $srcdir/bibtex-x/configure; then
+  test "x$enable_bibtex_x" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS bibtex-x"
+  CONF_SUBDIRS="$CONF_SUBDIRS bibtex-x"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/bibtex-x/configure' >&5
+fi
+if test -x $srcdir/chktex/configure; then
+  test "x$enable_chktex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS chktex"
+  CONF_SUBDIRS="$CONF_SUBDIRS chktex"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/chktex/configure' >&5
+fi
+if test -x $srcdir/cjkutils/configure; then
+  test "x$enable_cjkutils" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS cjkutils"
+  CONF_SUBDIRS="$CONF_SUBDIRS cjkutils"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/cjkutils/configure' >&5
+fi
+if test -x $srcdir/detex/configure; then
+  test "x$enable_detex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS detex"
+  CONF_SUBDIRS="$CONF_SUBDIRS detex"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/detex/configure' >&5
+fi
+if test -x $srcdir/dtl/configure; then
+  test "x$enable_dtl" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dtl"
+  CONF_SUBDIRS="$CONF_SUBDIRS dtl"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/dtl/configure' >&5
+fi
+if test -x $srcdir/dvi2tty/configure; then
+  test "x$enable_dvi2tty" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvi2tty"
+  CONF_SUBDIRS="$CONF_SUBDIRS dvi2tty"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/dvi2tty/configure' >&5
+fi
+if test -x $srcdir/dvidvi/configure; then
+  test "x$enable_dvidvi" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvidvi"
+  CONF_SUBDIRS="$CONF_SUBDIRS dvidvi"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/dvidvi/configure' >&5
+fi
+if test -x $srcdir/dviljk/configure; then
+  test "x$enable_dviljk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dviljk"
+  CONF_SUBDIRS="$CONF_SUBDIRS dviljk"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/dviljk/configure' >&5
+fi
+if test -x $srcdir/dviout-util/configure; then
+  test "x$enable_dviout_util" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dviout-util"
+  CONF_SUBDIRS="$CONF_SUBDIRS dviout-util"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/dviout-util/configure' >&5
+fi
+if test -x $srcdir/dvipdfm-x/configure; then
+  test "x$enable_dvipdfm_x" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipdfm-x"
+  CONF_SUBDIRS="$CONF_SUBDIRS dvipdfm-x"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/dvipdfm-x/configure' >&5
+fi
+if test -x $srcdir/dvipng/configure; then
+  test "x$enable_dvipng" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipng"
+  CONF_SUBDIRS="$CONF_SUBDIRS dvipng"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/dvipng/configure' >&5
+fi
+if test -x $srcdir/dvipos/configure; then
+  test "x$enable_dvipos" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipos"
+  CONF_SUBDIRS="$CONF_SUBDIRS dvipos"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/dvipos/configure' >&5
+fi
+if test -x $srcdir/dvipsk/configure; then
+  test "x$enable_dvipsk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipsk"
+  CONF_SUBDIRS="$CONF_SUBDIRS dvipsk"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/dvipsk/configure' >&5
+fi
+if test -x $srcdir/dvisvgm/configure; then
+  test "x$enable_dvisvgm" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvisvgm"
+  CONF_SUBDIRS="$CONF_SUBDIRS dvisvgm"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/dvisvgm/configure' >&5
+fi
+if test -x $srcdir/gregorio/configure; then
+  test "x$enable_gregorio" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS gregorio"
+  CONF_SUBDIRS="$CONF_SUBDIRS gregorio"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/gregorio/configure' >&5
+fi
+if test -x $srcdir/gsftopk/configure; then
+  test "x$enable_gsftopk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS gsftopk"
+  CONF_SUBDIRS="$CONF_SUBDIRS gsftopk"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/gsftopk/configure' >&5
+fi
+if test -x $srcdir/lcdf-typetools/configure; then
+  test "x$enable_lcdf_typetools" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS lcdf-typetools"
+  CONF_SUBDIRS="$CONF_SUBDIRS lcdf-typetools"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/lcdf-typetools/configure' >&5
+fi
+if test -x $srcdir/makeindexk/configure; then
+  test "x$enable_makeindexk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS makeindexk"
+  CONF_SUBDIRS="$CONF_SUBDIRS makeindexk"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/makeindexk/configure' >&5
+fi
+if test -x $srcdir/makejvf/configure; then
+  test "x$enable_makejvf" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS makejvf"
+  CONF_SUBDIRS="$CONF_SUBDIRS makejvf"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/makejvf/configure' >&5
+fi
+if test -x $srcdir/mendexk/configure; then
+  test "x$enable_mendexk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS mendexk"
+  CONF_SUBDIRS="$CONF_SUBDIRS mendexk"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/mendexk/configure' >&5
+fi
+if test -x $srcdir/musixtnt/configure; then
+  test "x$enable_musixtnt" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS musixtnt"
+  CONF_SUBDIRS="$CONF_SUBDIRS musixtnt"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/musixtnt/configure' >&5
+fi
+if test -x $srcdir/ps2pk/configure; then
+  test "x$enable_ps2pk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ps2pk"
+  CONF_SUBDIRS="$CONF_SUBDIRS ps2pk"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/ps2pk/configure' >&5
+fi
+if test -x $srcdir/psutils/configure; then
+  test "x$enable_psutils" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS psutils"
+  CONF_SUBDIRS="$CONF_SUBDIRS psutils"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/psutils/configure' >&5
+fi
+if test -x $srcdir/seetexk/configure; then
+  test "x$enable_seetexk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS seetexk"
+  CONF_SUBDIRS="$CONF_SUBDIRS seetexk"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/seetexk/configure' >&5
+fi
+if test -x $srcdir/tex4htk/configure; then
+  test "x$enable_tex4htk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS tex4htk"
+  CONF_SUBDIRS="$CONF_SUBDIRS tex4htk"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/tex4htk/configure' >&5
+fi
+if test -x $srcdir/ttf2pk2/configure; then
+  test "x$enable_ttf2pk2" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ttf2pk2"
+  CONF_SUBDIRS="$CONF_SUBDIRS ttf2pk2"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/ttf2pk2/configure' >&5
+fi
+if test -x $srcdir/ttfdump/configure; then
+  test "x$enable_ttfdump" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ttfdump"
+  CONF_SUBDIRS="$CONF_SUBDIRS ttfdump"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/ttfdump/configure' >&5
+fi
+if test -x $srcdir/upmendex/configure; then
+  test "x$enable_upmendex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS upmendex"
+  CONF_SUBDIRS="$CONF_SUBDIRS upmendex"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/upmendex/configure' >&5
+fi
+if test -x $srcdir/xdvik/configure; then
+  test "x$enable_xdvik" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS xdvik"
+  CONF_SUBDIRS="$CONF_SUBDIRS xdvik"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/xdvik/configure' >&5
+fi
 if test -x $srcdir/texlive/configure; then
   test "x$enable_texlive" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS texlive"
   CONF_SUBDIRS="$CONF_SUBDIRS texlive"
diff --git a/source/texk/kpathsea/ChangeLog b/source/texk/kpathsea/ChangeLog
index 53aad5047214ef51fc9621f4e3506022b9b7f0f5..f1d65b75d87c9b19dbbb93817b797ab26040e94f 100644
--- a/source/texk/kpathsea/ChangeLog
+++ b/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,19 @@
+2022-03-21  Karl Berry  <karl@tug.org>
+
+	* TL'22 release.
+
+2022-03-05  Karl Berry  <karl@freefriends.org>
+
+	* texmf.cnf (TEXINPUTS.hi*tex): new entries.
+
+2022-02-27  Karl Berry  <karl@tug.org>
+
+	* texmf.cnf (nest_size): 500 -> 1000.
+	(param_size): 10000 -> 20000.
+	(stack_size): 5000 -> 10000.
+	For stex (ctan.org/pkg/stex), although they also double main_memory
+	to 12M (despite the supposed limit of 8M)?
+
 2022-01-18  Karl Berry  <karl@freefriends.org>
 
 	* version.ac (kpse_dev): no more /dev.
diff --git a/source/texk/kpathsea/texmf.cnf b/source/texk/kpathsea/texmf.cnf
index fa71b3e315524b04276e02c8415c3720ba235fa1..b5d2dfda66833f09841377e97223ea2acc203d38 100644
--- a/source/texk/kpathsea/texmf.cnf
+++ b/source/texk/kpathsea/texmf.cnf
@@ -281,7 +281,12 @@ TEXINPUTS.context       = $TEXMFDOTDIR;$TEXMF/tex/{context,plain,generic,}//
 % OpTeX.
 TEXINPUTS.optex         = $TEXMFDOTDIR;$TEXMF/tex/{optex,plain,generic,}//
 
-% jadetex.
+% HiTeX.
+TEXINPUTS.hilatex       = $TEXMFDOTDIR;$TEXMF/tex/{hilatex,latex,hitex,generic,}//
+TEXINPUTS.hilatex-dev   = $TEXMFDOTDIR;$TEXMF/tex/{latex-dev,hilatex,latex,hitex,generic,}//
+TEXINPUTS.hitex         = $TEXMFDOTDIR;$TEXMF/tex/{hitex,plain,generic,latex,}//
+
+% JadeTeX.
 TEXINPUTS.jadetex       = $TEXMFDOTDIR;$TEXMF/tex/{jadetex,latex,generic,latex,}//
 TEXINPUTS.pdfjadetex    = $TEXMFDOTDIR;$TEXMF/tex/{jadetex,latex,generic,latex,}//
 
@@ -781,9 +786,6 @@ texmf_casefold_search = 1
 % To increase space for boxes (as might be needed by, e.g., PiCTeX),
 % increase extra_mem_bot.
 %
-% For some xy-pic samples, you may need as much as 700000 words of memory.
-% For the vast majority of documents, 60000 or less will do.
-%
 main_memory = 5000000 % words of inimemory available; also applies to inimf&mp
 extra_mem_top = 0     % extra high memory for chars, tokens, etc.
 extra_mem_bot = 0     % extra low memory for boxes, glue, breakpoints, etc.
@@ -831,12 +833,12 @@ trie_size = 1100000
 hyph_size = 8191        % prime number of hyphenation exceptions, >610, <65535
                         % http://primes.utm.edu/curios/page.php/8191.html
                         % dynamically increased as necessary, so not important.
-nest_size = 500         % simultaneous semantic levels (e.g., groups)
+nest_size = 1000        % simultaneous semantic levels (e.g., groups)
 max_in_open = 15        % simultaneous input files and error insertions, 
                         % also applies to MetaPost
-param_size = 10000      % simultaneous macro parameters, also applies to MP
+param_size = 20000      % simultaneous macro parameters, also applies to MP
 save_size  = 200000     % for saving values outside current group
-stack_size = 5000       % simultaneous input sources
+stack_size = 10000      % simultaneous input sources
 
 % Limit on recursive expansion calls so TeX has a chance to quit nicely
 % before stack space runs out. The default is 10000. Normally there is no
diff --git a/source/texk/texlive/linked_scripts/Makefile.in b/source/texk/texlive/linked_scripts/Makefile.in
index fcb7641014a2be7a0bb20892c3fae82595bcb8b2..360cad534236e868e5afb5f8b4e3f70366ff34df 100644
--- a/source/texk/texlive/linked_scripts/Makefile.in
+++ b/source/texk/texlive/linked_scripts/Makefile.in
@@ -147,7 +147,7 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in ChangeLog
+am__DIST_COMMON = $(srcdir)/Makefile.in ChangeLog README
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
diff --git a/source/texk/texlive/tl_support/Makefile.in b/source/texk/texlive/tl_support/Makefile.in
index a129602b33f4bae0de60cfe9996c04731e50beeb..08c4d7bc0156d7e0bb4adc90cc14ac609e2a8341 100644
--- a/source/texk/texlive/tl_support/Makefile.in
+++ b/source/texk/texlive/tl_support/Makefile.in
@@ -156,7 +156,7 @@ MANS = $(dist_man_MANS)
 DATA = $(dist_texconfig_DATA) $(dist_web2c_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \
-	$(top_srcdir)/../../am/man1_links.am
+	$(top_srcdir)/../../am/man1_links.am ChangeLog README
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
diff --git a/source/texk/web2c/ChangeLog b/source/texk/web2c/ChangeLog
index 9bd41efd0c093b0fdd6c7dfddffdd3a16fa99858..23c5ee70b3eb4eb145434edfdb9d9127258a89d4 100644
--- a/source/texk/web2c/ChangeLog
+++ b/source/texk/web2c/ChangeLog
@@ -1,3 +1,36 @@
+2022-03-21  Karl Berry  <karl@tug.org>
+
+	* TL'22 release.
+
+2022-03-10  Andreas Scherer  <https://ascherer.github.io>
+
+	* ctangleboot.cin,
+	* cwebboot.cin: Make 'fall thru' comments active.
+
+2022-03-03  Andreas Scherer  <https://ascherer.github.io>
+
+	* cpascal.h,
+	* tangle.ch,
+	* tangleboot.pin: Always create pool file next to Pascal file.
+
+2022-03-02  Andreas Scherer  <https://ascherer.github.io>
+
+	* help.h,
+	* tangle.ch,
+	* tangleboot.pin,
+	* weave.ch: Permit user-defined output file names.
+
+2022-02-24  Karl Berry  <karl@freefriends.org>
+
+	* dvitype.ch (scan_bop, [99]): output a newline between
+	font definitions so they do not run together.
+	From Igor Liferenko,
+	https://tug.org/pipermail/tex-k/2022-January/003760.html (change#3).
+	Original report part of
+	https://tug.org/pipermail/tex-k/2021-November/003711.html,
+	and a first patch from Andreas Scherer in that thread,
+	https://tug.org/pipermail/tex-k/2021-November/003721.html.
+
 2022-02-18  Andreas Scherer  <https://ascherer.github.io>
 
 	* cwebboot.cin,
diff --git a/source/texk/web2c/Makefile.in b/source/texk/web2c/Makefile.in
index 6d1321afd74565e113f9078783343211b382c0d8..411d457bcd1b6c29306374e02bbfa046210b7bac 100644
--- a/source/texk/web2c/Makefile.in
+++ b/source/texk/web2c/Makefile.in
@@ -416,9 +416,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h ff-config.h
-CONFIG_CLEAN_FILES = omegafonts/Makefile otps/Makefile \
-	otps/win32/Makefile window/Makefile web2c-sh tangle-sh \
-	ctangleboot-sh silent-sh synctexdir/synctex.pc callexe.c
+CONFIG_CLEAN_FILES = web2c-sh tangle-sh ctangleboot-sh silent-sh \
+	synctexdir/synctex.pc callexe.c
 CONFIG_CLEAN_VPATH_FILES =
 am__EXEEXT_1 = bibtex$(EXEEXT) dvicopy$(EXEEXT) dvitype$(EXEEXT) \
 	gftodvi$(EXEEXT) gftopk$(EXEEXT) gftype$(EXEEXT) mft$(EXEEXT) \
@@ -2621,7 +2620,7 @@ am__can_run_installinfo = \
 man1dir = $(mandir)/man1
 man5dir = $(mandir)/man5
 NROFF = nroff
-MANS = $(dist_man_MANS) $(nodist_man_MANS)
+MANS = $(dist_man_MANS) $(man1_MANS) $(nodist_man_MANS)
 DATA = $(pkgconfig_DATA)
 am__syncinclude_HEADERS_DIST = synctexdir/synctex_parser.h \
 	synctexdir/synctex_version.h synctexdir/synctex_parser_utils.h
@@ -2883,11 +2882,7 @@ am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/../../am/bin_links.am \
 	$(top_srcdir)/../../build-aux/test-driver \
 	$(top_srcdir)/../texlive/w32_wrapper/callexe.c \
 	$(top_srcdir)/luatexdir/luafontloader/ff-config.in \
-	$(top_srcdir)/omegafonts/Makefile.in \
-	$(top_srcdir)/otps/Makefile.in \
-	$(top_srcdir)/otps/win32/Makefile.in \
-	$(top_srcdir)/synctexdir/synctex.pc.in \
-	$(top_srcdir)/window/Makefile.in ../../build-aux/ar-lib \
+	$(top_srcdir)/synctexdir/synctex.pc.in ../../build-aux/ar-lib \
 	../../build-aux/compile ../../build-aux/config.guess \
 	../../build-aux/config.sub ../../build-aux/depcomp \
 	../../build-aux/install-sh ../../build-aux/ltmain.sh \
@@ -4648,8 +4643,16 @@ euptex_ch_srcs = \
 # e-upTeX Tests
 #
 euptex_tests = euptexdir/euptriptest.test euptexdir/pdfprimitive.test euptexdir/eupver.test
+
+# At the moment, these are the only man pages handled in the
+# conglomerated web2c/Makefile[.am]. (All the others are in man/.)
+# If that changes, have to set at top level and use +=.
+@HITEX_TRUE@man1_MANS = hitexdir/man/hishrink.man hitexdir/man/histretch.man \
+@HITEX_TRUE@            hitexdir/man/hitex.man
+
 hitex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) -I$(srcdir)/libmd5 \
-	-DINIT -DSTAT -DDEBUG
+	-DINIT -DSTAT
+# -DDEBUG drops into an interactive debugging session.
 hitex_LDADD = $(KPATHSEA_LIBS) $(ZLIB_LIBS) libmd5.a libmd5.a
 hitex_DEPENDENCIES = $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) libmd5.a
 #
@@ -5758,14 +5761,6 @@ stamp-h2: $(top_srcdir)/luatexdir/luafontloader/ff-config.in $(top_builddir)/con
 
 distclean-hdr:
 	-rm -f w2c/c-auto.h w2c/stamp-h1 ff-config.h stamp-h2
-omegafonts/Makefile: $(top_builddir)/config.status $(top_srcdir)/omegafonts/Makefile.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-otps/Makefile: $(top_builddir)/config.status $(top_srcdir)/otps/Makefile.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-otps/win32/Makefile: $(top_builddir)/config.status $(top_srcdir)/otps/win32/Makefile.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-window/Makefile: $(top_builddir)/config.status $(top_srcdir)/window/Makefile.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 web2c-sh: $(top_builddir)/config.status $(srcdir)/web2c-sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 tangle-sh: $(top_builddir)/config.status $(srcdir)/tangle-sh.in
@@ -19207,9 +19202,9 @@ clean-libtool:
 
 distclean-libtool:
 	-rm -f libtool config.lt
-install-man1: $(dist_man_MANS) $(nodist_man_MANS)
+install-man1: $(dist_man_MANS) $(man1_MANS) $(nodist_man_MANS)
 	@$(NORMAL_INSTALL)
-	@list1=''; \
+	@list1='$(man1_MANS)'; \
 	list2='$(dist_man_MANS) $(nodist_man_MANS)'; \
 	test -n "$(man1dir)" \
 	  && test -n "`echo $$list1$$list2`" \
@@ -19243,7 +19238,7 @@ install-man1: $(dist_man_MANS) $(nodist_man_MANS)
 
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man1dir)" || exit 0; \
+	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
 	l2='$(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 	  sed -n '/\.1[a-z]*$$/p'; \
@@ -22425,7 +22420,7 @@ euptrip-clean:
 # (end of euptex.am)
 
 # convenience target to build all the programs here.
-hiall: hitex hishrink histretch
+@HITEX_TRUE@hiall: hitex hishrink histretch
 
 $(hiformat_c_h_l_y): hiformat-tangle
 
diff --git a/source/texk/web2c/NEWS b/source/texk/web2c/NEWS
index f47bcb49c42d437be24990f6607dd41e8e6e6c8f..edbe29bbff5bd08f2bbdb49caf6731f70587e6de 100644
--- a/source/texk/web2c/NEWS
+++ b/source/texk/web2c/NEWS
@@ -1,12 +1,14 @@
 This file records noteworthy changes.  (Public domain.)
 
 
-2022 (for TeX Live 2022)
+2022 (for TeX Live 2022, 21 March 2022)
 
 * new hitex engine included, which outputs HINT files for display on
 mobile devices. HINT viewers for GNU/Linux, Windows, and Android are
 available.
 
+* tangle, weave: support optional third argument to specify output file.
+
 * twill program for original Pascal *.web mini-indexes included.
 
 * across actively-extended engines
diff --git a/source/texk/web2c/cpascal.h b/source/texk/web2c/cpascal.h
index ccebfc5f901c7ffd0a9fe7778d17d99326fb6992..14f6e1be62be0b6bac43f68e006ecce6281738fd 100644
--- a/source/texk/web2c/cpascal.h
+++ b/source/texk/web2c/cpascal.h
@@ -285,6 +285,7 @@ typedef const unsigned char *const_w2custring;
 #define kpsesrccompile	kpse_src_compile
 #define recorderchangefilename	recorder_change_filename
 #define recorderenabled	recorder_enabled
+#define removesuffix	remove_suffix
 #define texmfyesno      texmf_yesno
 
 /* We need a new type for the argument parsing, too.  */
diff --git a/source/texk/web2c/ctangleboot.cin b/source/texk/web2c/ctangleboot.cin
index 83b438ce35f64815632d4d583f90364a0a5c5c0d..18ba68505ce5b47be6946e957b0cc211830594dd 100644
--- a/source/texk/web2c/ctangleboot.cin
+++ b/source/texk/web2c/ctangleboot.cin
@@ -274,7 +274,7 @@ extern FILE*active_file;
 extern FILE*check_file;
 
 /*:15*//*116:*/
-#line 504 "cwebdir/ctang-w2c.ch"
+#line 506 "cwebdir/ctang-w2c.ch"
 
 extern char cb_banner[];
 
@@ -462,15 +462,15 @@ static eight_bits get_next(void);
 static void scan_repl(eight_bits);
 
 /*:84*//*91:*/
-#line 1413 "cwebdir/ctangle.w"
+#line 1411 "cwebdir/ctangle.w"
 static void scan_section(void);
 
 /*:91*//*99:*/
-#line 1490 "cwebdir/ctangle.w"
+#line 1488 "cwebdir/ctangle.w"
 static void phase_one(void);
 
 /*:99*//*101:*/
-#line 1523 "cwebdir/ctangle.w"
+#line 1521 "cwebdir/ctangle.w"
 static void skip_limbo(void);
 
 /*:101*/
@@ -540,7 +540,7 @@ ccode['\'']= ord;
 section_text[0]= ' ';
 
 /*:78*//*117:*/
-#line 507 "cwebdir/ctang-w2c.ch"
+#line 509 "cwebdir/ctang-w2c.ch"
 
 strncpy(cb_banner,banner,max_banner-1);
 
@@ -754,11 +754,11 @@ writeloop:/*50:*/
 if(check_for_change){
 fclose(C_file);C_file= NULL;
 /*106:*/
-#line 387 "cwebdir/ctang-w2c.ch"
+#line 389 "cwebdir/ctang-w2c.ch"
 
 if((C_file= fopen(C_file_name,"r"))!=NULL){
 /*107:*/
-#line 394 "cwebdir/ctang-w2c.ch"
+#line 396 "cwebdir/ctang-w2c.ch"
 
 boolean comparison= false;
 
@@ -767,7 +767,7 @@ fatal(_("! Cannot open output file "),check_file_name);
 
 
 /*108:*/
-#line 408 "cwebdir/ctang-w2c.ch"
+#line 410 "cwebdir/ctang-w2c.ch"
 
 do{
 char x[BUFSIZ],y[BUFSIZ];
@@ -777,17 +777,17 @@ comparison= (x_size==y_size)&&!memcmp(x,y,x_size);
 }while(comparison&&!feof(C_file)&&!feof(check_file));
 
 /*:108*/
-#line 401 "cwebdir/ctang-w2c.ch"
+#line 403 "cwebdir/ctang-w2c.ch"
 
 
 fclose(C_file);C_file= NULL;
 fclose(check_file);check_file= NULL;
 
 /*:107*/
-#line 389 "cwebdir/ctang-w2c.ch"
+#line 391 "cwebdir/ctang-w2c.ch"
 
 /*109:*/
-#line 419 "cwebdir/ctang-w2c.ch"
+#line 421 "cwebdir/ctang-w2c.ch"
 
 if(comparison)
 remove(check_file_name);
@@ -797,7 +797,7 @@ rename(check_file_name,C_file_name);
 }
 
 /*:109*/
-#line 390 "cwebdir/ctang-w2c.ch"
+#line 392 "cwebdir/ctang-w2c.ch"
 
 }else
 rename(check_file_name,C_file_name);
@@ -810,7 +810,7 @@ for(an_output_file= end_output_files;an_output_file> cur_out_file;){
 an_output_file--;
 sprint_section_name(output_file_name,*an_output_file);
 if(check_for_change)/*105:*/
-#line 378 "cwebdir/ctang-w2c.ch"
+#line 380 "cwebdir/ctang-w2c.ch"
 {
 if((C_file= fopen(output_file_name,"a"))==NULL)
 fatal(_("! Cannot open output file "),output_file_name);
@@ -841,14 +841,14 @@ flush_buffer();
 if(check_for_change){
 fclose(C_file);C_file= NULL;
 /*110:*/
-#line 432 "cwebdir/ctang-w2c.ch"
+#line 434 "cwebdir/ctang-w2c.ch"
 
 if(0==strcmp("/dev/stdout",output_file_name))
 /*112:*/
-#line 459 "cwebdir/ctang-w2c.ch"
+#line 461 "cwebdir/ctang-w2c.ch"
 {
 /*115:*/
-#line 490 "cwebdir/ctang-w2c.ch"
+#line 492 "cwebdir/ctang-w2c.ch"
 
 char in_buf[BUFSIZ+1];
 int in_size;
@@ -858,7 +858,7 @@ fatal(_("! Cannot open output file "),check_file_name);
 
 
 /*:115*/
-#line 460 "cwebdir/ctang-w2c.ch"
+#line 462 "cwebdir/ctang-w2c.ch"
 
 do{
 in_size= fread(in_buf,sizeof(char),BUFSIZ,check_file);
@@ -867,7 +867,7 @@ fprintf(stdout,"%s",in_buf);
 }while(!feof(check_file));
 fclose(check_file);check_file= NULL;
 /*111:*/
-#line 449 "cwebdir/ctang-w2c.ch"
+#line 451 "cwebdir/ctang-w2c.ch"
 
 if(comparison)
 remove(check_file_name);
@@ -877,19 +877,19 @@ rename(check_file_name,output_file_name);
 }
 
 /*:111*/
-#line 467 "cwebdir/ctang-w2c.ch"
+#line 469 "cwebdir/ctang-w2c.ch"
 
 }
 
 /*:112*/
-#line 434 "cwebdir/ctang-w2c.ch"
+#line 436 "cwebdir/ctang-w2c.ch"
 
 else if(0==strcmp("/dev/stderr",output_file_name))
 /*113:*/
-#line 472 "cwebdir/ctang-w2c.ch"
+#line 474 "cwebdir/ctang-w2c.ch"
 {
 /*115:*/
-#line 490 "cwebdir/ctang-w2c.ch"
+#line 492 "cwebdir/ctang-w2c.ch"
 
 char in_buf[BUFSIZ+1];
 int in_size;
@@ -899,7 +899,7 @@ fatal(_("! Cannot open output file "),check_file_name);
 
 
 /*:115*/
-#line 473 "cwebdir/ctang-w2c.ch"
+#line 475 "cwebdir/ctang-w2c.ch"
 
 do{
 in_size= fread(in_buf,sizeof(char),BUFSIZ,check_file);
@@ -908,7 +908,7 @@ fprintf(stderr,"%s",in_buf);
 }while(!feof(check_file));
 fclose(check_file);check_file= NULL;
 /*111:*/
-#line 449 "cwebdir/ctang-w2c.ch"
+#line 451 "cwebdir/ctang-w2c.ch"
 
 if(comparison)
 remove(check_file_name);
@@ -918,20 +918,20 @@ rename(check_file_name,output_file_name);
 }
 
 /*:111*/
-#line 480 "cwebdir/ctang-w2c.ch"
+#line 482 "cwebdir/ctang-w2c.ch"
 
 }
 
 /*:113*/
-#line 436 "cwebdir/ctang-w2c.ch"
+#line 438 "cwebdir/ctang-w2c.ch"
 
 else if(0==strcmp("/dev/null",output_file_name))
 /*114:*/
-#line 485 "cwebdir/ctang-w2c.ch"
+#line 487 "cwebdir/ctang-w2c.ch"
 {
 boolean comparison= true;
 /*111:*/
-#line 449 "cwebdir/ctang-w2c.ch"
+#line 451 "cwebdir/ctang-w2c.ch"
 
 if(comparison)
 remove(check_file_name);
@@ -941,17 +941,17 @@ rename(check_file_name,output_file_name);
 }
 
 /*:111*/
-#line 487 "cwebdir/ctang-w2c.ch"
+#line 489 "cwebdir/ctang-w2c.ch"
 
 }
 
 /*:114*/
-#line 438 "cwebdir/ctang-w2c.ch"
+#line 440 "cwebdir/ctang-w2c.ch"
 
 else{
 if((C_file= fopen(output_file_name,"r"))!=NULL){
 /*107:*/
-#line 394 "cwebdir/ctang-w2c.ch"
+#line 396 "cwebdir/ctang-w2c.ch"
 
 boolean comparison= false;
 
@@ -960,7 +960,7 @@ fatal(_("! Cannot open output file "),check_file_name);
 
 
 /*108:*/
-#line 408 "cwebdir/ctang-w2c.ch"
+#line 410 "cwebdir/ctang-w2c.ch"
 
 do{
 char x[BUFSIZ],y[BUFSIZ];
@@ -970,17 +970,17 @@ comparison= (x_size==y_size)&&!memcmp(x,y,x_size);
 }while(comparison&&!feof(C_file)&&!feof(check_file));
 
 /*:108*/
-#line 401 "cwebdir/ctang-w2c.ch"
+#line 403 "cwebdir/ctang-w2c.ch"
 
 
 fclose(C_file);C_file= NULL;
 fclose(check_file);check_file= NULL;
 
 /*:107*/
-#line 441 "cwebdir/ctang-w2c.ch"
+#line 443 "cwebdir/ctang-w2c.ch"
 
 /*111:*/
-#line 449 "cwebdir/ctang-w2c.ch"
+#line 451 "cwebdir/ctang-w2c.ch"
 
 if(comparison)
 remove(check_file_name);
@@ -990,7 +990,7 @@ rename(check_file_name,output_file_name);
 }
 
 /*:111*/
-#line 442 "cwebdir/ctang-w2c.ch"
+#line 444 "cwebdir/ctang-w2c.ch"
 
 }else
 rename(check_file_name,output_file_name);
@@ -1153,7 +1153,7 @@ case string:if(out_state==verbatim)out_state= normal;
 else out_state= verbatim;break;
 case'/':C_putc('/');out_state= post_slash;break;
 case'*':if(out_state==post_slash)C_putc(' ');
-
+/* fall through */
 default:C_putc(cur_char);out_state= normal;break;
 }
 }
@@ -1600,18 +1600,16 @@ while(true)switch(a= get_next()){
 
 case identifier:store_id(a);
 if(*buffer=='#'&&(
-(id_first==buffer+1&&id_loc-id_first==5
-&&strncmp("endif",id_first,5)==0)||
-(id_first==buffer+1&&id_loc-id_first==4
-&&strncmp("else",id_first,4)==0)||
-(id_first==buffer+1&&id_loc-id_first==4
-&&strncmp("elif",id_first,4)==0)))
+(id_loc-id_first==5&&strncmp("endif",id_first,5)==0)||
+(id_loc-id_first==4&&strncmp("else",id_first,4)==0)||
+(id_loc-id_first==4&&strncmp("elif",id_first,4)==0)))
+
 print_where= true;
 break;
 case section_name:if(t!=section_name)goto done;
 else{
 /*87:*/
-#line 1287 "cwebdir/ctangle.w"
+#line 1285 "cwebdir/ctangle.w"
 {
 char*try_loc= loc;
 while(*try_loc==' '&&try_loc<limit)try_loc++;
@@ -1619,14 +1617,14 @@ if(*try_loc=='+'&&try_loc<limit)try_loc++;
 while(*try_loc==' '&&try_loc<limit)try_loc++;
 #line 294 "cwebdir/ctang-w2c.ch"
 if(*try_loc=='=')err_print(_("! Missing `@ ' before a named section"));
-#line 1293 "cwebdir/ctangle.w"
+#line 1291 "cwebdir/ctangle.w"
 
 
 
 }
 
 /*:87*/
-#line 1257 "cwebdir/ctangle.w"
+#line 1255 "cwebdir/ctangle.w"
 
 a= cur_section_name-name_dir;
 app_repl((a/0400)+0250);
@@ -1649,13 +1647,13 @@ store_id(a);
 }
 
 /*:85*/
-#line 1261 "cwebdir/ctangle.w"
+#line 1259 "cwebdir/ctangle.w"
 
 }
 break;
 #line 282 "cwebdir/ctang-w2c.ch"
 case output_defs_code:if(t!=section_name)err_print(_("! Misplaced @h"));
-#line 1265 "cwebdir/ctangle.w"
+#line 1263 "cwebdir/ctangle.w"
 
 else{
 output_defs_seen= true;
@@ -1680,13 +1678,13 @@ store_id(a);
 }
 
 /*:85*/
-#line 1271 "cwebdir/ctangle.w"
+#line 1269 "cwebdir/ctangle.w"
 
 }
 break;
 case constant:case string:
 /*88:*/
-#line 1304 "cwebdir/ctangle.w"
+#line 1302 "cwebdir/ctangle.w"
 
 app_repl(a);
 while(id_first<id_loc){
@@ -1694,7 +1692,7 @@ if(*id_first=='@'){
 if(*(id_first+1)=='@')id_first++;
 #line 300 "cwebdir/ctang-w2c.ch"
 else err_print(_("! Double @ should be used in string"));
-#line 1310 "cwebdir/ctangle.w"
+#line 1308 "cwebdir/ctangle.w"
 
 }
 else if(a==constant&&*id_first=='\''&&!keep_digit_separators)
@@ -1704,12 +1702,12 @@ app_repl(*id_first++);
 app_repl(a);
 
 /*:88*/
-#line 1275 "cwebdir/ctangle.w"
+#line 1273 "cwebdir/ctangle.w"
 
 break;
 case ord:
 /*89:*/
-#line 1322 "cwebdir/ctangle.w"
+#line 1320 "cwebdir/ctangle.w"
 {
 int c= (int)((eight_bits)*id_first);
 if(c=='\\'){
@@ -1748,7 +1746,7 @@ case'\'':c= '\'';break;
 case'\"':c= '\"';break;
 #line 306 "cwebdir/ctang-w2c.ch"
 default:err_print(_("! Unrecognized escape sequence"));
-#line 1359 "cwebdir/ctangle.w"
+#line 1357 "cwebdir/ctangle.w"
 
 }
 }
@@ -1761,14 +1759,14 @@ app_repl(constant);
 }
 
 /*:89*/
-#line 1278 "cwebdir/ctangle.w"
+#line 1276 "cwebdir/ctangle.w"
 
 break;
 case definition:case format_code:case begin_C:if(t!=section_name)goto done;
 else{
 #line 288 "cwebdir/ctang-w2c.ch"
 err_print(_("! @d, @f and @c are ignored in C text"));continue;
-#line 1283 "cwebdir/ctangle.w"
+#line 1281 "cwebdir/ctangle.w"
 
 }
 case new_section:goto done;
@@ -1789,7 +1787,7 @@ cur_text= text_ptr;(++text_ptr)->tok_start= tok_ptr;
 }
 
 /*:83*//*90:*/
-#line 1380 "cwebdir/ctangle.w"
+#line 1378 "cwebdir/ctangle.w"
 
 static void
 scan_section(void)
@@ -1804,7 +1802,7 @@ printf("*%d",(int)section_count);update_terminal;
 next_control= ignore;
 while(true){
 /*92:*/
-#line 1421 "cwebdir/ctangle.w"
+#line 1419 "cwebdir/ctangle.w"
 
 while(next_control<definition)
 
@@ -1813,17 +1811,17 @@ loc-= 2;next_control= get_next();
 }
 
 /*:92*/
-#line 1394 "cwebdir/ctangle.w"
+#line 1392 "cwebdir/ctangle.w"
 
 if(next_control==definition){
 /*93:*/
-#line 1428 "cwebdir/ctangle.w"
+#line 1426 "cwebdir/ctangle.w"
 
 while((next_control= get_next())=='\n');
 if(next_control!=identifier){
 #line 312 "cwebdir/ctang-w2c.ch"
 err_print(_("! Definition flushed, must start with identifier"));
-#line 1432 "cwebdir/ctangle.w"
+#line 1430 "cwebdir/ctangle.w"
 
 continue;
 }
@@ -1835,7 +1833,7 @@ scan_repl(macro);
 cur_text->text_link= macro;
 
 /*:93*/
-#line 1396 "cwebdir/ctangle.w"
+#line 1394 "cwebdir/ctangle.w"
 
 continue;
 }
@@ -1845,14 +1843,14 @@ p= name_dir;break;
 if(next_control==section_name){
 p= cur_section_name;
 /*94:*/
-#line 1450 "cwebdir/ctangle.w"
+#line 1448 "cwebdir/ctangle.w"
 
 while((next_control= get_next())=='+');
 if(next_control!='='&&next_control!=eq_eq)
 continue;
 
 /*:94*/
-#line 1404 "cwebdir/ctangle.w"
+#line 1402 "cwebdir/ctangle.w"
 
 break;
 }
@@ -1860,20 +1858,20 @@ return;
 }
 no_where= print_where= false;
 /*95:*/
-#line 1455 "cwebdir/ctangle.w"
+#line 1453 "cwebdir/ctangle.w"
 
 /*96:*/
-#line 1460 "cwebdir/ctangle.w"
+#line 1458 "cwebdir/ctangle.w"
 
 store_two_bytes((sixteen_bits)(0150000+section_count));
 
 
 /*:96*/
-#line 1456 "cwebdir/ctangle.w"
+#line 1454 "cwebdir/ctangle.w"
 
 scan_repl(section_name);
 /*97:*/
-#line 1464 "cwebdir/ctangle.w"
+#line 1462 "cwebdir/ctangle.w"
 
 if(p==name_dir||p==NULL){
 last_unnamed->text_link= cur_text-text_info;last_unnamed= cur_text;
@@ -1890,16 +1888,16 @@ cur_text->text_link= section_flag;
 
 
 /*:97*/
-#line 1458 "cwebdir/ctangle.w"
+#line 1456 "cwebdir/ctangle.w"
 
 
 /*:95*/
-#line 1410 "cwebdir/ctangle.w"
+#line 1408 "cwebdir/ctangle.w"
 
 }
 
 /*:90*//*98:*/
-#line 1479 "cwebdir/ctangle.w"
+#line 1477 "cwebdir/ctangle.w"
 
 static void
 phase_one(void){
@@ -1912,7 +1910,7 @@ check_complete();
 }
 
 /*:98*//*100:*/
-#line 1495 "cwebdir/ctangle.w"
+#line 1493 "cwebdir/ctangle.w"
 
 static void
 skip_limbo(void)
@@ -1926,15 +1924,15 @@ char c= *loc++;
 switch(ccode[(eight_bits)c]){
 case new_section:return;
 case translit_code:/*102:*/
-#line 1525 "cwebdir/ctangle.w"
+#line 1523 "cwebdir/ctangle.w"
 
 while(xisspace(*loc)&&loc<limit)loc++;
 loc+= 3;
 if(loc> limit||!xisxdigit(*(loc-3))||!xisxdigit(*(loc-2))
 ||(*(loc-3)>='0'&&*(loc-3)<='7')||!xisspace(*(loc-1)))
-#line 330 "cwebdir/ctang-w2c.ch"
+#line 332 "cwebdir/ctang-w2c.ch"
 err_print(_("! Improper hex number following @l"));
-#line 1531 "cwebdir/ctangle.w"
+#line 1529 "cwebdir/ctangle.w"
 
 else{
 unsigned int i;
@@ -1944,9 +1942,9 @@ while(xisspace(*loc)&&loc<limit)loc++;
 beg= loc;
 while(loc<limit&&(xisalpha(*loc)||xisdigit(*loc)||*loc=='_'))loc++;
 if(loc-beg>=translit_length)
-#line 336 "cwebdir/ctang-w2c.ch"
+#line 338 "cwebdir/ctang-w2c.ch"
 err_print(_("! Replacement string in @l too long"));
-#line 1541 "cwebdir/ctangle.w"
+#line 1539 "cwebdir/ctangle.w"
 
 else{
 strncpy(translit[i-0200],beg,(size_t)(loc-beg));
@@ -1955,7 +1953,7 @@ translit[i-0200][loc-beg]= '\0';
 }
 
 /*:102*/
-#line 1507 "cwebdir/ctangle.w"
+#line 1505 "cwebdir/ctangle.w"
 break;
 case format_code:case'@':break;
 case control_text:if(c=='q'||c=='Q'){
@@ -1963,13 +1961,13 @@ while((c= (char)skip_ahead())=='@');
 if(*(loc-1)!='>')
 #line 318 "cwebdir/ctang-w2c.ch"
 err_print(_("! Double @ should be used in control text"));
-#line 1513 "cwebdir/ctangle.w"
+#line 1511 "cwebdir/ctangle.w"
 
 break;
-}
-#line 324 "cwebdir/ctang-w2c.ch"
+#line 325 "cwebdir/ctang-w2c.ch"
+}/* otherwise fall through */
 default:err_print(_("! Double @ should be used in limbo"));
-#line 1517 "cwebdir/ctangle.w"
+#line 1515 "cwebdir/ctangle.w"
 
 }
 }
@@ -1977,11 +1975,11 @@ default:err_print(_("! Double @ should be used in limbo"));
 }
 
 /*:100*//*103:*/
-#line 1551 "cwebdir/ctangle.w"
+#line 1549 "cwebdir/ctangle.w"
 
 void
 print_stats(void){
-#line 349 "cwebdir/ctang-w2c.ch"
+#line 351 "cwebdir/ctang-w2c.ch"
 puts(_("\nMemory usage statistics:"));
 printf(_("%td names (out of %ld)\n"),
 (ptrdiff_t)(name_ptr-name_dir),(long)max_names);
@@ -1990,9 +1988,9 @@ printf(_("%td replacement texts (out of %ld)\n"),
 printf(_("%td bytes (out of %ld)\n"),
 (ptrdiff_t)(byte_ptr-byte_mem),(long)max_bytes);
 printf(_("%td tokens (out of %ld)\n"),
-#line 1562 "cwebdir/ctangle.w"
+#line 1560 "cwebdir/ctangle.w"
 (ptrdiff_t)(tok_ptr-tok_mem),(long)max_toks);
 }
 
-#line 362 "cwebdir/ctang-w2c.ch"
+#line 364 "cwebdir/ctang-w2c.ch"
 /*:103*/
diff --git a/source/texk/web2c/cwebboot.cin b/source/texk/web2c/cwebboot.cin
index ebf5f2c7c58a3e15a87d9c3d407f33cc515ff1a4..212a8b704c5b9d2a50eea71c3d9b88141520a007 100644
--- a/source/texk/web2c/cwebboot.cin
+++ b/source/texk/web2c/cwebboot.cin
@@ -1229,7 +1229,7 @@ print_section_name(r);
 err_print(">");
 }
 else if(name_len<prefix_length(r))set_prefix_length(r,name_len);
-
+/* fall through */
 case equal:break;
 case extension:if(!ispref||first<=last)
 extend_section_name(r,first,last+1,ispref);
diff --git a/source/texk/web2c/cwebdir/ChangeLog b/source/texk/web2c/cwebdir/ChangeLog
index c370c7d062157104553112be32eb4494f6f773b3..a85748558a4cb1b30a35a6438c91e071e256a2ea 100644
--- a/source/texk/web2c/cwebdir/ChangeLog
+++ b/source/texk/web2c/cwebdir/ChangeLog
@@ -1,3 +1,16 @@
+2022-03-10  Andreas Scherer  <https://ascherer.github.io>
+
+	* Makefile,
+	* common.c,
+	* common.w,
+	* ctang-w2c.ch,
+	* ctangle.c,
+	* ctangle.w,
+	* ctwill-mini.ch,
+	* ctwill-w2c.ch,
+	* cweav-w2c.ch,
+	* cweave.w: Make 'fall thru' comments active.
+
 2022-02-18  Andreas Scherer  <https://ascherer.github.io>
 
 	* common.c,
diff --git a/source/texk/web2c/cwebdir/Makefile b/source/texk/web2c/cwebdir/Makefile
index 92e59b857b84b66ddfc14605e3c37b01da1ea7d4..d3bc422059b49856e740b1381317fb594bf06efc 100644
--- a/source/texk/web2c/cwebdir/Makefile
+++ b/source/texk/web2c/cwebdir/Makefile
@@ -50,7 +50,7 @@ TCHANGES=
 WCHANGES=
 
 # We keep debugging info around, for fun, but most users don't need it
-CFLAGS = -g
+CFLAGS = -g # -Wall -Wextra -Wimplicit-fallthrough=2 # check compiler warnings
 #CFLAGS = -O
 LINKFLAGS = -g
 #LINKFLAGS = -s # for smaller (stripped) executables on many UNIX systems
diff --git a/source/texk/web2c/cwebdir/common.c b/source/texk/web2c/cwebdir/common.c
index bcf6c54f84f838e6c840bdd3115700f00327c8b1..2b5c7c9ccc6191c6d78160a1dc5dbe5b15547a8e 100644
--- a/source/texk/web2c/cwebdir/common.c
+++ b/source/texk/web2c/cwebdir/common.c
@@ -1017,7 +1017,7 @@ print_section_name(r);
 err_print(">");
 }
 else if(name_len<prefix_length(r))set_prefix_length(r,name_len);
-
+/* fall through */
 case equal:break;
 case extension:if(!ispref||first<=last)
 extend_section_name(r,first,last+1,ispref);
diff --git a/source/texk/web2c/cwebdir/common.w b/source/texk/web2c/cwebdir/common.w
index 941b7206cc26a5fdf93bc5c054107b2dafddb5de..be110e5c334e5597ce935bd7958b09e75a146238 100644
--- a/source/texk/web2c/cwebdir/common.w
+++ b/source/texk/web2c/cwebdir/common.w
@@ -919,7 +919,7 @@ switch(section_name_cmp(&first,name_len,r)) {
       err_print(">");
     }
     else if (name_len<prefix_length(r)) set_prefix_length(r,name_len);
-    /* fall through */
+    @=/* fall through */@>@;
   case equal: break;
   case extension: if (!ispref || first<=last)
         extend_section_name(r,first,last+1,ispref);
diff --git a/source/texk/web2c/cwebdir/ctang-w2c.ch b/source/texk/web2c/cwebdir/ctang-w2c.ch
index 6a284181224e85ead168d6b67ba7ceb460b130bf..6d74d1997a64bc68c6d43474a508ca7be266075f 100644
--- a/source/texk/web2c/cwebdir/ctang-w2c.ch
+++ b/source/texk/web2c/cwebdir/ctang-w2c.ch
@@ -319,8 +319,10 @@ case output_defs_code: if (t!=section_name) err_print(_("! Misplaced @@h"));
 @z
 
 @x
+          } @=/* otherwise fall through */@>@;
         default: err_print("! Double @@ should be used in limbo");
 @y
+          } @=/* otherwise fall through */@>@;
         default: err_print(_("! Double @@ should be used in limbo"));
 @z
 
diff --git a/source/texk/web2c/cwebdir/ctangle.c b/source/texk/web2c/cwebdir/ctangle.c
index d8bdb7e30f43b95b230eeb629bfd7b09d8e92d52..bc00c0cf7f3187abf3992f70dbc3d68a01f65a7e 100644
--- a/source/texk/web2c/cwebdir/ctangle.c
+++ b/source/texk/web2c/cwebdir/ctangle.c
@@ -434,15 +434,15 @@ static eight_bits get_next(void);
 static void scan_repl(eight_bits);
 
 /*:84*//*91:*/
-#line 1413 "ctangle.w"
+#line 1411 "ctangle.w"
 static void scan_section(void);
 
 /*:91*//*99:*/
-#line 1490 "ctangle.w"
+#line 1488 "ctangle.w"
 static void phase_one(void);
 
 /*:99*//*101:*/
-#line 1523 "ctangle.w"
+#line 1521 "ctangle.w"
 static void skip_limbo(void);
 
 /*:101*/
@@ -866,7 +866,7 @@ case string:if(out_state==verbatim)out_state= normal;
 else out_state= verbatim;break;
 case'/':C_putc('/');out_state= post_slash;break;
 case'*':if(out_state==post_slash)C_putc(' ');
-
+/* fall through */
 default:C_putc(cur_char);out_state= normal;break;
 }
 }
@@ -1283,18 +1283,16 @@ while(true)switch(a= get_next()){
 
 case identifier:store_id(a);
 if(*buffer=='#'&&(
-(id_first==buffer+1&&id_loc-id_first==5
-&&strncmp("endif",id_first,5)==0)||
-(id_first==buffer+1&&id_loc-id_first==4
-&&strncmp("else",id_first,4)==0)||
-(id_first==buffer+1&&id_loc-id_first==4
-&&strncmp("elif",id_first,4)==0)))
+(id_loc-id_first==5&&strncmp("endif",id_first,5)==0)||
+(id_loc-id_first==4&&strncmp("else",id_first,4)==0)||
+(id_loc-id_first==4&&strncmp("elif",id_first,4)==0)))
+
 print_where= true;
 break;
 case section_name:if(t!=section_name)goto done;
 else{
 /*87:*/
-#line 1287 "ctangle.w"
+#line 1285 "ctangle.w"
 {
 char*try_loc= loc;
 while(*try_loc==' '&&try_loc<limit)try_loc++;
@@ -1307,7 +1305,7 @@ if(*try_loc=='=')err_print("! Missing `@ ' before a named section");
 }
 
 /*:87*/
-#line 1257 "ctangle.w"
+#line 1255 "ctangle.w"
 
 a= cur_section_name-name_dir;
 app_repl((a/0400)+0250);
@@ -1330,7 +1328,7 @@ store_id(a);
 }
 
 /*:85*/
-#line 1261 "ctangle.w"
+#line 1259 "ctangle.w"
 
 }
 break;
@@ -1359,13 +1357,13 @@ store_id(a);
 }
 
 /*:85*/
-#line 1271 "ctangle.w"
+#line 1269 "ctangle.w"
 
 }
 break;
 case constant:case string:
 /*88:*/
-#line 1304 "ctangle.w"
+#line 1302 "ctangle.w"
 
 app_repl(a);
 while(id_first<id_loc){
@@ -1381,12 +1379,12 @@ app_repl(*id_first++);
 app_repl(a);
 
 /*:88*/
-#line 1275 "ctangle.w"
+#line 1273 "ctangle.w"
 
 break;
 case ord:
 /*89:*/
-#line 1322 "ctangle.w"
+#line 1320 "ctangle.w"
 {
 int c= (int)((eight_bits)*id_first);
 if(c=='\\'){
@@ -1436,7 +1434,7 @@ app_repl(constant);
 }
 
 /*:89*/
-#line 1278 "ctangle.w"
+#line 1276 "ctangle.w"
 
 break;
 case definition:case format_code:case begin_C:if(t!=section_name)goto done;
@@ -1460,7 +1458,7 @@ cur_text= text_ptr;(++text_ptr)->tok_start= tok_ptr;
 }
 
 /*:83*//*90:*/
-#line 1380 "ctangle.w"
+#line 1378 "ctangle.w"
 
 static void
 scan_section(void)
@@ -1475,7 +1473,7 @@ printf("*%d",(int)section_count);update_terminal;
 next_control= ignore;
 while(true){
 /*92:*/
-#line 1421 "ctangle.w"
+#line 1419 "ctangle.w"
 
 while(next_control<definition)
 
@@ -1484,11 +1482,11 @@ loc-= 2;next_control= get_next();
 }
 
 /*:92*/
-#line 1394 "ctangle.w"
+#line 1392 "ctangle.w"
 
 if(next_control==definition){
 /*93:*/
-#line 1428 "ctangle.w"
+#line 1426 "ctangle.w"
 
 while((next_control= get_next())=='\n');
 if(next_control!=identifier){
@@ -1504,7 +1502,7 @@ scan_repl(macro);
 cur_text->text_link= macro;
 
 /*:93*/
-#line 1396 "ctangle.w"
+#line 1394 "ctangle.w"
 
 continue;
 }
@@ -1514,14 +1512,14 @@ p= name_dir;break;
 if(next_control==section_name){
 p= cur_section_name;
 /*94:*/
-#line 1450 "ctangle.w"
+#line 1448 "ctangle.w"
 
 while((next_control= get_next())=='+');
 if(next_control!='='&&next_control!=eq_eq)
 continue;
 
 /*:94*/
-#line 1404 "ctangle.w"
+#line 1402 "ctangle.w"
 
 break;
 }
@@ -1529,20 +1527,20 @@ return;
 }
 no_where= print_where= false;
 /*95:*/
-#line 1455 "ctangle.w"
+#line 1453 "ctangle.w"
 
 /*96:*/
-#line 1460 "ctangle.w"
+#line 1458 "ctangle.w"
 
 store_two_bytes((sixteen_bits)(0150000+section_count));
 
 
 /*:96*/
-#line 1456 "ctangle.w"
+#line 1454 "ctangle.w"
 
 scan_repl(section_name);
 /*97:*/
-#line 1464 "ctangle.w"
+#line 1462 "ctangle.w"
 
 if(p==name_dir||p==NULL){
 last_unnamed->text_link= cur_text-text_info;last_unnamed= cur_text;
@@ -1559,16 +1557,16 @@ cur_text->text_link= section_flag;
 
 
 /*:97*/
-#line 1458 "ctangle.w"
+#line 1456 "ctangle.w"
 
 
 /*:95*/
-#line 1410 "ctangle.w"
+#line 1408 "ctangle.w"
 
 }
 
 /*:90*//*98:*/
-#line 1479 "ctangle.w"
+#line 1477 "ctangle.w"
 
 static void
 phase_one(void){
@@ -1581,7 +1579,7 @@ check_complete();
 }
 
 /*:98*//*100:*/
-#line 1495 "ctangle.w"
+#line 1493 "ctangle.w"
 
 static void
 skip_limbo(void)
@@ -1595,7 +1593,7 @@ char c= *loc++;
 switch(ccode[(eight_bits)c]){
 case new_section:return;
 case translit_code:/*102:*/
-#line 1525 "ctangle.w"
+#line 1523 "ctangle.w"
 
 while(xisspace(*loc)&&loc<limit)loc++;
 loc+= 3;
@@ -1620,7 +1618,7 @@ translit[i-0200][loc-beg]= '\0';
 }
 
 /*:102*/
-#line 1507 "ctangle.w"
+#line 1505 "ctangle.w"
 break;
 case format_code:case'@':break;
 case control_text:if(c=='q'||c=='Q'){
@@ -1629,7 +1627,7 @@ if(*(loc-1)!='>')
 err_print("! Double @ should be used in control text");
 
 break;
-}
+}/* otherwise fall through */
 default:err_print("! Double @ should be used in limbo");
 
 }
@@ -1638,7 +1636,7 @@ default:err_print("! Double @ should be used in limbo");
 }
 
 /*:100*//*103:*/
-#line 1551 "ctangle.w"
+#line 1549 "ctangle.w"
 
 void
 print_stats(void){
diff --git a/source/texk/web2c/cwebdir/ctangle.w b/source/texk/web2c/cwebdir/ctangle.w
index cd462961e24631e7075d66864a22032f07c8a303..039f337865a746cb4ba97dc09d38f6c1e5f9b19b 100644
--- a/source/texk/web2c/cwebdir/ctangle.w
+++ b/source/texk/web2c/cwebdir/ctangle.w
@@ -666,7 +666,7 @@ restart:
         else out_state=verbatim; break;
       case '/': C_putc('/'); out_state=post_slash; break;
       case '*': if (out_state==post_slash) C_putc(' ');
-        /* fall through */
+        @=/* fall through */@>@;
       default: C_putc(cur_char); out_state=normal; break;
     }
 }
@@ -1244,13 +1244,11 @@ file name.
 @ @<In cases that |a| is...@>=@t\1\quad@>
 case identifier: store_id(a);
   if (*buffer=='#' && @| (
-      ( id_first==buffer+1 && id_loc-id_first==5
-        && strncmp("endif",id_first,5)==0 ) || @|
-      ( id_first==buffer+1 && id_loc-id_first==4
-        && strncmp("else",id_first,4)==0 ) || @|
-      ( id_first==buffer+1 && id_loc-id_first==4
-        && strncmp("elif",id_first,4)==0 ) ) )
-    print_where=true; /* Avoid preprocessor calamities */
+      ( id_loc-id_first==5 && strncmp("endif",id_first,5)==0 ) || @|
+      ( id_loc-id_first==4 && strncmp("else",id_first,4)==0 ) || @|
+      ( id_loc-id_first==4 && strncmp("elif",id_first,4)==0 ) ) )
+      /* Avoid preprocessor calamities */
+    print_where=true;
   break;
 case section_name: if (t!=section_name) goto done;
   else {
@@ -1512,7 +1510,7 @@ skip_limbo(void)
             err_print("! Double @@ should be used in control text");
 @.Double @@ should be used...@>
           break;
-          } /* otherwise fall through */
+          } @=/* otherwise fall through */@>@;
         default: err_print("! Double @@ should be used in limbo");
 @.Double @@ should be used...@>
       }
diff --git a/source/texk/web2c/cwebdir/cweav-w2c.ch b/source/texk/web2c/cwebdir/cweav-w2c.ch
index 80951343d37f0e26dce29c26a149b694e89e5230..2f776674788e21be967307ffedd7fa4b5b675bef 100644
--- a/source/texk/web2c/cwebdir/cweav-w2c.ch
+++ b/source/texk/web2c/cwebdir/cweav-w2c.ch
@@ -523,8 +523,10 @@ if (show_progress) fputs(_("\nWriting the output file..."),stdout);
 @z
 
 @x
+        } @=/* otherwise fall through */@>@;
       default: err_print("! Improper macro definition"); break;
 @y
+        } @=/* otherwise fall through */@>@;
       default: err_print(_("! Improper macro definition")); break;
 @z
 
diff --git a/source/texk/web2c/cwebdir/cweave.w b/source/texk/web2c/cwebdir/cweave.w
index 5db1c371b552251260e1a6c8b20392112955e108..f23baa3dabc6d66980a3f5bac401e219a35a08ca 100644
--- a/source/texk/web2c/cwebdir/cweave.w
+++ b/source/texk/web2c/cwebdir/cweave.w
@@ -948,7 +948,7 @@ switch(ccode[c=*loc++]) {
   case verbatim: @<Scan a verbatim string@>@;
   case ord: @<Get a string@>@;
   case xref_roman: case xref_wildcard: case xref_typewriter: case noop:
-  case TeX_string: skip_restricted(); /* fall through */
+  case TeX_string: skip_restricted(); @=/* fall through */@>@;
   default: return ccode[c];
 }
 
@@ -2535,10 +2535,12 @@ text_pointer p)
         if (name_dir[r].ilk==case_like) return case_found;
         if (name_dir[r].ilk==operator_like) return operator_found;
         if (name_dir[r].ilk!=raw_int) break;
+        @=/* else fall through */@>@;
       case 1: return j;
       case 4: case 5: /* |tok_flag| or |inner_tok_flag| */
         if ((q=find_first_ident(tok_start+r))!=no_ident_found)
           return q;
+        @=/* else fall through */@>@;
       default: ; /* char, |section_flag|, fall thru: move on to next token */
         if (*j==inserted) return no_ident_found; /* ignore inserts */
         else if (*j==qualifier) j++; /* bypass namespace qualifier */
@@ -3919,7 +3921,7 @@ make_output(void) /* outputs the equivalents of tokens */
       case end_translation: return;
       case identifier: case res_word: @<Output an identifier@>@; break;
       case section_code: @<Output a section name@>@; break;
-      case math_rel: out_str("\\MRL{"@q}@>); /* fall through */
+      case math_rel: out_str("\\MRL{"@q}@>); @=/* fall through */@>@;
 @.\\MRL@>
       case noop: case inserted: break;
       case cancel: case big_cancel: c=0; b=a;
@@ -3941,11 +3943,11 @@ make_output(void) /* outputs the equivalents of tokens */
         if (a!=big_force) {
           out_str("\\1\\1"); goto reswitch;
         }
-        else dindent_pending=true; /* fall through */
+        else dindent_pending=true; @=/* fall through */@>@;
       case indent: case outdent: case opt: case backup: case break_space:
       case force: case big_force: case preproc_line: @<Output a control,
         look ahead in case of line breaks, possibly |goto reswitch|@>@; break;
-      case quoted_char: out(*(cur_tok++)); /* fall through */
+      case quoted_char: out(*(cur_tok++)); @=/* fall through */@>@;
       case qualifier: break;
       default: out(a); /* otherwise |a| is an ordinary character */
     }
@@ -4100,7 +4102,7 @@ while (k<k_limit) {
     switch (b) {
     case ' ': case '\\': case '#': case '%': case '$': case '^':
     case '{': case '}': case '~': case '&': case '_':
-      out('\\'); /* falls through */
+      out('\\'); @=/* falls through */@>@;
 @.\\\ @>
 @.\\\\@>
 @.\\\#@>
@@ -4353,7 +4355,7 @@ it starts after we scan the matching `\.)'.
         app_scrap(raw_int,no_math);
         if ((next_control=get_next())==')') {
           app(next_control); next_control=get_next(); break;
-        } /* otherwise fall through */
+        } @=/* otherwise fall through */@>@;
       default: err_print("! Improper macro definition"); break;
       }
       app('$');
@@ -4786,6 +4788,7 @@ lowcase: out_str("\\\\");
   case wildcard: out_str("\\9");@+ goto not_an_identifier;
 @.\\9@>
   case typewriter: out_str("\\.");
+  @=/* fall through */@>@;
 @.\\.@>
   case roman: not_an_identifier: out_name(cur_name,false); goto name_done;
   case custom:
diff --git a/source/texk/web2c/help.h b/source/texk/web2c/help.h
index c3146b58f44b2537ed8ad677dbbef8587486ed8d..821b00899d906c176ebc8cd33de5ef8516819c6c 100644
--- a/source/texk/web2c/help.h
+++ b/source/texk/web2c/help.h
@@ -486,11 +486,13 @@ const_string PTFTOPLHELP[] = {
 
 #if defined (TANGLE) || defined (TANGLEBOOT)
 const_string TANGLEHELP[] = {
-    "Usage: tangle [OPTION]... WEBFILE[.web] [CHANGEFILE[.ch]]",
+    "Usage: tangle [OPTION] WEBFILE[.web] [{CHANGEFILE[.ch]|-} [OUTFILE[.p]]]",
     "  Tangle WEBFILE with CHANGEFILE into a Pascal program.",
     "  Default CHANGEFILE is " DEV_NULL ";",
     "  Pascal output goes to the basename of WEBFILE extended with `.p',",
-    "  and a string pool file, if necessary, to the same extended with `.pool'.",
+    "  unless otherwise specified by OUTFILE,",
+    "  and a string pool file, if necessary, to the same extended with `.pool';",
+    "  in this case, '-' specifies a null CHANGEFILE.",
     "",
     "-length=NUMBER the first NUMBER characters of an identifier have to be",
     "                unique (default 32)",
@@ -627,10 +629,12 @@ const_string VPTOVFHELP[] = {
 
 #ifdef WEAVE
 const_string WEAVEHELP[] = {
-    "Usage: weave [OPTION]... WEBFILE[.web] [CHANGEFILE[.ch]]",
+    "Usage: weave [OPTION] WEBFILE[.web] [{CHANGEFILE[.ch]|-} [OUTFILE[.tex]]]",
     "  Weave WEBFILE with CHANGEFILE into a TeX document.",
     "  Default CHANGEFILE is " DEV_NULL ";",
-    "  TeX output goes to the basename of WEBFILE extended with `.tex'.",
+    "  TeX output goes to the basename of WEBFILE extended with `.tex',",
+    "  unless otherwise specified by OUTFILE;",
+    "  in this case, '-' specifies a null CHANGEFILE.",
     "",
     "-x          omit cross-reference information",
     "-help       display this help and exit",
diff --git a/source/texk/web2c/hitexdir/am/hitex.am b/source/texk/web2c/hitexdir/am/hitex.am
index a72b29c091c3634f8e0959f5c1d607afec0b5077..7231da9eb9d76514adf30b84b9e31dab77bfe26f 100644
--- a/source/texk/web2c/hitexdir/am/hitex.am
+++ b/source/texk/web2c/hitexdir/am/hitex.am
@@ -1,4 +1,4 @@
-## $Id: hitex.am 61595 2022-01-13 15:49:43Z mruckert $
+## $Id: hitex.am 62433 2022-03-05 16:44:12Z karl $
 ## texk/web2c/hitexdir/am/hitex.am: Makefile fragment for HiTeX
 ##
 ## Copyright 2021-2022 Martin Ruckert <ruckert@cs.hm.edu>
@@ -7,18 +7,25 @@
 if HITEX
 bin_PROGRAMS += hitex hishrink histretch
 noinst_PROGRAMS += himktables
-endif HITEX
 
 # convenience target to build all the programs here.
 hiall: hitex hishrink histretch
 
+# At the moment, these are the only man pages handled in the
+# conglomerated web2c/Makefile[.am]. (All the others are in man/.)
+# If that changes, have to set at top level and use +=.
+man1_MANS = hitexdir/man/hishrink.man hitexdir/man/histretch.man \
+            hitexdir/man/hitex.man
+endif HITEX
+
 ## Debugging for the parser as usual.
 ## Except we eschew all lex/yacc steps in the Makefile here; see below.
 ## AM_YFLAGS = -d -v -Wno-yacc
 
 hitex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) 
 hitex_CPPFLAGS += -I$(srcdir)/libmd5
-hitex_CPPFLAGS += -DINIT -DSTAT -DDEBUG
+hitex_CPPFLAGS += -DINIT -DSTAT
+# -DDEBUG drops into an interactive debugging session.
 hitex_LDADD = $(KPATHSEA_LIBS) $(ZLIB_LIBS) libmd5.a
 hitex_LDADD += libmd5.a
 hitex_DEPENDENCIES = $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) libmd5.a
diff --git a/source/texk/web2c/lib/ChangeLog b/source/texk/web2c/lib/ChangeLog
index a7a08288a07b62f1940b52f285234105acf814dd..7516c488f7057afe2c2b74ed22c1c9756122bed1 100644
--- a/source/texk/web2c/lib/ChangeLog
+++ b/source/texk/web2c/lib/ChangeLog
@@ -1,8 +1,23 @@
+2022-03-21  Karl Berry  <karl@tug.org>
+
+	* TL'22 release.
+
+2022-03-08  Hironori Kitagawa  <h_kitagawa2001@yahoo.co.jp>
+
+	* texmfmp.c: Convert filename to utf8 in find_input_file for pTeX.
+	  https://github.com/texjporg/tex-jp-build/issues/45
+
+2022-03-03  Hironori Kitagawa  <h_kitagawa2001@yahoo.co.jp>
+
+	* texmfmp.c: Convert the argument of runpopen to utf8 for pTeX.
+	  https://github.com/texjporg/tex-jp-build/issues/81
+
 2022-01-22  Hironori Kitagawa  <h_kitagawa2001@yahoo.co.jp>
 
 	* openclose.c (open_input): Reencode nameoffile to utf8 for pTeX.
 	* texmfmp.c: Change type of str_pool to unsigned short for pTeX.
 	  We use only 0--511, and use flag 0x100 for Japanese char.
+	  https://github.com/texjporg/tex-jp-build/issues/81
 
 2022-01-01  Akira Kakuto  <kakuto@jcom.zaq.ne.jp>
 
diff --git a/source/texk/web2c/lib/openclose.c b/source/texk/web2c/lib/openclose.c
index 20c3a47de73dea17232c6df8b20227e3e833baf5..1dda1941f4f7346a25fbbe50cc280abc8718a575 100644
--- a/source/texk/web2c/lib/openclose.c
+++ b/source/texk/web2c/lib/openclose.c
@@ -114,6 +114,19 @@ recorder_start(void)
     recorder_file = xfopen(recorder_name, FOPEN_W_MODE);
     
     cwd = xgetcwd();
+#if defined(_WIN32)
+    {
+      wchar_t *wpwd;
+      if (file_system_codepage != 0 &&
+          file_system_codepage != win32_codepage) {
+        wpwd = get_wstring_from_mbstring(win32_codepage, cwd, wpwd=NULL);
+        free (cwd);
+        cwd = get_mbstring_from_wstring(file_system_codepage, wpwd, cwd=NULL);
+        free (wpwd);
+      }
+    }
+#endif /* _WIN32 */
+
     fprintf(recorder_file, "PWD %s\n", cwd);
     free(cwd);
 }
diff --git a/source/texk/web2c/lib/texmfmp.c b/source/texk/web2c/lib/texmfmp.c
index a50b9b5ac2f8958102c1d80d1f28b0f470bf9ba3..6dc2b22119a07cfe1cb4cdea8b9b649f71ee843c 100644
--- a/source/texk/web2c/lib/texmfmp.c
+++ b/source/texk/web2c/lib/texmfmp.c
@@ -667,6 +667,9 @@ runpopen (char *cmd, const char *mode)
   char *safecmd = NULL;
   char *cmdname = NULL;
   int allow;
+#if IS_pTeX && !defined(WIN32)
+  char *cmd2 = NULL;
+#endif
 
 #ifdef WIN32
   char *pp;
@@ -676,14 +679,27 @@ runpopen (char *cmd, const char *mode)
   }
 #endif
 
+#if IS_pTeX && !defined(WIN32)
+  cmd2 = (char *)ptenc_from_internal_enc_string_to_utf8((unsigned char *)cmd);
+  if (!cmd2) cmd2=(char *)cmd;
+#endif
+
   /* If restrictedshell == 0, any command is allowed. */
   if (restrictedshell == 0)
     allow = 1;
   else
+#if IS_pTeX && !defined(WIN32)
+    allow = shell_cmd_is_allowed (cmd2, &safecmd, &cmdname);
+#else
     allow = shell_cmd_is_allowed (cmd, &safecmd, &cmdname);
+#endif
 
   if (allow == 1)
+#if IS_pTeX && !defined(WIN32)
+    f = popen (cmd2, mode);
+#else
     f = popen (cmd, mode);
+#endif
   else if (allow == 2)
     f = popen (safecmd, mode);
   else if (allow == -1)
@@ -692,6 +708,9 @@ runpopen (char *cmd, const char *mode)
   else
     fprintf (stderr, "\nrunpopen command not allowed: %s\n", cmdname);
 
+#if IS_pTeX && !defined(WIN32)
+  if (cmd!=cmd2) free(cmd2);
+#endif
   if (safecmd)
     free (safecmd);
   if (cmdname)
@@ -3379,11 +3398,19 @@ string
 find_input_file(integer s)
 {
     string filename;
-
+#if IS_pTeX && !defined(WIN32)
+    string fname0; string fname1 = NULL;
+#endif
 #if defined(XeTeX)
     filename = gettexstring(s);
 #else
     filename = makecfilename(s);
+#endif
+#if IS_pTeX && !defined(WIN32)
+   fname0 = ptenc_from_internal_enc_string_to_utf8(filename);
+   if (fname0) {
+       fname1 = filename; filename = fname0;
+   }
 #endif
     /* Look in -output-directory first, if the filename is not
        absolute.  This is because we want the pdf* functions to
@@ -3393,14 +3420,26 @@ find_input_file(integer s)
 
         pathname = concat3(output_directory, DIR_SEP_STRING, filename);
         if (!access(pathname, R_OK) && !dir_p (pathname)) {
+#if IS_pTeX && !defined(WIN32)
+            if (fname1) free(filename);
+#endif
             return pathname;
         }
         xfree (pathname);
     }
     if (! kpse_in_name_ok(filename)) {
+#if IS_pTeX && !defined(WIN32)
+       if (fname1) free(filename);
+#endif
        return NULL;                /* no permission */
     }
+#if IS_pTeX && !defined(WIN32)
+    fname0 = kpse_find_tex(filename);
+    if (fname1) free(filename);
+    return fname0;
+#else
     return kpse_find_tex(filename);
+#endif
 }
 
 #if !defined(XeTeX)
diff --git a/source/texk/web2c/luatexdir/ChangeLog b/source/texk/web2c/luatexdir/ChangeLog
index 16405728c243942b6accc94e19cae850b8af7b9e..622230ab1f599dbf2f4efee6882398c513b8f012 100644
--- a/source/texk/web2c/luatexdir/ChangeLog
+++ b/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,7 @@
+2022-03-21  Karl Berry  <karl@tug.org>
+
+	* TL'22 release.
+
 2022-03-10 Luigi Scarso <luigi.scarso@gmail.com>
     *  -[no-]parse-first-line is now an unrecognized option (thanks to K.Berry)
 
diff --git a/source/texk/web2c/luatexdir/luatex_svnversion.h b/source/texk/web2c/luatexdir/luatex_svnversion.h
index 3c45c3972d069150f32bad57d81685ab9aa35673..6baa44b47eb1f84cc2de61122cc1ca94c8748d0e 100644
--- a/source/texk/web2c/luatexdir/luatex_svnversion.h
+++ b/source/texk/web2c/luatexdir/luatex_svnversion.h
@@ -1,4 +1,4 @@
 #ifndef luatex_svn_revision_h
 #define luatex_svn_revision_h
-#define luatex_svn_revision 7509
+#define luatex_svn_revision 7511
 #endif
diff --git a/source/texk/web2c/man/ChangeLog b/source/texk/web2c/man/ChangeLog
index 0d6f4b8d16529cd93dc2cb6cba25802cbb89e565..17615bcff81e03422d393cd7e159eed52e10b8f0 100644
--- a/source/texk/web2c/man/ChangeLog
+++ b/source/texk/web2c/man/ChangeLog
@@ -1,3 +1,30 @@
+2022-03-21  Karl Berry  <karl@tug.org>
+
+	* TL'22 release.
+
+2022-03-08  Karl Berry  <karl@freefriends.org>
+
+	* ofm2opl.man,
+	* opl2ofm.man,
+	* ovf2ovp.man,
+	* ovp2ovf.man,
+	* ttf2afm.man: update contact info.
+	Report from G\"unter Essers,
+	https://tug.org/pipermail/tex-k/2022-March/003776.html
+
+2022-03-03  Andreas Scherer  <https://ascherer.github.io>
+
+	* tangle.man: Clarify the creation of the pool file name.
+
+2022-03-02  Andreas Scherer  <https://ascherer.github.io>
+
+	* tangle.man,
+	* weave.man: Describe the third file name on the commandline.
+
+2022-02-26  Karl Berry  <karl@tug.org>
+
+	* Makefile.am (web_man_sources): add twill.man.
+
 2022-02-02  Andreas Scherer  <https://ascherer.github.io>
 
 	* ctwill.man: CWEB 4.7 release.
diff --git a/source/texk/web2c/man/Makefile.am b/source/texk/web2c/man/Makefile.am
index de0c0cba5dfc348f6e55be0c7063edb933afade6..7ba3ae5443682ba029439f397b3bf8af18743a62 100644
--- a/source/texk/web2c/man/Makefile.am
+++ b/source/texk/web2c/man/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 61575 2022-01-11 22:47:10Z karl $
+## $Id: Makefile.am 62186 2022-02-26 17:51:21Z karl $
 ## Makefile.am for the TeX Live subdirectory texk/web2c/man/
 ##
 ## Copyright 2015-2022 Karl Berry <tex-live@tug.org>
@@ -19,7 +19,8 @@ endif WEB
 EXTRA_DIST += $(web_man_sources)
 web_man_sources = bibtex.man dvicopy.man dvitomp.man dvitype.man gftodvi.man \
 	gftopk.man gftype.man mft.man patgen.man pktogf.man pktype.man \
-	pltotf.man pooltype.man tftopl.man vftovp.man vptovf.man weave.man
+	pltotf.man pooltype.man tftopl.man twill.man \
+	vftovp.man vptovf.man weave.man
 
 if TEX
 man_sources += tex.man
diff --git a/source/texk/web2c/man/Makefile.in b/source/texk/web2c/man/Makefile.in
index 342f1b670a3f5826cb1f063f76f70d5757964593..121896fd8dc6577e110781e7c2d56251ff6acf75 100644
--- a/source/texk/web2c/man/Makefile.in
+++ b/source/texk/web2c/man/Makefile.in
@@ -468,7 +468,8 @@ man1_links = cweb:ctangle cweb:cweave ctwill:ctwill-refsort \
 	latex-dev:uplatex-dev
 web_man_sources = bibtex.man dvicopy.man dvitomp.man dvitype.man gftodvi.man \
 	gftopk.man gftype.man mft.man patgen.man pktogf.man pktype.man \
-	pltotf.man pooltype.man tftopl.man vftovp.man vptovf.man weave.man
+	pltotf.man pooltype.man tftopl.man twill.man \
+	vftovp.man vptovf.man weave.man
 
 pdftex_man_sources = pdftex.man pdftosrc.man ttf2afm.man
 otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp.man ovp2ovf.man
diff --git a/source/texk/web2c/man/ofm2opl.man b/source/texk/web2c/man/ofm2opl.man
index 6df373a5d62bc226889a14932861a71075543a6a..31f7ee9c16e13700e3586c0bef24d3539c8be9c0 100644
--- a/source/texk/web2c/man/ofm2opl.man
+++ b/source/texk/web2c/man/ofm2opl.man
@@ -1,4 +1,4 @@
-.TH OFM2OPL 1 "14 April 2016" "Web2C @VERSION@"
+.TH OFM2OPL 1 "8 March 2022" "Web2C @VERSION@"
 .PP 
 .SH "NAME" 
 ofm2opl \- convert Omega and TeX font-metric files to property-list files
@@ -56,10 +56,12 @@ an Omega Property List file
 .PP 
 .SH "BUGS" 
 .PP 
-Send bug reports to <http://lists.tug.org/tex-k>
-(mailing list); may also check if the same bug is present in
-\fBtftopl\fP(1)\&.  General discussion of Omega (and Aleph) can take place
-on the <http://lists.tug.org/omega> mailing list.
+Email bug reports to <https://lists.tug.org/tex-k>
+(mailing list); good to check if the same bug is present in
+\fBtftopl\fP(1)\&.
+.PP
+General discussion of Omega (and Aleph) can take place
+on the <https://lists.tug.org/omega> mailing list\&.
 .PP 
 .SH "SEE ALSO" 
 .PP 
@@ -85,15 +87,10 @@ program \fBOFM2OPL\fP\&.
 .RE 
 .PP
 \fBofm2opl\fP is based on the WEB source code for \fBtftopl\fP(1),
-although nowadays it is a link to \fBomfonts\fP, implemented entirely in
-C.
+although nowadays it is a link to \fBomfonts\fP, implemented entirely in C.
 .PP 
-The primary authors of Omega are John Plaice and Yannis Haralambous.
+The primary authors of Omega were John Plaice and Yannis Haralambous.
 Omega (and Aleph) are now maintained as part of TeX Live.
 .PP 
-This manual page was written by C\&.M\&. Connelly
-<cmc@debian\&.org>, for
-the Debian GNU/Linux system\&.  It may be used by other distributions
-without contacting the author\&.  Any mistakes or omissions in the
-manual page are my fault; inquiries about or corrections to this
-manual page should be directed to me (and not to the primary author)\&.
+This manual page was written by C\&.M\&. Connelly for the Debian
+GNU/Linux system\&. It is also now maintained as part of TeX Live.
diff --git a/source/texk/web2c/man/opl2ofm.man b/source/texk/web2c/man/opl2ofm.man
index f37496f58e17bee037e2d3ab85e013dc641f4f75..adf0a45f50c3be2437da5c44b648a22fc7724985 100644
--- a/source/texk/web2c/man/opl2ofm.man
+++ b/source/texk/web2c/man/opl2ofm.man
@@ -1,4 +1,4 @@
-.TH OPL2OFM 1 "16 June 2015" "Web2C @VERSION@"
+.TH OPL2OFM 1 "8 March 2022" "Web2C @VERSION@"
 .PP 
 .SH "NAME" 
 opl2ofm \- convert Omega and TeX property-list files to font-metric files
@@ -33,18 +33,15 @@ output version information and exit
 .PP 
 .SH "BUGS" 
 .PP 
-None known, but report any found to <omega@ens\&.fr> (mailing list)\&.  You should also
-check to see if the bug is present in \fBpltotf\fP(1)\&.
+Email bug reports to <https://lists.tug.org/tex-k>
+(mailing list); good to check if the same bug is present in
+\fBpltotf\fP(1)\&.
 .PP 
 .SH "SEE ALSO" 
 .PP 
 \fBomega\fP(1), \fBofm2opl\fP(1), \fBpltotf\fP(1),
 \fBtftopl\fP(1)\&.
 .PP 
-\fIDraft Manual for the Omega System\fP (\fIomega-manual\&.dvi\fP)\&.
-.PP 
-Web page: <http://www\&.gutenberg\&.eu\&.org/omega/>
-.PP 
 .SH "AUTHOR" 
 .PP 
 According to the WEB documentation:
@@ -63,13 +60,8 @@ by John Plaice in December 1995 and January 1996, resulting in the new
 program \fBOPL2OFM\fP\&.
 .RE 
 .PP 
-The primary authors of Omega are John Plaice
-<plaice@cse\&.unsw\&.edu\&.au> and Yannis Haralambous 
-<yannis@fluxus-virus\&.com>\&.
+The primary authors of Omega were John Plaice and Yannis Haralambous.
+Omega (and Aleph) are now maintained as part of TeX Live.
 .PP 
-This manual page was written by C\&.M\&. Connelly
-<cmc@debian\&.org>, for
-the Debian GNU/Linux system\&.  It may be used by other distributions
-without contacting the author\&.  Any mistakes or omissions in the
-manual page are my fault; inquiries about or corrections to this
-manual page should be directed to me (and not to the primary author)\&.
+This manual page was written by C\&.M\&. Connelly for the Debian
+GNU/Linux system\&. It is also now maintained as part of TeX Live.
diff --git a/source/texk/web2c/man/ovf2ovp.man b/source/texk/web2c/man/ovf2ovp.man
index e3af350ee17ec114c2e2fa3f05f9c2a6a76fefb4..b465710075ba005cfd799815e21647e16c6d8087 100644
--- a/source/texk/web2c/man/ovf2ovp.man
+++ b/source/texk/web2c/man/ovf2ovp.man
@@ -1,4 +1,4 @@
-.TH OVF2OVP 1 "14 April 2016" "Web2C @VERSION@"
+.TH OVF2OVP 1 "8 March 2022" "Web2C @VERSION@"
 .PP 
 .SH "NAME" 
 ovf2ovp \- convert virtual font file and associated font metrics to property-list format
@@ -60,9 +60,11 @@ Omega Virtual Font file
 .PP 
 .SH "BUGS" 
 .PP 
-Send bug reports to <http://lists.tug.org/tex-k>
-(mailing list); may also check if the same bug is present in
-\fBvftovp\fP(1)\&.  General discussion of Omega (and Aleph) can take place
+Email bug reports to <https://lists.tug.org/tex-k>
+(mailing list); good to check if the same bug is present in
+\fBvftovp\fP(1)\&.
+.PP
+General discussion of Omega (and Aleph) can take place
 on the <http://lists.tug.org/omega> mailing list.
 .PP 
 .SH "SEE ALSO" 
@@ -85,15 +87,10 @@ for ArborText, Inc\&.  He wrote a somewhat similar program called
 .RE 
 .PP
 Thus, \fBovf2ovp\fP is based on the WEB source code for \fBvftovp\fP(1),
-although nowadays it is a link to \fBomfonts\fP, implemented entirely in
-C.
+although nowadays it is a link to \fBomfonts\fP, implemented entirely in C.
 .PP 
-The primary authors of Omega are John Plaice and Yannis Haralambous.
+The primary authors of Omega were John Plaice and Yannis Haralambous.
 Omega (and Aleph) are now maintained as part of TeX Live.
 .PP 
-This manual page was written by C\&.M\&. Connelly
-<cmc@debian\&.org>, for
-the Debian GNU/Linux system\&.  It may be used by other distributions
-without contacting the author\&.  Any mistakes or omissions in the
-manual page are my fault; inquiries about or corrections to this
-manual page should be directed to me (and not to the primary author)\&.
+This manual page was written by C\&.M\&. Connelly for the Debian
+GNU/Linux system\&. It is also now maintained as part of TeX Live.
diff --git a/source/texk/web2c/man/ovp2ovf.man b/source/texk/web2c/man/ovp2ovf.man
index 394b3c3a77650aa347192c3a5c2bb6ee67a6aad4..03e1c41766d74e776d1322f952e1479ca6e3ee9b 100644
--- a/source/texk/web2c/man/ovp2ovf.man
+++ b/source/texk/web2c/man/ovp2ovf.man
@@ -1,4 +1,4 @@
-.TH OVP2OVF 1 "16 June 2015" "Web2C @VERSION@"
+.TH OVP2OVF 1 "8 March 2022" "Web2C @VERSION@"
 .PP 
 .SH "NAME" 
 ovp2ovf \- convert a virtual property-list file into a virtual font file and its associated font metric file
@@ -39,8 +39,9 @@ Omega Virtual Property List file
 .PP 
 .SH "BUGS" 
 .PP 
-None known, but report any found to <omega@ens\&.fr> (mailing list)\&.  You should also
-check to see if the bug is in \fBvptovf\fP(1)\&.
+Email bug reports to <https://lists.tug.org/tex-k>
+(mailing list); good to check if the same bug is present in
+\fBvptovf\fP(1)\&.
 .PP 
 .SH "SEE ALSO" 
 .PP 
@@ -48,10 +49,6 @@ check to see if the bug is in \fBvptovf\fP(1)\&.
 \fBpltotf\fP(1), \fBtftopl\fP(1), \fBvftovp\fP(1),
 \fBvptovf\fP(1)
 .PP 
-\fIDraft Manual for the Omega System\fP (\fIomega-manual\&.dvi\fP)\&.
-.PP 
-Web page: <http://www\&.gutenberg\&.eu\&.org/omega/>
-.PP 
 .SH "AUTHOR" 
 .PP 
 According to the WEB documentation:
@@ -66,14 +63,8 @@ device driver for ArborText, Inc\&.  He wrote a somewhat similar program
 called \fBPLFONT\fP\&.
 .RE 
 .PP 
-The primary authors of Omega are John Plaice
-<plaice@cse\&.unsw\&.edu\&.au> and Yannis Haralambous 
-<yannis@fluxus-virus\&.com>\&.
-.PP 
-This manual page was written by C\&.M\&. Connelly
-<cmc@debian\&.org>, for
-the Debian GNU/Linux system\&.  It may be used by other distributions
-without contacting the author\&.  Any mistakes or omissions in the
-manual page are my fault; inquiries about or corrections to this
-manual page should be directed to me (and not to the primary author)\&.
+The primary authors of Omega were John Plaice and Yannis Haralambous.
+Omega (and Aleph) are now maintained as part of TeX Live.
 .PP 
+This manual page was written by C\&.M\&. Connelly for the Debian
+GNU/Linux system\&. It is also now maintained as part of TeX Live.
diff --git a/source/texk/web2c/man/tangle.man b/source/texk/web2c/man/tangle.man
index 3b524db6da71be1b713c87786525e635ac3d2791..d35e1c3eaa5572c37b8bd76bb63718daf6bcdf83 100644
--- a/source/texk/web2c/man/tangle.man
+++ b/source/texk/web2c/man/tangle.man
@@ -1,4 +1,4 @@
-.TH TANGLE 1 "16 June 2015" "Web2C @VERSION@"
+.TH TANGLE 1 "02 March 2022" "Web2C @VERSION@"
 .\"=====================================================================
 .if n .ds MF Metafont
 .if t .ds MF Metafont
@@ -21,7 +21,12 @@ tangle \- translate WEB to Pascal
 .B tangle
 .RI [ options ]
 .IR webfile [ \fB.web\fP ]
-.RI [ changefile [ \fB.ch\fP ]]
+[ {
+.IR changefile [ \fB.ch\fP ]
+|\-}
+[
+.IR outfile [ \fB.p\fP ]
+] ]
 .\"=====================================================================
 .SH DESCRIPTION
 This manual page is not meant to be exhaustive.  The complete
@@ -47,23 +52,29 @@ familiar with both \*(TX and Pascal.  \*(WB also provides a relatively
 simple, although adequate, macro facility that permits a Pascal program
 to be written in small easily-understood modules.
 .PP
-The command line should have either one or two names on it.
+The command line should have one, two or three names on it.
 The first is taken as the \*(WB file (and
 .B .web
 is added if there is no
 extension).
-If there is another name, it is a change file (and
+If there is second name, it is a change file (and
 .B .ch
 is added if there is
 no extension).  The change file overrides parts of the \*(WB file,
 as described in the \*(WB system documentation.
 .PP
-The output files are a Pascal file and a string pool file,
-whose names are formed by adding
+If there is a third name, it is the Pascal output file (and
 .B .p
-and
+is added if there is no extension). In this case you can specify an empty
+change file with '-' as the second argument.
+Otherwise the name of the Pascal file is formed by adding
+.B .p
+to the root of the \*(WB file name.
+.PP
+An optional second output file is a string pool file,
+whose name is formed by adding
 .B .pool
-respectively to the root of the \*(WB file name.
+to the root of the Pascal file name.
 .\"=====================================================================
 .SH "OPTIONS"
 This version of
diff --git a/source/texk/web2c/man/ttf2afm.man b/source/texk/web2c/man/ttf2afm.man
index e042d5883424fd5af0ddb94ef92f6063d17dd9f7..dfd772de3e59992dd1514ed7448d1ccd1308ff31 100644
--- a/source/texk/web2c/man/ttf2afm.man
+++ b/source/texk/web2c/man/ttf2afm.man
@@ -1,4 +1,4 @@
-.TH TTF2AFM 1 "8 March 2016" "Web2C @VERSION@"
+.TH TTF2AFM 1 "8 March 2022" "Web2C @VERSION@"
 .PP 
 .SH "NAME" 
 ttf2afm \- utility to generate AFM files for TrueType fonts
@@ -58,10 +58,10 @@ Unicode (if platform is Microsoft)
 .PP
 .SH "SEE ALSO"
 afm2tfm(1), afm2pl(1).
-FontForge (http://fontforge.sf.net).
-LCDF TypeTools (http://lcdf.org).
+FontForge (https://fontforge.org).
+LCDF TypeTools (https://lcdf.org).
 A closer look at TrueType fonts and pdfTeX, Han The Thanh
-(http://tug.org/TUGboat/tb30-1/tb94thanh.pdf).
+(https://tug.org/TUGboat/tb30-1/tb94thanh.pdf).
 .PP 
 .SH "BUGS" 
 .PP 
diff --git a/source/texk/web2c/man/weave.man b/source/texk/web2c/man/weave.man
index eb6282656d85a0aedff5a8fe6bfb2e9591ee3023..295a78581e915ef2e180e104f07b29effd499704 100644
--- a/source/texk/web2c/man/weave.man
+++ b/source/texk/web2c/man/weave.man
@@ -1,4 +1,4 @@
-.TH WEAVE 1 "09 January 2022" "Web2C @VERSION@"
+.TH WEAVE 1 "02 March 2022" "Web2C @VERSION@"
 .\"=====================================================================
 .if n .ds MF Metafont
 .if t .ds MF Metafont
@@ -21,7 +21,12 @@ weave \- translate WEB to TeX
 .B weave
 .RB [ \-x ]
 .IR webfile [ \fB.web\fP ]
-.RI [ changefile [ \fB.ch\fP ]]
+[ {
+.IR changefile [ \fB.ch\fP ]
+|\-}
+[
+.IR outfile [ \fB.tex\fP ]
+] ]
 .\"=====================================================================
 .SH DESCRIPTION
 This manual page is not meant to be exhaustive.  The complete
@@ -49,7 +54,8 @@ are redefined.)
 .PP
 The output \*(TX file name is formed by adding
 .B .tex
-to the root of the \*(WB file name.
+to the root of the \*(WB file name or from the third argument.
+In this case you can specify '-' as an empty change file.
 .PP
 There are several macros
 that probably should be redefined by
diff --git a/source/texk/web2c/mfluadir/am/mflualpeg.am b/source/texk/web2c/mfluadir/am/mflualpeg.am
new file mode 100644
index 0000000000000000000000000000000000000000..5e2ce30c268069e40984dad88945259d9f3d4bae
--- /dev/null
+++ b/source/texk/web2c/mfluadir/am/mflualpeg.am
@@ -0,0 +1,25 @@
+## texk/web2c/mfluadir/am/mflualpeg.am: Makefile fragment for libmflualpeg.
+##
+## Copyright (C) 2022 Luigi Scarso <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+## mflualpeg
+##
+EXTRA_LIBRARIES += libmflualpeg.a
+
+$(libmflualpeg_a_OBJECTS): $(LUA_DEPEND)
+
+libmflualpeg_a_CPPFLAGS = \
+	-I$(top_srcdir)/mfluadir/luapeg \
+	$(LUA_INCLUDES)
+
+
+libmflualpeg_a_CFLAGS = # $(WARNING_CFLAGS)
+
+
+libmflualpeg_a_SOURCES = \
+	mfluadir/luapeg/lpeg.c \
+	mfluadir/luapeg/lpeg.h 
+
+
+
diff --git a/source/texk/web2c/mfluadir/am/mfluapotrace.am b/source/texk/web2c/mfluadir/am/mfluapotrace.am
new file mode 100644
index 0000000000000000000000000000000000000000..7449a1db253aca4cf2904b1d2d2ce280f5e1254e
--- /dev/null
+++ b/source/texk/web2c/mfluadir/am/mfluapotrace.am
@@ -0,0 +1,39 @@
+## texk/web2c/luatexdir/am/mfluapotrace.am: Makefile fragment for libmfluapotrace.
+##
+## Copyright (C) 2022 Luigi Scarso <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+## mfluapotrace
+##
+EXTRA_LIBRARIES += libmfluapotrace.a 
+
+$(libmfluapotrace_a_OBJECTS): $(LUA_DEPEND)
+
+libmfluapotrace_a_CPPFLAGS = \
+        -I$(top_srcdir)/mfluadir/potrace 
+##         $(LUA_INCLUDES)
+
+
+
+libmfluapotrace_a_CFLAGS = # $(WARNING_CFLAGS)
+
+#nodist_libmfluapotrace_a_SOURCES = $(libmfluapotrace_sources)
+
+libmfluapotrace_a_SOURCES = \
+	mfluadir/potrace/auxiliary.h \
+	mfluadir/potrace/bitmap.h \
+	mfluadir/potrace/config.h \
+	mfluadir/potrace/curve.c \
+	mfluadir/potrace/curve.h \
+	mfluadir/potrace/decompose.c \
+	mfluadir/potrace/decompose.h \
+	mfluadir/potrace/lists.h \
+	mfluadir/potrace/luafunc.c \
+	mfluadir/potrace/luafunc.h \
+	mfluadir/potrace/potracelib.c \
+	mfluadir/potrace/potracelib.h \
+	mfluadir/potrace/progress.h \
+	mfluadir/potrace/trace.c \
+	mfluadir/potrace/trace.h
+
+
diff --git a/source/texk/web2c/mfluadir/mflua_version.h b/source/texk/web2c/mfluadir/mflua_version.h
index 3f4210bd884b825f90ebf59c7352a09297403c76..db8fb4b673afd0a35f801a6dd33ea8fef363326c 100644
--- a/source/texk/web2c/mfluadir/mflua_version.h
+++ b/source/texk/web2c/mfluadir/mflua_version.h
@@ -1,2 +1,2 @@
-#define MFLUA_VERSION "1.0.0-alpha"
+#define MFLUA_VERSION "1.0.1-alpha"
 #define BANNER "This is MFLua, Version 2.71828182-" MFLUA_VERSION 
diff --git a/source/texk/web2c/mfluajitdir/am/mfluajitlpeg.am b/source/texk/web2c/mfluajitdir/am/mfluajitlpeg.am
new file mode 100644
index 0000000000000000000000000000000000000000..41c4661735f1270bb1145e35bcc108dc0a2695fb
--- /dev/null
+++ b/source/texk/web2c/mfluajitdir/am/mfluajitlpeg.am
@@ -0,0 +1,25 @@
+## texk/web2c/mfluajitdir/am/mfluajitlpeg.am: Makefile fragment for libmfluajitlpeg.
+## 
+## Copyright (C) 2022 Luigi Scarso <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+## mfluajitlpeg
+##
+EXTRA_LIBRARIES += libmfluajitlpeg.a
+
+$(libmfluajitlpeg_a_OBJECTS): $(LUA_DEPEND)
+
+libmfluajitlpeg_a_CPPFLAGS = \
+	-I$(top_srcdir)/mfluadir/luapeg \
+	$(LUAJIT_INCLUDES)
+
+
+libmfluajitlpeg_a_CFLAGS = # $(WARNING_CFLAGS)
+
+
+libmfluajitlpeg_a_SOURCES = \
+	mfluadir/luapeg/lpeg.c \
+	mfluadir/luapeg/lpeg.h 
+
+
+
diff --git a/source/texk/web2c/mplibdir/ChangeLog b/source/texk/web2c/mplibdir/ChangeLog
index 4c60a6e8206f50b8f11307aca7fee72308ac2084..1b72daea58c84597e45e65425d7658048d5f66ca 100644
--- a/source/texk/web2c/mplibdir/ChangeLog
+++ b/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,6 @@
+2022-03-21  Karl Berry  <karl@tug.org>
+	* TL'22 release.
+
 2022-01-19  Luigi Scarso  <luigi.scarso@gmail.com>
 	* mp.w: MetaPost 2.02 (twice).
 
diff --git a/source/texk/web2c/synctexdir/ChangeLog b/source/texk/web2c/synctexdir/ChangeLog
index 67f4da43e3c4be990ad5f91c91dfb60d54f162fb..da03ff9b67249979331a57f74a7f1fdb840f52d0 100644
--- a/source/texk/web2c/synctexdir/ChangeLog
+++ b/source/texk/web2c/synctexdir/ChangeLog
@@ -1,3 +1,7 @@
+2022-03-21  Karl Berry  <karl@tug.org>
+
+	* TL'22 release.
+
 2022-01-22  Hironori Kitagawa  <h_kitagawa2001@yahoo.co.jp>
 
 	* synctex.c: Reencode nameoffile to utf8 for pTeX.
diff --git a/source/texk/web2c/tangle.ch b/source/texk/web2c/tangle.ch
index b87fae1f50fb541a66f1fccff4646a55b2070bc9..abd35170dd047a308090794d31a8a7d5ab6d286d 100644
--- a/source/texk/web2c/tangle.ch
+++ b/source/texk/web2c/tangle.ch
@@ -177,6 +177,12 @@ if chg_name then change_file := kpse_open_file(chg_name, kpse_web_format);
 @z
 
 @x [26] Open output files (except for the pool file).
+@ The following code opens |Pascal_file| and |pool|.
+@y
+@ The following code opens |Pascal_file|. Opening |pool| will be deferred
+until section~\&{64}.
+@z
+@x
 rewrite(Pascal_file); rewrite(pool);
 @y
 rewrite (Pascal_file, pascal_name);
@@ -313,11 +319,7 @@ if l-double_chars=2 then {this string is for a single character}
   equiv[p]:=buffer[id_first+1]+@'10000000000
 else  begin
   {Avoid creating empty pool files.}
-  if string_ptr = 256 then begin
-    {Change |".web"| to |".pool"| and use the current directory.}
-    pool_name := basename_change_suffix (web_name, '.web', '.pool');
-    rewritebin (pool, pool_name);
-  end;
+  if string_ptr = 256 then rewritebin (pool, pool_name);
   equiv[p]:=string_ptr+@'10000000000;
   l:=l-double_chars-1;
 @z
@@ -726,20 +728,34 @@ begin
     end; {Else it was a flag; |getopt| has already done the assignment.}
   until getopt_return_val = -1;
 
-  {Now |optind| is the index of first non-option on the command line.}
-  if (optind + 1 <> argc) and (optind + 2 <> argc) then begin
-    write_ln (stderr, my_name, ': Need one or two file arguments.');
-    usage (my_name);
-  end;
+  @<Handle file name arguments@>@;
+end;
 
-  {Supply |".web"| and |".ch"| extensions if necessary.}
-  web_name := extend_filename (cmdline (optind), 'web');
-  if optind + 2 = argc then begin
+@ Now |optind| is the index of first non-option on the command line.
+
+@<Handle file name...@>=
+if (optind + 1 > argc) or (optind + 3 < argc) then begin
+  write_ln (stderr, my_name, ': Need one to three file arguments.');
+  usage (my_name);
+end;
+
+{Supply |".web"| and |".ch"| extensions if necessary.}
+web_name := extend_filename (cmdline (optind), 'web');
+if optind + 2 <= argc then begin
+  {|'-'| is shortcut for an empty changefile.}
+  if strcmp(char_to_string('-'), cmdline (optind + 1)) <> 0 then
     chg_name := extend_filename (cmdline (optind + 1), 'ch');
-  end;
+end;
 
-  {Change |".web"| to |".p"| and use the current directory.}
+if optind + 3 = argc then begin
+  {User has provided an explicit Pascal output file, possibly with path.}
+  pascal_name := extend_filename (cmdline (optind + 2), char_to_string('p'));
+  pool_name := extend_filename (remove_suffix (pascal_name), 'pool');
+end
+else begin
+  {Change |".web"| to |".p"| and |".pool"| and use the current directory.}
   pascal_name := basename_change_suffix (web_name, '.web', '.p');
+  pool_name := basename_change_suffix (web_name, '.web', '.pool');
 end;
 
 @ Here are the options we allow.  The first is one of the standard GNU options.
diff --git a/source/texk/web2c/tangleboot.pin b/source/texk/web2c/tangleboot.pin
index 29746a7a26682493b906b9a968b82d252a44edc4..e13c47fcdb0f07b12bf67ee0f040a054fe35ae40 100644
--- a/source/texk/web2c/tangleboot.pin
+++ b/source/texk/web2c/tangleboot.pin
@@ -45,9 +45,9 @@ scanninghex:boolean;{:143}{156:}nextcontrol:eightbits;
 {:156}{164:}currepltext:textpointer;{:164}{171:}modulecount:0..12287;
 {:171}{179:}{troubleshooting:boolean;ddt:integer;dd:integer;
 debugcycle:integer;debugskipped:integer;}{:179}{185:}{wo:0..2;}
-{:185}{199:}webname,chgname,pascalname,poolname:constcstring;
+{:185}{200:}webname,chgname,pascalname,poolname:constcstring;
 forceuppercase,forcelowercase,allowunderlines,strictmode:boolean;
-unambiglength:0..maxidlength;{:199}{30:}{procedure debughelp;forward;}
+unambiglength:0..maxidlength;{:200}{30:}{procedure debughelp;forward;}
 {:30}{31:}procedure error;var j:0..outbufsize;k,l:0..bufsize;
 begin if phaseone then{32:}begin if changing then write(stdout,
 '. (change file ')else write(stdout,'. (');
@@ -64,37 +64,37 @@ write(stdout,'... ');end{:33};fflush(stdout);history:=2;
 {:31}{188:}procedure parsearguments;const noptions=10;
 var longoptions:array[0..noptions]of getoptstruct;
 getoptreturnval:integer;optionindex:cinttype;currentoption:0..noptions;
-len:integer;begin{189:}currentoption:=0;
+len:integer;begin{190:}currentoption:=0;
 longoptions[currentoption].name:='help';
 longoptions[currentoption].hasarg:=0;longoptions[currentoption].flag:=0;
 longoptions[currentoption].val:=0;currentoption:=currentoption+1;
-{:189}{190:}longoptions[currentoption].name:='version';
+{:190}{191:}longoptions[currentoption].name:='version';
 longoptions[currentoption].hasarg:=0;longoptions[currentoption].flag:=0;
 longoptions[currentoption].val:=0;currentoption:=currentoption+1;
-{:190}{191:}longoptions[currentoption].name:='mixedcase';
+{:191}{192:}longoptions[currentoption].name:='mixedcase';
 longoptions[currentoption].hasarg:=0;longoptions[currentoption].flag:=0;
 longoptions[currentoption].val:=0;currentoption:=currentoption+1;
-{:191}{192:}longoptions[currentoption].name:='uppercase';
+{:192}{193:}longoptions[currentoption].name:='uppercase';
 longoptions[currentoption].hasarg:=0;longoptions[currentoption].flag:=0;
 longoptions[currentoption].val:=0;currentoption:=currentoption+1;
-{:192}{193:}longoptions[currentoption].name:='lowercase';
+{:193}{194:}longoptions[currentoption].name:='lowercase';
 longoptions[currentoption].hasarg:=0;longoptions[currentoption].flag:=0;
 longoptions[currentoption].val:=0;currentoption:=currentoption+1;
-{:193}{194:}longoptions[currentoption].name:='underlines';
+{:194}{195:}longoptions[currentoption].name:='underlines';
 longoptions[currentoption].hasarg:=0;longoptions[currentoption].flag:=0;
 longoptions[currentoption].val:=0;currentoption:=currentoption+1;
-{:194}{195:}longoptions[currentoption].name:='strict';
+{:195}{196:}longoptions[currentoption].name:='strict';
 longoptions[currentoption].hasarg:=0;longoptions[currentoption].flag:=0;
 longoptions[currentoption].val:=0;currentoption:=currentoption+1;
-{:195}{196:}longoptions[currentoption].name:='loose';
+{:196}{197:}longoptions[currentoption].name:='loose';
 longoptions[currentoption].hasarg:=0;longoptions[currentoption].flag:=0;
 longoptions[currentoption].val:=0;currentoption:=currentoption+1;
-{:196}{197:}longoptions[currentoption].name:='length';
+{:197}{198:}longoptions[currentoption].name:='length';
 longoptions[currentoption].hasarg:=1;longoptions[currentoption].flag:=0;
 longoptions[currentoption].val:=0;currentoption:=currentoption+1;
-{:197}{198:}longoptions[currentoption].name:=0;
+{:198}{199:}longoptions[currentoption].name:=0;
 longoptions[currentoption].hasarg:=0;longoptions[currentoption].flag:=0;
-longoptions[currentoption].val:=0;{:198};
+longoptions[currentoption].val:=0;{:199};
 unambiglength:=defunambiglength;
 repeat getoptreturnval:=getoptlongonly(argc,argv,'',longoptions,
 addressof(optionindex));if getoptreturnval=-1 then begin;
@@ -118,11 +118,16 @@ strictmode:=false;
 end else if(strcmp(longoptions[optionindex].name,'length')=0)then begin
 len:=atoi(optarg);if(len<=0)or(len>maxidlength)then len:=maxidlength;
 unambiglength:=len;end;until getoptreturnval=-1;
-if(optind+1<>argc)and(optind+2<>argc)then begin writeln(stderr,'tangle',
-': Need one or two file arguments.');usage('tangle');end;
+{189:}if(optind+1>argc)or(optind+3<argc)then begin writeln(stderr,
+'tangle',': Need one to three file arguments.');usage('tangle');end;
 webname:=extendfilename(cmdline(optind),'web');
-if optind+2=argc then begin chgname:=extendfilename(cmdline(optind+1),
-'ch');end;pascalname:=basenamechangesuffix(webname,'.web','.p');end;
+if optind+2<=argc then begin if strcmp(chartostring('-'),cmdline(optind
++1))<>0 then chgname:=extendfilename(cmdline(optind+1),'ch');end;
+if optind+3=argc then begin pascalname:=extendfilename(cmdline(optind+2)
+,chartostring('p'));
+poolname:=extendfilename(removesuffix(pascalname),'pool');
+end else begin pascalname:=basenamechangesuffix(webname,'.web','.p');
+poolname:=basenamechangesuffix(webname,'.web','.pool');end;{:189}end;
 {:188}procedure initialize;var{16:}i:0..255;{:16}{41:}wi:0..2;
 {:41}{45:}zi:0..4;{:45}{51:}h:0..hashsize;
 {:51}begin kpsesetprogramname(argv[0],'tangle');parsearguments;
@@ -227,8 +232,7 @@ k:=k+1;i:=i+1;end;byteptr[w]:=k;bytestart[nameptr+3]:=k;
 nameptr:=nameptr+1;
 if buffer[idfirst]<>34 then ilk[p]:=t else{64:}begin ilk[p]:=1;
 if l-doublechars=2 then equiv[p]:=buffer[idfirst+1]+1073741824 else
-begin if stringptr=256 then begin poolname:=basenamechangesuffix(webname
-,'.web','.pool');rewritebin(pool,poolname);end;
+begin if stringptr=256 then rewritebin(pool,poolname);
 equiv[p]:=stringptr+1073741824;l:=l-doublechars-1;
 if l>99 then begin writeln(stdout);
 write(stdout,'! Preprocessed string is too long');error;end;
diff --git a/source/texk/web2c/web2c/ChangeLog b/source/texk/web2c/web2c/ChangeLog
index 0d1904d68a23a51d7fdff6ddeccf6bb9ec682e58..e139c644e2a8e0496916f51832bb44a30455c1db 100644
--- a/source/texk/web2c/web2c/ChangeLog
+++ b/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,11 @@
+2022-03-21  Karl Berry  <karl@tug.org>
+
+	* TL'22 release.
+
+2022-03-03  Andreas Scherer  <https://ascherer.github.io>
+
+	* common.defines: Add 'removesuffix' declaration.
+
 2022-01-17  Karl Berry  <karl@freefriends.org>
 
 	* Makefile.am (web2c_DEPENDENCIES),
diff --git a/source/texk/web2c/web2c/common.defines b/source/texk/web2c/web2c/common.defines
index 30d7e3170b6e07fb4129dc8ee9d42505cb61165b..811268fdd194096d38748133cfc7aa800216da67 100644
--- a/source/texk/web2c/web2c/common.defines
+++ b/source/texk/web2c/web2c/common.defines
@@ -1,4 +1,4 @@
-{$Id: common.defines 61509 2022-01-06 11:08:43Z ascherer $
+{$Id: common.defines 62367 2022-03-03 16:21:45Z ascherer $
  common.defines.  Public domain.
 
  This file is concatenated by ./convert to the beginning of the Pascal
@@ -141,6 +141,7 @@
 @define function makesuffix ();
 @define function odd ();
 @define function ord ();
+@define function removesuffix ();
 @define function round ();
 @define function strcmp ();
 @define function stringcast ();
diff --git a/source/utils/Makefile.in b/source/utils/Makefile.in
index 616ec355c53ef468e40f2cbd25a432ee3b195b7d..83acaa44a302fd7ff9948bdcce5a9a64be2c2a5f 100644
--- a/source/utils/Makefile.in
+++ b/source/utils/Makefile.in
@@ -89,35 +89,107 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
+	$(top_srcdir)/../m4/kpse-common.m4 \
 	$(top_srcdir)/../m4/kpse-cxx-hack.m4 \
+	$(top_srcdir)/../m4/kpse-freetype2-flags.m4 \
+	$(top_srcdir)/../m4/kpse-gd-flags.m4 \
+	$(top_srcdir)/../m4/kpse-gmp-flags.m4 \
 	$(top_srcdir)/../m4/kpse-graphite2-flags.m4 \
 	$(top_srcdir)/../m4/kpse-harfbuzz-flags.m4 \
+	$(top_srcdir)/../m4/kpse-icu-flags.m4 \
 	$(top_srcdir)/../m4/kpse-kpathsea-flags.m4 \
+	$(top_srcdir)/../m4/kpse-libpaper-flags.m4 \
 	$(top_srcdir)/../m4/kpse-libpng-flags.m4 \
 	$(top_srcdir)/../m4/kpse-lt-hack.m4 \
 	$(top_srcdir)/../m4/kpse-mktex.m4 \
+	$(top_srcdir)/../m4/kpse-mpfr-flags.m4 \
 	$(top_srcdir)/../m4/kpse-options.m4 \
+	$(top_srcdir)/../m4/kpse-pixman-flags.m4 \
 	$(top_srcdir)/../m4/kpse-pkgs.m4 \
+	$(top_srcdir)/../m4/kpse-ptexenc-flags.m4 \
 	$(top_srcdir)/../m4/kpse-setup.m4 \
+	$(top_srcdir)/../m4/kpse-teckit-flags.m4 \
 	$(top_srcdir)/../m4/kpse-warnings.m4 \
 	$(top_srcdir)/../m4/kpse-web2c.m4 \
 	$(top_srcdir)/../m4/kpse-win32.m4 \
+	$(top_srcdir)/../m4/kpse-xpdf-flags.m4 \
 	$(top_srcdir)/../m4/kpse-zlib-flags.m4 \
 	$(top_srcdir)/../m4/kpse-zziplib-flags.m4 \
 	$(top_srcdir)/../version.ac \
+	$(top_srcdir)/../utils/autosp/ac/withenable.ac \
+	$(top_srcdir)/../utils/axodraw2/ac/withenable.ac \
+	$(top_srcdir)/../utils/devnag/ac/withenable.ac \
+	$(top_srcdir)/../utils/lacheck/ac/withenable.ac \
+	$(top_srcdir)/../utils/m-tx/ac/withenable.ac \
+	$(top_srcdir)/../utils/pmx/ac/withenable.ac \
+	$(top_srcdir)/../utils/ps2eps/ac/withenable.ac \
+	$(top_srcdir)/../utils/t1utils/ac/withenable.ac \
+	$(top_srcdir)/../utils/texdoctk/ac/withenable.ac \
+	$(top_srcdir)/../utils/tpic2pdftex/ac/withenable.ac \
+	$(top_srcdir)/../utils/vlna/ac/withenable.ac \
+	$(top_srcdir)/../utils/xindy/ac/withenable.ac \
+	$(top_srcdir)/../utils/xindy/ac/xindy.ac \
+	$(top_srcdir)/../utils/xindy/ac/clisp.ac \
+	$(top_srcdir)/../utils/xml2pmx/ac/withenable.ac \
+	$(top_srcdir)/../utils/xpdfopen/ac/withenable.ac \
 	$(top_srcdir)/../texk/web2c/ac/withenable.ac \
 	$(top_srcdir)/../texk/web2c/ac/web2c.ac \
+	$(top_srcdir)/../texk/afm2pl/ac/withenable.ac \
+	$(top_srcdir)/../texk/bibtex-x/ac/withenable.ac \
+	$(top_srcdir)/../texk/bibtex-x/ac/bibtex-x.ac \
+	$(top_srcdir)/../texk/chktex/ac/withenable.ac \
+	$(top_srcdir)/../texk/cjkutils/ac/withenable.ac \
+	$(top_srcdir)/../texk/detex/ac/withenable.ac \
+	$(top_srcdir)/../texk/dtl/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvi2tty/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvidvi/ac/withenable.ac \
+	$(top_srcdir)/../texk/dviljk/ac/withenable.ac \
+	$(top_srcdir)/../texk/dviout-util/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvipdfm-x/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvipng/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvipng/ac/dvipng.ac \
+	$(top_srcdir)/../texk/dvipos/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvipsk/ac/withenable.ac \
+	$(top_srcdir)/../texk/dvisvgm/ac/withenable.ac \
+	$(top_srcdir)/../texk/gregorio/ac/withenable.ac \
+	$(top_srcdir)/../texk/gsftopk/ac/withenable.ac \
+	$(top_srcdir)/../texk/lcdf-typetools/ac/withenable.ac \
+	$(top_srcdir)/../texk/lcdf-typetools/ac/lcdf-typetools.ac \
+	$(top_srcdir)/../texk/makeindexk/ac/withenable.ac \
+	$(top_srcdir)/../texk/makejvf/ac/withenable.ac \
+	$(top_srcdir)/../texk/mendexk/ac/withenable.ac \
+	$(top_srcdir)/../texk/musixtnt/ac/withenable.ac \
+	$(top_srcdir)/../texk/ps2pk/ac/withenable.ac \
+	$(top_srcdir)/../texk/psutils/ac/withenable.ac \
+	$(top_srcdir)/../texk/seetexk/ac/withenable.ac \
+	$(top_srcdir)/../texk/tex4htk/ac/withenable.ac \
+	$(top_srcdir)/../texk/ttf2pk2/ac/withenable.ac \
+	$(top_srcdir)/../texk/ttfdump/ac/withenable.ac \
+	$(top_srcdir)/../texk/upmendex/ac/withenable.ac \
+	$(top_srcdir)/../texk/xdvik/ac/withenable.ac \
+	$(top_srcdir)/../texk/xdvik/ac/xdvik.ac \
 	$(top_srcdir)/../texk/texlive/ac/withenable.ac \
 	$(top_srcdir)/../texk/texlive/ac/texlive.ac \
 	$(top_srcdir)/../libs/pplib/ac/withenable.ac \
 	$(top_srcdir)/../libs/harfbuzz/ac/withenable.ac \
+	$(top_srcdir)/../libs/icu/ac/withenable.ac \
+	$(top_srcdir)/../libs/teckit/ac/withenable.ac \
 	$(top_srcdir)/../libs/graphite2/ac/withenable.ac \
 	$(top_srcdir)/../libs/zziplib/ac/withenable.ac \
+	$(top_srcdir)/../libs/xpdf/ac/withenable.ac \
+	$(top_srcdir)/../libs/mpfr/ac/withenable.ac \
+	$(top_srcdir)/../libs/gmp/ac/withenable.ac \
+	$(top_srcdir)/../libs/cairo/ac/withenable.ac \
+	$(top_srcdir)/../libs/pixman/ac/withenable.ac \
+	$(top_srcdir)/../libs/gd/ac/withenable.ac \
+	$(top_srcdir)/../libs/freetype2/ac/withenable.ac \
 	$(top_srcdir)/../libs/libpng/ac/withenable.ac \
+	$(top_srcdir)/../libs/libpaper/ac/withenable.ac \
 	$(top_srcdir)/../libs/luajit/ac/withenable.ac \
 	$(top_srcdir)/../libs/lua53/ac/withenable.ac \
 	$(top_srcdir)/../libs/zlib/ac/withenable.ac \
+	$(top_srcdir)/../texk/ptexenc/ac/withenable.ac \
 	$(top_srcdir)/../texk/kpathsea/ac/withenable.ac \
 	$(top_srcdir)/../texk/kpathsea/ac/mktex.ac \
 	$(top_srcdir)/configure.ac
diff --git a/source/utils/README b/source/utils/README
index 6188504fea1be3b4cc04e9180fbaae236280d81f..3d21c8bb51fd93c6f581d81263aaa23595d1b173 100644
--- a/source/utils/README
+++ b/source/utils/README
@@ -1,10 +1,10 @@
-$Id: README 61904 2022-02-05 22:26:16Z karl $
+$Id: README 62528 2022-03-08 22:40:22Z karl $
 Public domain.  Originally written 2005 by Karl Berry.
 
 Extra utilities we (optionally) compile for TeX Live.
 See comments in ../texk/README.
 
-asymptote 2.78 - checked 5feb22
+asymptote 2.79 - checked 8mar22
   update to TL from CTAN, to include prebuilt doc.
   see https://tug.org/texlive/build.html#asymptote
   and tlpkg/bin/tl-update-asy
@@ -23,7 +23,7 @@ lacheck - maintained here, by us
 m-tx 0.63a - checked 29apr18
   https://ctan.org/pkg/m-tx/
 
-pmx 2.9.4a - checked 30jan21
+pmx 2.9.8a - checked 08mar22
   https://ctan.org/pkg/pmx/
 
 ps2eps 1.70 - checked 03jul21
diff --git a/source/utils/aclocal.m4 b/source/utils/aclocal.m4
index 235bab8fa455f966cf5afd17303da261d91ed013..aad8d747bf7a108fdc79465eff1f8b52c3d27af7 100644
--- a/source/utils/aclocal.m4
+++ b/source/utils/aclocal.m4
@@ -1184,19 +1184,30 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([../m4/kpse-cairo-flags.m4])
 m4_include([../m4/kpse-common.m4])
 m4_include([../m4/kpse-cxx-hack.m4])
+m4_include([../m4/kpse-freetype2-flags.m4])
+m4_include([../m4/kpse-gd-flags.m4])
+m4_include([../m4/kpse-gmp-flags.m4])
 m4_include([../m4/kpse-graphite2-flags.m4])
 m4_include([../m4/kpse-harfbuzz-flags.m4])
+m4_include([../m4/kpse-icu-flags.m4])
 m4_include([../m4/kpse-kpathsea-flags.m4])
+m4_include([../m4/kpse-libpaper-flags.m4])
 m4_include([../m4/kpse-libpng-flags.m4])
 m4_include([../m4/kpse-lt-hack.m4])
 m4_include([../m4/kpse-mktex.m4])
+m4_include([../m4/kpse-mpfr-flags.m4])
 m4_include([../m4/kpse-options.m4])
+m4_include([../m4/kpse-pixman-flags.m4])
 m4_include([../m4/kpse-pkgs.m4])
+m4_include([../m4/kpse-ptexenc-flags.m4])
 m4_include([../m4/kpse-setup.m4])
+m4_include([../m4/kpse-teckit-flags.m4])
 m4_include([../m4/kpse-warnings.m4])
 m4_include([../m4/kpse-web2c.m4])
 m4_include([../m4/kpse-win32.m4])
+m4_include([../m4/kpse-xpdf-flags.m4])
 m4_include([../m4/kpse-zlib-flags.m4])
 m4_include([../m4/kpse-zziplib-flags.m4])
diff --git a/source/utils/configure b/source/utils/configure
index a6a23192112210061c02ac7855ca84aa4d2af268..1153f2530f2a78aae631a1e8cd80e13f638a1719 100755
--- a/source/utils/configure
+++ b/source/utils/configure
@@ -729,6 +729,23 @@ enable_native_texlive_build
 enable_multiplatform
 enable_cxx_runtime_hack
 enable_libtool_hack
+enable_autosp
+enable_axodraw2
+enable_devnag
+enable_lacheck
+enable_m_tx
+enable_pmx
+enable_ps2eps
+enable_t1utils
+enable_texdoctk
+enable_tpic2pdftex
+enable_vlna
+enable_xindy
+enable_xindy_rules
+enable_xindy_docs
+with_clisp_runtime
+enable_xml2pmx
+enable_xpdfopen
 enable_web2c
 with_banner_add
 with_editor
@@ -777,15 +794,81 @@ enable_tektronixwin
 enable_unitermwin
 enable_web_progs
 enable_synctex
+enable_afm2pl
+enable_bibtex_x
+enable_bibtex8
+enable_bibtexu
+enable_chktex
+enable_cjkutils
+enable_detex
+enable_dtl
+enable_dvi2tty
+enable_dvidvi
+enable_dviljk
+enable_dviout_util
+enable_dvipdfm_x
+enable_dvipng
+enable_debug
+enable_timing
+with_gs
+enable_dvipos
+enable_dvipsk
+enable_dvisvgm
+enable_gregorio
+enable_gsftopk
+enable_lcdf_typetools
+enable_cfftot1
+enable_mmafm
+enable_mmpfb
+enable_otfinfo
+enable_otftotfm
+enable_t1dotlessj
+enable_t1lint
+enable_t1rawafm
+enable_t1reencode
+enable_t1testpage
+enable_ttftotype42
+enable_updmap
+enable_makeindexk
+enable_makejvf
+enable_mendexk
+enable_musixtnt
+enable_ps2pk
+enable_psutils
+enable_seetexk
+enable_tex4htk
+enable_ttf2pk2
+enable_ttfdump
+enable_upmendex
+enable_xdvik
+with_xdvi_x_toolkit
 enable_texlive
 enable_linked_scripts
 with_system_harfbuzz
+with_system_icu
+with_system_teckit
 with_system_graphite2
 with_system_zziplib
+with_system_mpfr
+with_mpfr_includes
+with_mpfr_libdir
+with_system_gmp
+with_gmp_includes
+with_gmp_libdir
+with_system_cairo
+with_system_pixman
+with_system_gd
+with_gd_includes
+with_gd_libdir
+with_system_freetype2
 with_system_libpng
+with_system_libpaper
+with_libpaper_includes
+with_libpaper_libdir
 with_system_zlib
 with_zlib_includes
 with_zlib_libdir
+with_system_ptexenc
 with_system_kpathsea
 enable_mktexmf_default
 enable_mktexpk_default
@@ -1443,6 +1526,22 @@ Optional Features:
                           lib/PLATFORM
   --enable-cxx-runtime-hack  link C++ runtime statically
   --enable-libtool-hack   ignore libtool dependency_libs
+  --disable-autosp        do not build the autosp package
+  --disable-axodraw2      do not build the axodraw2 package
+  --disable-devnag        do not build the devnag package
+  --disable-lacheck       do not build the lacheck package
+  --disable-m-tx          do not build the m-tx package
+  --disable-pmx           do not build the pmx package
+  --disable-ps2eps        do not build the ps2eps package
+  --disable-t1utils       do not build the t1utils package
+  --disable-texdoctk      do not build the texdoctk package
+  --disable-tpic2pdftex   do not build the tpic2pdftex package
+  --disable-vlna          do not build the vlna package
+  --enable-xindy          build the xindy package
+  --enable-xindy-rules      build and install make-rules package
+  --enable-xindy-docs       build and install documentation
+  --disable-xml2pmx       do not build the xml2pmx package
+  --disable-xpdfopen      do not build the xpdfopen package
   --disable-web2c         do not build the web2c (TeX & Co.) package
   --enable-auto-core        cause TeX&MF to dump core, given a certain
                             filename
@@ -1491,6 +1590,57 @@ Optional Features:
   --enable-unitermwin         include Uniterm window support
   --disable-web-progs       do not build WEB programs bibtex ... weave
   --disable-synctex         do not build the SyncTeX library and tool
+  --disable-afm2pl        do not build the afm2pl package
+  --disable-bibtex-x      do not build the bibtex-x package
+  --disable-bibtex8         do not build the bibtex8 program
+  --disable-bibtexu         do not build the bibtexu program
+  --disable-chktex        do not build the chktex package
+  --disable-cjkutils      do not build the cjkutils package
+  --disable-detex         do not build the detex package
+  --disable-dtl           do not build the dtl package
+  --disable-dvi2tty       do not build the dvi2tty package
+  --disable-dvidvi        do not build the dvidvi package
+  --disable-dviljk        do not build the dviljk package
+  --disable-dviout-util   do not build the dviout-util package
+  --disable-dvipdfm-x     do not build the dvipdfm-x package
+  --disable-dvipng        do not build the dvipng package
+  --disable-debug           Compile without debug (-d) option
+  --enable-timing           Output execution time of dvipng
+  --disable-dvipos        do not build the dvipos package
+  --disable-dvipsk        do not build the dvipsk package
+  --disable-dvisvgm       do not build the dvisvgm package
+  --disable-gregorio      do not build the gregorio package
+  --disable-gsftopk       do not build the gsftopk package
+  --disable-lcdf-typetools
+                          do not build the lcdf-typetools package
+  --disable-cfftot1         do not build the cfftot1 program
+  --disable-mmafm           do not build the mmafm program
+  --disable-mmpfb           do not build the mmpfb program
+  --disable-otfinfo         do not build the otfinfo program
+  --disable-otftotfm        do not build the otftotfm program
+  --disable-t1dotlessj      do not build the t1dotlessj program
+  --disable-t1lint          do not build the t1lint program
+  --disable-t1rawafm        do not build the t1rawafm program
+  --disable-t1reencode      do not build the t1reencode program
+  --disable-t1testpage      do not build the t1testpage program
+  --disable-ttftotype42     do not build the ttftotype42 program
+  --disable-auto-cfftot1    disable running cfftot1 from otftotfm
+  --disable-auto-t1dotlessj disable running t1dotlessj from otftotfm
+  --disable-auto-ttftotype42
+                            disable running ttftotype42 from otftotfm
+  --disable-auto-updmap     disable running updmap from otftotfm
+  --disable-makeindexk    do not build the makeindexk package
+  --disable-makejvf       do not build the makejvf package
+  --disable-mendexk       do not build the mendexk package
+  --disable-musixtnt      do not build the musixtnt package
+  --disable-ps2pk         do not build the ps2pk package
+  --disable-psutils       do not build the psutils package
+  --disable-seetexk       do not build the seetexk package
+  --disable-tex4htk       do not build the tex4htk package
+  --disable-ttf2pk2       do not build the ttf2pk2 package
+  --disable-ttfdump       do not build the ttfdump package
+  --disable-upmendex      do not build the upmendex package
+  --disable-xdvik         do not build the xdvik package
   --disable-texlive       do not build the texlive (TeX Live scripts) package
   --disable-linked-scripts  do not install the linked scripts
   --disable-mktexmf-default   do not run mktexmf if MF source missing
@@ -1516,22 +1666,57 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-clisp-runtime=PATH
+                          pathname of clisp runtime to install for `xindy',
+                          `default' to derive from clisp, or `system' to use
+                          installed version
   --with-banner-add=STR   add STR to version string appended to banner lines
   --with-editor=CMD       invoke CMD from the `e' option [vi +%d '%s'] or
                           [texworks --position=%d "%s"]
   --with-mf-x-toolkit     use X toolkit for METAFONT
+  --with-gs=/PATH/TO/gs   Hard-wire the location of GhostScript
+  --with-xdvi-x-toolkit=KIT
+                          Use toolkit KIT (xaw/motif/xaw3d/neXtaw) for xdvi
+                          [default: Xaw]
   --with-system-harfbuzz  use installed harfbuzz headers and library (requires
                           pkg-config)
+  --with-system-icu       use installed ICU headers and libraries (requires
+                          pkg-config or icu-config)
+  --with-system-teckit    use installed teckit headers and library (requires
+                          pkg-config)
   --with-system-graphite2 use installed graphite2 headers and library
                           (requires pkg-config)
   --with-system-zziplib   use installed zziplib headers and library (requires
                           pkg-config)
+  --with-system-mpfr      use installed mpfr headers and library
+  --with-mpfr-includes=DIR
+                          mpfr headers installed in DIR
+  --with-mpfr-libdir=DIR  mpfr library installed in DIR
+  --with-system-gmp       use installed gmp headers and library
+  --with-gmp-includes=DIR gmp headers installed in DIR
+  --with-gmp-libdir=DIR   gmp library installed in DIR
+  --with-system-cairo     use installed cairo headers and library (requires
+                          pkg-config)
+  --with-system-pixman    use installed pixman headers and library (requires
+                          pkg-config)
+  --with-system-gd        use installed gd headers and library
+  --with-gd-includes=DIR  gd headers installed in DIR
+  --with-gd-libdir=DIR    gd library installed in DIR
+  --with-system-freetype2 use installed freetype2 headers and library
+                          (requires freetype-config)
   --with-system-libpng    use installed libpng headers and library (requires
                           pkg-config)
+  --with-system-libpaper  use installed libpaper headers and library
+  --with-libpaper-includes=DIR
+                          libpaper headers installed in DIR
+  --with-libpaper-libdir=DIR
+                          libpaper library installed in DIR
   --with-system-zlib      use installed zlib headers and library
   --with-zlib-includes=DIR
                           zlib headers installed in DIR
   --with-zlib-libdir=DIR  zlib library installed in DIR
+  --with-system-ptexenc   use installed ptexenc headers and library (requires
+                          pkg-config)
   --with-system-kpathsea  use installed kpathsea headers and library (requires
                           pkg-config)
 
@@ -3859,6 +4044,332 @@ printf "%s\n" "$as_me: $host -> \`--disable-mfluajit-nowin'" >&6;}
 esac ;;
 esac
 
+## utils/autosp/ac/withenable.ac: configure.ac fragment for Tl subdir
+## configure options and TL libraries required for autosp.
+# Check whether --enable-autosp was given.
+if test ${enable_autosp+y}
+then :
+  enableval=$enable_autosp;
+fi
+case $enable_autosp in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_autosp=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-autosp=$enable_autosp'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-autosp=$enable_autosp'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-autosp=$enable_autosp'"
+    ;;
+esac
+
+## utils/axodraw2/ac/withenable.ac: configure.ac fragment for TL subdir
+## configure options and TL libraries for axodraw2.
+# Check whether --enable-axodraw2 was given.
+if test ${enable_axodraw2+y}
+then :
+  enableval=$enable_axodraw2;
+fi
+case $enable_axodraw2 in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_axodraw2=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-axodraw2=$enable_axodraw2'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-axodraw2=$enable_axodraw2'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-axodraw2=$enable_axodraw2'"
+    ;;
+esac
+
+## utils/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/devnag/
+## configure options and TL libraries required for devnag
+# Check whether --enable-devnag was given.
+if test ${enable_devnag+y}
+then :
+  enableval=$enable_devnag;
+fi
+case $enable_devnag in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_devnag=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-devnag=$enable_devnag'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-devnag=$enable_devnag'"
+    ;;
+esac
+
+## utils/lacheck/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/lacheck/
+## configure options and TL libraries required for lacheck
+# Check whether --enable-lacheck was given.
+if test ${enable_lacheck+y}
+then :
+  enableval=$enable_lacheck;
+fi
+case $enable_lacheck in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_lacheck=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-lacheck=$enable_lacheck'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-lacheck=$enable_lacheck'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-lacheck=$enable_lacheck'"
+    ;;
+esac
+
+## utils/m-tx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/m-tx/
+## configure options and TL libraries required for mtx
+# Check whether --enable-m-tx was given.
+if test ${enable_m_tx+y}
+then :
+  enableval=$enable_m_tx;
+fi
+case $enable_m_tx in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_m_tx=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-m-tx=$enable_m_tx'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-m-tx=$enable_m_tx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-m-tx=$enable_m_tx'"
+    ;;
+esac
+
+## utils/pmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/pmx/
+## configure options and TL libraries required for pmx
+# Check whether --enable-pmx was given.
+if test ${enable_pmx+y}
+then :
+  enableval=$enable_pmx;
+fi
+case $enable_pmx in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_pmx=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-pmx=$enable_pmx'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-pmx=$enable_pmx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-pmx=$enable_pmx'"
+    ;;
+esac
+
+## utils/ps2eps/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ps2eps/
+## configure options and TL libraries required for ps2eps
+# Check whether --enable-ps2eps was given.
+if test ${enable_ps2eps+y}
+then :
+  enableval=$enable_ps2eps;
+fi
+case $enable_ps2eps in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ps2eps=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ps2eps=$enable_ps2eps'"
+    ;;
+esac
+
+## utils/t1utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/t1utils/
+## configure options and TL libraries required for t1utils
+# Check whether --enable-t1utils was given.
+if test ${enable_t1utils+y}
+then :
+  enableval=$enable_t1utils;
+fi
+case $enable_t1utils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_t1utils=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-t1utils=$enable_t1utils'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-t1utils=$enable_t1utils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-t1utils=$enable_t1utils'"
+    ;;
+esac
+
+## utils/texdoctk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/texdoctk/
+## configure options and TL libraries required for texdoctk
+# Check whether --enable-texdoctk was given.
+if test ${enable_texdoctk+y}
+then :
+  enableval=$enable_texdoctk;
+fi
+case $enable_texdoctk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_texdoctk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texdoctk=$enable_texdoctk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-texdoctk=$enable_texdoctk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-texdoctk=$enable_texdoctk'"
+    ;;
+esac
+
+## utils/tpic2pdftex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/tpic2pdftex/
+## configure options and TL libraries required for tpic2pdftex
+# Check whether --enable-tpic2pdftex was given.
+if test ${enable_tpic2pdftex+y}
+then :
+  enableval=$enable_tpic2pdftex;
+fi
+case $enable_tpic2pdftex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_tpic2pdftex=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-tpic2pdftex=$enable_tpic2pdftex'"
+    ;;
+esac
+
+## utils/vlna/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/vlna/
+## configure options and TL libraries required for vlna
+# Check whether --enable-vlna was given.
+if test ${enable_vlna+y}
+then :
+  enableval=$enable_vlna;
+fi
+case $enable_vlna in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_vlna=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-vlna=$enable_vlna'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-vlna=$enable_vlna'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-vlna=$enable_vlna'"
+    ;;
+esac
+
+## utils/xindy/ac/withenable.ac: configure.ac fragment for TL subdir
+## configure options and TL libraries required for xindy.
+# Check whether --enable-xindy was given.
+if test ${enable_xindy+y}
+then :
+  enableval=$enable_xindy;
+fi
+case $enable_xindy in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_xindy=no
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xindy=$enable_xindy'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'"
+    ;;
+esac
+
+## utils/xindy/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
+## configure options for xindy
+# Check whether --enable-xindy-rules was given.
+if test ${enable_xindy_rules+y}
+then :
+  enableval=$enable_xindy_rules;
+fi
+# Check whether --enable-xindy-docs was given.
+if test ${enable_xindy_docs+y}
+then :
+  enableval=$enable_xindy_docs;
+fi
+
+# Check whether --with-clisp-runtime was given.
+if test ${with_clisp_runtime+y}
+then :
+  withval=$with_clisp_runtime;
+fi
+
+## utils/xindy/ac/clisp.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
+## configure checks for xindy and clisp
+case $with_clisp_runtime in #(
+  default) :
+     ;; #(
+  system) :
+    if test "x$enable_native_texlive_build" = xyes
+then :
+  as_fn_error $? "you can not use the installed clisp for a native TeX Live build" "$LINENO" 5
+fi ;; #(
+  "") :
+    if test "x$enable_native_texlive_build" = xyes
+then :
+  with_clisp_runtime=default
+else $as_nop
+  with_clisp_runtime=system
+fi
+               { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--with-clisp-runtime=$with_clisp_runtime'" >&5
+printf "%s\n" "$as_me: Assuming \`--with-clisp-runtime=$with_clisp_runtime'" >&6;}
+               ac_configure_args="$ac_configure_args '--with-clisp-runtime=$with_clisp_runtime'" ;; #(
+  *) :
+    if test ! -f "$with_clisp_runtime"
+then :
+  as_fn_error $? "no such file: \"$with_clisp_runtime\"" "$LINENO" 5
+fi ;;
+esac
+
+## utils/xml2pmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xml2pmx/
+## configure options and TL libraries required for xml2pmx
+# Check whether --enable-xml2pmx was given.
+if test ${enable_xml2pmx+y}
+then :
+  enableval=$enable_xml2pmx;
+fi
+case $enable_xml2pmx in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_xml2pmx=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xml2pmx=$enable_xml2pmx'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-xml2pmx=$enable_xml2pmx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xml2pmx=$enable_xml2pmx'"
+    ;;
+esac
+
+## utils/xpdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xpdfopen/
+## configure options and TL libraries required for xpdfopen
+# Check whether --enable-xpdfopen was given.
+if test ${enable_xpdfopen+y}
+then :
+  enableval=$enable_xpdfopen;
+fi
+if test "x$with_x" = xno
+then :
+  case $enable_xpdfopen in #(
+  "") :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \`--without-x' -> \`--disable-xpdfopen'" >&5
+printf "%s\n" "$as_me: \`--without-x' -> \`--disable-xpdfopen'" >&6;}
+                      enable_xpdfopen=no
+                      ac_configure_args="$ac_configure_args '--disable-xpdfopen'" ;; #(
+  yes) :
+    as_fn_error $? "Sorry, incompatible options \`--without-x' and \`--enable-xpdfopen'" "$LINENO" 5 ;; #(
+  *) :
+     ;;
+esac
+fi
+case $enable_xpdfopen in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_xpdfopen=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xpdfopen=$enable_xpdfopen'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-xpdfopen=$enable_xpdfopen'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xpdfopen=$enable_xpdfopen'"
+    ;;
+esac
+
 
 ## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 ## configure options and TL libraries required for web2c
@@ -4379,105 +4890,1016 @@ then :
 fi
 
 
-## texk/texlive/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
-## configure options and TL libraries required for texlive
-# Check whether --enable-texlive was given.
-if test ${enable_texlive+y}
+## texk/afm2pl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/afm2pl/
+## configure options and TL libraries required for afm2pl
+# Check whether --enable-afm2pl was given.
+if test ${enable_afm2pl+y}
 then :
-  enableval=$enable_texlive;
+  enableval=$enable_afm2pl;
 fi
-case $enable_texlive in #(
+case $enable_afm2pl in #(
   yes|no) :
      ;; #(
   *) :
 
-   enable_texlive=$enable_all_pkgs
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texlive=$enable_texlive'" >&5
-printf "%s\n" "$as_me: Assuming \`--enable-texlive=$enable_texlive'" >&6;}
-     ac_configure_args="$ac_configure_args '--enable-texlive=$enable_texlive'"
+   enable_afm2pl=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-afm2pl=$enable_afm2pl'"
     ;;
 esac
 
-## texk/texlive/ac/texlive.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
-## configure options for texlive
-# Check whether --enable-linked-scripts was given.
-if test ${enable_linked_scripts+y}
+test "x$enable_afm2pl" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/bibtex-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex-x/
+## configure options and TL libraries required for bibtex-x
+# Check whether --enable-bibtex-x was given.
+if test ${enable_bibtex_x+y}
 then :
-  enableval=$enable_linked_scripts;
+  enableval=$enable_bibtex_x;
 fi
+case $enable_bibtex_x in #(
+  yes|no) :
+     ;; #(
+  *) :
 
+   enable_bibtex_x=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-bibtex-x=$enable_bibtex_x'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-bibtex-x=$enable_bibtex_x'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-bibtex-x=$enable_bibtex_x'"
+    ;;
+esac
 
-## libs/pplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/pplib/
-## configure options and TL libraries required for pplib
-
-## libs/harfbuzz/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/
-## configure options and TL libraries required for harfbuzz
+test "x$enable_bibtex_x" = xno || {
+  need_kpathsea=yes
+}
 
-# Check whether --with-system-harfbuzz was given.
-if test ${with_system_harfbuzz+y}
+## texk/bibtex-x/ac/bibtex-x.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex-x/
+## configure options for bibtex-x
+# Check whether --enable-bibtex8 was given.
+if test ${enable_bibtex8+y}
 then :
-  withval=$with_system_harfbuzz;
-fi
-if test "x$with_system_harfbuzz" = x; then
-  if test -f $srcdir/../libs/harfbuzz/configure; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`harfbuzz' headers and library from TL tree" >&5
-printf "%s\n" "$as_me: Assuming \`harfbuzz' headers and library from TL tree" >&6;}
-    with_system_harfbuzz=no
-  else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`harfbuzz' headers and library" >&5
-printf "%s\n" "$as_me: Assuming installed \`harfbuzz' headers and library" >&6;}
-    with_system_harfbuzz=yes
-  fi
-  ac_configure_args="$ac_configure_args '--with-system-harfbuzz=$with_system_harfbuzz'"
+  enableval=$enable_bibtex8;
 fi
-if test "x$with_system_harfbuzz" = xyes; then
-  if test "x$with_system_graphite2" = x; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`graphite2' headers and library" >&5
-printf "%s\n" "$as_me:   ->  installed \`graphite2' headers and library" >&6;}
-    with_system_graphite2=yes
-    ac_configure_args="$ac_configure_args '--with-system-graphite2'"
-  elif test "x$with_system_graphite2" != xyes; then
-    as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-graphite2'" "$LINENO" 5
-  fi
-  if test "x$with_system_icu" = x; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`icu' headers and library" >&5
-printf "%s\n" "$as_me:   ->  installed \`icu' headers and library" >&6;}
-    with_system_icu=yes
-    ac_configure_args="$ac_configure_args '--with-system-icu'"
-  elif test "x$with_system_icu" != xyes; then
-    as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-icu'" "$LINENO" 5
-  fi
+
+case $enable_bibtex8 in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_bibtex8=yes ;;
+esac
+# Check whether --enable-bibtexu was given.
+if test ${enable_bibtexu+y}
+then :
+  enableval=$enable_bibtexu;
 fi
 
-test "x$need_harfbuzz" = xyes && {
-  need_graphite2=yes
-  need_icu=yes
-}
+case $enable_bibtexu in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_bibtexu=yes ;;
+esac
 
-## libs/graphite2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite2/
-## configure options and TL libraries required for graphite2
+test "x$enable_bibtex_x:$enable_bibtexu" = xyes:yes && need_icu=yes
 
-# Check whether --with-system-graphite2 was given.
-if test ${with_system_graphite2+y}
+## texk/chktex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/chktex/
+## configure options and TL libraries required for chktex
+# Check whether --enable-chktex was given.
+if test ${enable_chktex+y}
 then :
-  withval=$with_system_graphite2;
-fi
-if test "x$with_system_graphite2" = x; then
-  if test -f $srcdir/../libs/graphite2/configure; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`graphite2' headers and library from TL tree" >&5
-printf "%s\n" "$as_me: Assuming \`graphite2' headers and library from TL tree" >&6;}
-    with_system_graphite2=no
-  else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`graphite2' headers and library" >&5
-printf "%s\n" "$as_me: Assuming installed \`graphite2' headers and library" >&6;}
-    with_system_graphite2=yes
-  fi
-  ac_configure_args="$ac_configure_args '--with-system-graphite2=$with_system_graphite2'"
+  enableval=$enable_chktex;
 fi
+case $enable_chktex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_chktex=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-chktex=$enable_chktex'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-chktex=$enable_chktex'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-chktex=$enable_chktex'"
+    ;;
+esac
+
+test "x$enable_chktex" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/cjkutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/cjkutils/
+## configure options and TL libraries required for cjkutils
+# Check whether --enable-cjkutils was given.
+if test ${enable_cjkutils+y}
+then :
+  enableval=$enable_cjkutils;
+fi
+case $enable_cjkutils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_cjkutils=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-cjkutils=$enable_cjkutils'"
+    ;;
+esac
+
+test "x$enable_cjkutils" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/detex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/detex/
+## configure options and TL libraries required for detex
+# Check whether --enable-detex was given.
+if test ${enable_detex+y}
+then :
+  enableval=$enable_detex;
+fi
+case $enable_detex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_detex=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-detex=$enable_detex'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-detex=$enable_detex'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-detex=$enable_detex'"
+    ;;
+esac
+
+test "x$enable_detex" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/dtl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dtl/
+## configure options and TL libraries required for dtl
+# Check whether --enable-dtl was given.
+if test ${enable_dtl+y}
+then :
+  enableval=$enable_dtl;
+fi
+case $enable_dtl in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dtl=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dtl=$enable_dtl'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dtl=$enable_dtl'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dtl=$enable_dtl'"
+    ;;
+esac
+
+test "x$enable_dtl" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/dvi2tty/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvi2tty/
+## configure options and TL libraries required for dvi2tty
+# Check whether --enable-dvi2tty was given.
+if test ${enable_dvi2tty+y}
+then :
+  enableval=$enable_dvi2tty;
+fi
+case $enable_dvi2tty in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvi2tty=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvi2tty=$enable_dvi2tty'"
+    ;;
+esac
+
+test "x$enable_dvi2tty" = xno || {
+  need_ptexenc=yes
+}
+
+## texk/dvidvi/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvidvi/
+## configure options and TL libraries required for dvidvi
+# Check whether --enable-dvidvi was given.
+if test ${enable_dvidvi+y}
+then :
+  enableval=$enable_dvidvi;
+fi
+case $enable_dvidvi in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvidvi=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvidvi=$enable_dvidvi'"
+    ;;
+esac
+
+test "x$enable_dvidvi" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/dviljk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviljk/
+## configure options and TL libraries required for dviljk
+# Check whether --enable-dviljk was given.
+if test ${enable_dviljk+y}
+then :
+  enableval=$enable_dviljk;
+fi
+case $enable_dviljk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dviljk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dviljk=$enable_dviljk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dviljk=$enable_dviljk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dviljk=$enable_dviljk'"
+    ;;
+esac
+
+test "x$enable_dviljk" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/dviout-util/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviout-util/
+## configure options and TL libraries required for dviout-util
+# Check whether --enable-dviout-util was given.
+if test ${enable_dviout_util+y}
+then :
+  enableval=$enable_dviout_util;
+fi
+case $enable_dviout_util in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dviout_util=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dviout-util=$enable_dviout_util'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dviout-util=$enable_dviout_util'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dviout-util=$enable_dviout_util'"
+    ;;
+esac
+
+test "x$enable_dviout_util" = xno || {
+  need_ptexenc=yes
+}
+
+## texk/dvipdfm-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm-x/
+## configure options and TL libraries required for dvipdfm-x
+# Check whether --enable-dvipdfm-x was given.
+if test ${enable_dvipdfm_x+y}
+then :
+  enableval=$enable_dvipdfm_x;
+fi
+case $enable_dvipdfm_x in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipdfm_x=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipdfm-x=$enable_dvipdfm_x'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvipdfm-x=$enable_dvipdfm_x'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipdfm-x=$enable_dvipdfm_x'"
+    ;;
+esac
+
+test "x$enable_dvipdfm_x" = xno || {
+  need_kpathsea=yes
+  need_libpng=yes
+  need_libpaper=yes
+}
+
+## texk/dvipng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/
+## configure options and TL libraries required for dvipng
+# Check whether --enable-dvipng was given.
+if test ${enable_dvipng+y}
+then :
+  enableval=$enable_dvipng;
+fi
+case $enable_dvipng in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipng=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipng=$enable_dvipng'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvipng=$enable_dvipng'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipng=$enable_dvipng'"
+    ;;
+esac
+
+test "x$enable_dvipng" = xno || {
+  need_kpathsea=yes
+  need_gd=yes
+}
+
+## texk/dvipng/ac/dvipng.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/
+## configure options for dvipng
+# Check whether --enable-debug was given.
+if test ${enable_debug+y}
+then :
+  enableval=$enable_debug;
+fi
+
+# Check whether --enable-timing was given.
+if test ${enable_timing+y}
+then :
+  enableval=$enable_timing;
+fi
+
+
+# Check whether --with-gs was given.
+if test ${with_gs+y}
+then :
+  withval=$with_gs;
+fi
+
+
+## texk/dvipos/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipos/
+## configure options and TL libraries required for dvipos
+# Check whether --enable-dvipos was given.
+if test ${enable_dvipos+y}
+then :
+  enableval=$enable_dvipos;
+fi
+case $enable_dvipos in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipos=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipos=$enable_dvipos'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvipos=$enable_dvipos'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipos=$enable_dvipos'"
+    ;;
+esac
+
+test "x$enable_dvipos" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/dvipsk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipsk/
+## configure options and TL libraries required for dvipsk
+# Check whether --enable-dvipsk was given.
+if test ${enable_dvipsk+y}
+then :
+  enableval=$enable_dvipsk;
+fi
+case $enable_dvipsk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipsk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipsk=$enable_dvipsk'"
+    ;;
+esac
+
+test "x$enable_dvipsk" = xno || {
+  need_kpathsea=yes
+}
+
+# texk/dvisvgm/ac/withenable.ac: configure.ac fragment
+## configure options and TL libraries required for dvisvgm
+# Check whether --enable-dvisvgm was given.
+if test ${enable_dvisvgm+y}
+then :
+  enableval=$enable_dvisvgm;
+fi
+case $enable_dvisvgm in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvisvgm=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvisvgm=$enable_dvisvgm'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvisvgm=$enable_dvisvgm'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvisvgm=$enable_dvisvgm'"
+    ;;
+esac
+
+test "x$enable_dvisvgm" = xno || {
+  need_kpathsea=yes
+  need_potrace=yes
+  need_freetype2=yes
+  need_zlib=yes
+}
+
+## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/
+## configure options and TL libraries required for gregorio
+# Check whether --enable-gregorio was given.
+if test ${enable_gregorio+y}
+then :
+  enableval=$enable_gregorio;
+fi
+case $enable_gregorio in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_gregorio=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-gregorio=$enable_gregorio'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-gregorio=$enable_gregorio'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-gregorio=$enable_gregorio'"
+    ;;
+esac
+
+test "x$enable_gregorio" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
+## configure options and TL libraries required for gsftopk
+# Check whether --enable-gsftopk was given.
+if test ${enable_gsftopk+y}
+then :
+  enableval=$enable_gsftopk;
+fi
+case $enable_gsftopk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_gsftopk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-gsftopk=$enable_gsftopk'"
+    ;;
+esac
+
+test "x$enable_gsftopk" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/lcdf-typetools/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/
+## configure options and TL libraries required for lcdf-typetools
+# Check whether --enable-lcdf-typetools was given.
+if test ${enable_lcdf_typetools+y}
+then :
+  enableval=$enable_lcdf_typetools;
+fi
+case $enable_lcdf_typetools in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_lcdf_typetools=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-lcdf-typetools=$enable_lcdf_typetools'"
+    ;;
+esac
+
+test "x$enable_lcdf_typetools" = xno || {
+  need_kpathsea=yes
+}
+
+## Define configure options for lcdf-typetools.  Extracted from configure.ac
+## for ease of building TeX Live.
+# Check whether --enable-cfftot1 was given.
+if test ${enable_cfftot1+y}
+then :
+  enableval=$enable_cfftot1;
+fi
+# Check whether --enable-mmafm was given.
+if test ${enable_mmafm+y}
+then :
+  enableval=$enable_mmafm;
+fi
+# Check whether --enable-mmpfb was given.
+if test ${enable_mmpfb+y}
+then :
+  enableval=$enable_mmpfb;
+fi
+# Check whether --enable-otfinfo was given.
+if test ${enable_otfinfo+y}
+then :
+  enableval=$enable_otfinfo;
+fi
+# Check whether --enable-otftotfm was given.
+if test ${enable_otftotfm+y}
+then :
+  enableval=$enable_otftotfm;
+fi
+# Check whether --enable-t1dotlessj was given.
+if test ${enable_t1dotlessj+y}
+then :
+  enableval=$enable_t1dotlessj;
+fi
+# Check whether --enable-t1lint was given.
+if test ${enable_t1lint+y}
+then :
+  enableval=$enable_t1lint;
+fi
+# Check whether --enable-t1rawafm was given.
+if test ${enable_t1rawafm+y}
+then :
+  enableval=$enable_t1rawafm;
+fi
+# Check whether --enable-t1reencode was given.
+if test ${enable_t1reencode+y}
+then :
+  enableval=$enable_t1reencode;
+fi
+# Check whether --enable-t1testpage was given.
+if test ${enable_t1testpage+y}
+then :
+  enableval=$enable_t1testpage;
+fi
+# Check whether --enable-ttftotype42 was given.
+if test ${enable_ttftotype42+y}
+then :
+  enableval=$enable_ttftotype42;
+fi
+
+# Check whether --enable-cfftot1 was given.
+if test ${enable_cfftot1+y}
+then :
+  enableval=$enable_cfftot1;
+fi
+# Check whether --enable-t1dotlessj was given.
+if test ${enable_t1dotlessj+y}
+then :
+  enableval=$enable_t1dotlessj;
+fi
+# Check whether --enable-ttftotype42 was given.
+if test ${enable_ttftotype42+y}
+then :
+  enableval=$enable_ttftotype42;
+fi
+# Check whether --enable-updmap was given.
+if test ${enable_updmap+y}
+then :
+  enableval=$enable_updmap;
+fi
+
+
+## texk/makeindexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makeindexk/
+## configure options and TL libraries required for makeindexk
+# Check whether --enable-makeindexk was given.
+if test ${enable_makeindexk+y}
+then :
+  enableval=$enable_makeindexk;
+fi
+case $enable_makeindexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_makeindexk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-makeindexk=$enable_makeindexk'"
+    ;;
+esac
+
+test "x$enable_makeindexk" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/makejvf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makejvf/
+## configure options and TL libraries required for makejvf
+# Check whether --enable-makejvf was given.
+if test ${enable_makejvf+y}
+then :
+  enableval=$enable_makejvf;
+fi
+case $enable_makejvf in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_makejvf=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-makejvf=$enable_makejvf'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-makejvf=$enable_makejvf'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-makejvf=$enable_makejvf'"
+    ;;
+esac
+
+test "x$enable_makejvf" = xno || {
+  need_ptexenc=yes
+}
+
+## texk/mendexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/mendexk/
+## configure options and TL libraries required for mendexk
+# Check whether --enable-mendexk was given.
+if test ${enable_mendexk+y}
+then :
+  enableval=$enable_mendexk;
+fi
+case $enable_mendexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_mendexk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-mendexk=$enable_mendexk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-mendexk=$enable_mendexk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-mendexk=$enable_mendexk'"
+    ;;
+esac
+
+test "x$enable_mendexk" = xno || {
+  need_ptexenc=yes
+}
+
+## texk/musixtnt/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/musixtnt/
+## configure options and TL libraries required for musixtnt
+# Check whether --enable-musixtnt was given.
+if test ${enable_musixtnt+y}
+then :
+  enableval=$enable_musixtnt;
+fi
+case $enable_musixtnt in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_musixtnt=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-musixtnt=$enable_musixtnt'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-musixtnt=$enable_musixtnt'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-musixtnt=$enable_musixtnt'"
+    ;;
+esac
+
+test "x$enable_musixtnt" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/ps2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pk/
+## configure options and TL libraries required for ps2pk
+# Check whether --enable-ps2pk was given.
+if test ${enable_ps2pk+y}
+then :
+  enableval=$enable_ps2pk;
+fi
+case $enable_ps2pk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ps2pk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ps2pk=$enable_ps2pk'"
+    ;;
+esac
+
+test "x$enable_ps2pk" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/psutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/psutils/
+## configure options and TL libraries required for psutils
+# Check whether --enable-psutils was given.
+if test ${enable_psutils+y}
+then :
+  enableval=$enable_psutils;
+fi
+case $enable_psutils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_psutils=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-psutils=$enable_psutils'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-psutils=$enable_psutils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-psutils=$enable_psutils'"
+    ;;
+esac
+
+test "x$enable_psutils" = xno || {
+  need_kpathsea=yes
+  need_libpaper=yes
+}
+
+## texk/seetexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/seetexk/
+## configure options and TL libraries required for seetexk
+# Check whether --enable-seetexk was given.
+if test ${enable_seetexk+y}
+then :
+  enableval=$enable_seetexk;
+fi
+case $enable_seetexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_seetexk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-seetexk=$enable_seetexk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-seetexk=$enable_seetexk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-seetexk=$enable_seetexk'"
+    ;;
+esac
+
+test "x$enable_seetexk" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/tex4htk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tex4htk/
+## configure options and TL libraries required for tex4htk
+# Check whether --enable-tex4htk was given.
+if test ${enable_tex4htk+y}
+then :
+  enableval=$enable_tex4htk;
+fi
+case $enable_tex4htk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_tex4htk=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-tex4htk=$enable_tex4htk'"
+    ;;
+esac
+
+test "x$enable_tex4htk" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/ttf2pk2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk2/
+## configure options and TL libraries required for ttf2pk
+# Check whether --enable-ttf2pk2 was given.
+if test ${enable_ttf2pk2+y}
+then :
+  enableval=$enable_ttf2pk2;
+fi
+case $enable_ttf2pk2 in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ttf2pk2=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ttf2pk2=$enable_ttf2pk2'"
+    ;;
+esac
+
+test "x$enable_ttf2pk2" = xno || {
+  need_kpathsea=yes
+  need_freetype2=yes
+}
+
+## texk/ttfdump/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttfdump/
+## configure options and TL libraries required for ttfdump
+# Check whether --enable-ttfdump was given.
+if test ${enable_ttfdump+y}
+then :
+  enableval=$enable_ttfdump;
+fi
+case $enable_ttfdump in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ttfdump=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ttfdump=$enable_ttfdump'"
+    ;;
+esac
+
+test "x$enable_ttfdump" = xno || {
+  need_kpathsea=yes
+}
+
+## texk/upmendex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/upmendex/
+## configure options and TL libraries required for upmendex
+# Check whether --enable-upmendex was given.
+if test ${enable_upmendex+y}
+then :
+  enableval=$enable_upmendex;
+fi
+case $enable_upmendex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_upmendex=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-upmendex=$enable_upmendex'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-upmendex=$enable_upmendex'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-upmendex=$enable_upmendex'"
+    ;;
+esac
+
+test "x$enable_upmendex" = xno || {
+  need_kpathsea=yes
+  need_icu=yes
+}
+
+## texk/xdvik/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/
+## configure options and TL libraries required for xdvik
+# Check whether --enable-xdvik was given.
+if test ${enable_xdvik+y}
+then :
+  enableval=$enable_xdvik;
+fi
+if test "x$with_x" = xno
+then :
+  case $enable_xdvik in #(
+  "") :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \`--without-x' -> \`--disable-xdvik'" >&5
+printf "%s\n" "$as_me: \`--without-x' -> \`--disable-xdvik'" >&6;}
+                      enable_xdvik=no
+                      ac_configure_args="$ac_configure_args '--disable-xdvik'" ;; #(
+  yes) :
+    as_fn_error $? "Sorry, incompatible options \`--without-x' and \`--enable-xdvik'" "$LINENO" 5 ;; #(
+  *) :
+     ;;
+esac
+fi
+case $enable_xdvik in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_xdvik=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xdvik=$enable_xdvik'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-xdvik=$enable_xdvik'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xdvik=$enable_xdvik'"
+    ;;
+esac
+
+test "x$enable_xdvik" = xno || {
+  need_kpathsea=yes
+  need_freetype2=yes
+}
+
+## texk/xdvik/ac/xdvik.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/
+## configure options for xdvik
+
+# Check whether --with-xdvi-x-toolkit was given.
+if test ${with_xdvi_x_toolkit+y}
+then :
+  withval=$with_xdvi_x_toolkit;
+fi
+
+
+## texk/texlive/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
+## configure options and TL libraries required for texlive
+# Check whether --enable-texlive was given.
+if test ${enable_texlive+y}
+then :
+  enableval=$enable_texlive;
+fi
+case $enable_texlive in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_texlive=$enable_all_pkgs
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texlive=$enable_texlive'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-texlive=$enable_texlive'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-texlive=$enable_texlive'"
+    ;;
+esac
+
+## texk/texlive/ac/texlive.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
+## configure options for texlive
+# Check whether --enable-linked-scripts was given.
+if test ${enable_linked_scripts+y}
+then :
+  enableval=$enable_linked_scripts;
+fi
+
+
+## libs/pplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/pplib/
+## configure options and TL libraries required for pplib
+
+## libs/harfbuzz/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/
+## configure options and TL libraries required for harfbuzz
+
+# Check whether --with-system-harfbuzz was given.
+if test ${with_system_harfbuzz+y}
+then :
+  withval=$with_system_harfbuzz;
+fi
+if test "x$with_system_harfbuzz" = x; then
+  if test -f $srcdir/../libs/harfbuzz/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`harfbuzz' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`harfbuzz' headers and library from TL tree" >&6;}
+    with_system_harfbuzz=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`harfbuzz' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`harfbuzz' headers and library" >&6;}
+    with_system_harfbuzz=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-harfbuzz=$with_system_harfbuzz'"
+fi
+if test "x$with_system_harfbuzz" = xyes; then
+  if test "x$with_system_graphite2" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`graphite2' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`graphite2' headers and library" >&6;}
+    with_system_graphite2=yes
+    ac_configure_args="$ac_configure_args '--with-system-graphite2'"
+  elif test "x$with_system_graphite2" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-graphite2'" "$LINENO" 5
+  fi
+  if test "x$with_system_icu" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`icu' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`icu' headers and library" >&6;}
+    with_system_icu=yes
+    ac_configure_args="$ac_configure_args '--with-system-icu'"
+  elif test "x$with_system_icu" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-icu'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_harfbuzz" = xyes && {
+  need_graphite2=yes
+  need_icu=yes
+}
+
+## libs/icu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/
+## configure options and TL libraries required for icu (modified for XeTeX)
+
+# Check whether --with-system-icu was given.
+if test ${with_system_icu+y}
+then :
+  withval=$with_system_icu;
+fi
+if test "x$with_system_icu" = x; then
+  if test -f $srcdir/../libs/icu/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`icu' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`icu' headers and library from TL tree" >&6;}
+    with_system_icu=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`icu' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`icu' headers and library" >&6;}
+    with_system_icu=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-icu=$with_system_icu'"
+fi
+
+## libs/teckit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/
+## configure options and TL libraries required for teckit
+
+# Check whether --with-system-teckit was given.
+if test ${with_system_teckit+y}
+then :
+  withval=$with_system_teckit;
+fi
+if test "x$with_system_teckit" = x; then
+  if test -f $srcdir/../libs/teckit/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`teckit' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`teckit' headers and library from TL tree" >&6;}
+    with_system_teckit=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`teckit' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`teckit' headers and library" >&6;}
+    with_system_teckit=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-teckit=$with_system_teckit'"
+fi
+if test "x$with_system_teckit" = xyes; then
+  if test "x$with_system_zlib" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`zlib' headers and library" >&6;}
+    with_system_zlib=yes
+    ac_configure_args="$ac_configure_args '--with-system-zlib'"
+  elif test "x$with_system_zlib" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_teckit" = xyes && {
+  need_zlib=yes
+}
+
+## libs/graphite2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite2/
+## configure options and TL libraries required for graphite2
+
+# Check whether --with-system-graphite2 was given.
+if test ${with_system_graphite2+y}
+then :
+  withval=$with_system_graphite2;
+fi
+if test "x$with_system_graphite2" = x; then
+  if test -f $srcdir/../libs/graphite2/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`graphite2' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`graphite2' headers and library from TL tree" >&6;}
+    with_system_graphite2=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`graphite2' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`graphite2' headers and library" >&6;}
+    with_system_graphite2=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-graphite2=$with_system_graphite2'"
+fi
+
+## libs/zziplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zziplib/
+## configure options and TL libraries required for zziplib
 
-## libs/zziplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zziplib/
-## configure options and TL libraries required for zziplib
-
 # Check whether --with-system-zziplib was given.
 if test ${with_system_zziplib+y}
 then :
@@ -4510,6 +5932,249 @@ test "x$need_zziplib" = xyes && {
   need_zlib=yes
 }
 
+## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/
+## configure options and TL libraries required for xpdf
+: "kpse_xpdf_options - no-op"
+if test "x$with_system_xpdf" = x; then
+  if test -f $srcdir/../libs/xpdf/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`xpdf' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`xpdf' headers and library from TL tree" >&6;}
+    with_system_xpdf=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`xpdf' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`xpdf' headers and library" >&6;}
+    with_system_xpdf=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-xpdf=$with_system_xpdf'"
+fi
+
+## libs/mpfr/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/mpfr/
+## configure options and TL libraries required for mpfr
+
+# Check whether --with-system-mpfr was given.
+if test ${with_system_mpfr+y}
+then :
+  withval=$with_system_mpfr;
+fi
+
+# Check whether --with-mpfr-includes was given.
+if test ${with_mpfr_includes+y}
+then :
+  withval=$with_mpfr_includes;
+fi
+
+# Check whether --with-mpfr-libdir was given.
+if test ${with_mpfr_libdir+y}
+then :
+  withval=$with_mpfr_libdir;
+fi
+if test "x$with_system_mpfr" = x; then
+  if test -f $srcdir/../libs/mpfr/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`mpfr' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`mpfr' headers and library from TL tree" >&6;}
+    with_system_mpfr=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`mpfr' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`mpfr' headers and library" >&6;}
+    with_system_mpfr=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-mpfr=$with_system_mpfr'"
+fi
+if test "x$with_system_mpfr" = xyes; then
+  if test "x$with_system_gmp" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`gmp' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`gmp' headers and library" >&6;}
+    with_system_gmp=yes
+    ac_configure_args="$ac_configure_args '--with-system-gmp'"
+  elif test "x$with_system_gmp" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-mpfr' requires \`--with-system-gmp'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_mpfr" = xyes && {
+  need_gmp=yes
+}
+
+## libs/gmp/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gmp/
+## configure options and TL libraries required for gmp
+
+# Check whether --with-system-gmp was given.
+if test ${with_system_gmp+y}
+then :
+  withval=$with_system_gmp;
+fi
+
+# Check whether --with-gmp-includes was given.
+if test ${with_gmp_includes+y}
+then :
+  withval=$with_gmp_includes;
+fi
+
+# Check whether --with-gmp-libdir was given.
+if test ${with_gmp_libdir+y}
+then :
+  withval=$with_gmp_libdir;
+fi
+if test "x$with_system_gmp" = x; then
+  if test -f $srcdir/../libs/gmp/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`gmp' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`gmp' headers and library from TL tree" >&6;}
+    with_system_gmp=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`gmp' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`gmp' headers and library" >&6;}
+    with_system_gmp=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-gmp=$with_system_gmp'"
+fi
+
+## libs/cairo/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/cairo/
+## configure options and TL libraries required for cairo
+
+# Check whether --with-system-cairo was given.
+if test ${with_system_cairo+y}
+then :
+  withval=$with_system_cairo;
+fi
+if test "x$with_system_cairo" = x; then
+  if test -f $srcdir/../libs/cairo/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`cairo' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`cairo' headers and library from TL tree" >&6;}
+    with_system_cairo=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`cairo' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`cairo' headers and library" >&6;}
+    with_system_cairo=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-cairo=$with_system_cairo'"
+fi
+if test "x$with_system_cairo" = xyes; then
+  if test "x$with_system_pixman" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`pixman' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`pixman' headers and library" >&6;}
+    with_system_pixman=yes
+    ac_configure_args="$ac_configure_args '--with-system-pixman'"
+  elif test "x$with_system_pixman" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-cairo' requires \`--with-system-pixman'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_cairo" = xyes && {
+  need_pixman=yes
+}
+
+## libs/pixman/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/pixman/
+## configure options and TL libraries required for pixman
+
+# Check whether --with-system-pixman was given.
+if test ${with_system_pixman+y}
+then :
+  withval=$with_system_pixman;
+fi
+if test "x$with_system_pixman" = x; then
+  if test -f $srcdir/../libs/pixman/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`pixman' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`pixman' headers and library from TL tree" >&6;}
+    with_system_pixman=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`pixman' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`pixman' headers and library" >&6;}
+    with_system_pixman=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-pixman=$with_system_pixman'"
+fi
+
+## libs/gd/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
+## configure options and TL libraries required for gd
+
+# Check whether --with-system-gd was given.
+if test ${with_system_gd+y}
+then :
+  withval=$with_system_gd;
+fi
+
+# Check whether --with-gd-includes was given.
+if test ${with_gd_includes+y}
+then :
+  withval=$with_gd_includes;
+fi
+
+# Check whether --with-gd-libdir was given.
+if test ${with_gd_libdir+y}
+then :
+  withval=$with_gd_libdir;
+fi
+if test "x$with_system_gd" = x; then
+  if test -f $srcdir/../libs/gd/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`gd' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`gd' headers and library from TL tree" >&6;}
+    with_system_gd=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`gd' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`gd' headers and library" >&6;}
+    with_system_gd=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-gd=$with_system_gd'"
+fi
+if test "x$with_system_gd" = xyes; then
+  if test "x$with_system_libpng" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`libpng' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`libpng' headers and library" >&6;}
+    with_system_libpng=yes
+    ac_configure_args="$ac_configure_args '--with-system-libpng'"
+  elif test "x$with_system_libpng" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-gd' requires \`--with-system-libpng'" "$LINENO" 5
+  fi
+  if test "x$with_system_freetype2" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`freetype2' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`freetype2' headers and library" >&6;}
+    with_system_freetype2=yes
+    ac_configure_args="$ac_configure_args '--with-system-freetype2'"
+  elif test "x$with_system_freetype2" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-gd' requires \`--with-system-freetype2'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_gd" = xyes && {
+  need_libpng=yes
+  need_freetype2=yes
+}
+
+## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/
+## configure options and TL libraries required for freetype2
+
+# Check whether --with-system-freetype2 was given.
+if test ${with_system_freetype2+y}
+then :
+  withval=$with_system_freetype2;
+fi
+if test "x$with_system_freetype2" = x; then
+  if test -f $srcdir/../libs/freetype2/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`freetype2' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`freetype2' headers and library from TL tree" >&6;}
+    with_system_freetype2=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`freetype2' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`freetype2' headers and library" >&6;}
+    with_system_freetype2=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-freetype2=$with_system_freetype2'"
+fi
+if test "x$with_system_freetype2" = xyes; then
+  if test "x$with_system_zlib" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`zlib' headers and library" >&6;}
+    with_system_zlib=yes
+    ac_configure_args="$ac_configure_args '--with-system-zlib'"
+  elif test "x$with_system_zlib" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_freetype2" = xyes && {
+  need_zlib=yes
+}
+
 ## libs/libpng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/
 ## configure options and TL libraries required for libpng
 
@@ -4545,6 +6210,39 @@ test "x$need_libpng" = xyes && {
   need_zlib=yes
 }
 
+## libs/libpaper/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpaper/
+## configure options and TL libraries required for libpaper
+
+# Check whether --with-system-libpaper was given.
+if test ${with_system_libpaper+y}
+then :
+  withval=$with_system_libpaper;
+fi
+
+# Check whether --with-libpaper-includes was given.
+if test ${with_libpaper_includes+y}
+then :
+  withval=$with_libpaper_includes;
+fi
+
+# Check whether --with-libpaper-libdir was given.
+if test ${with_libpaper_libdir+y}
+then :
+  withval=$with_libpaper_libdir;
+fi
+if test "x$with_system_libpaper" = x; then
+  if test -f $srcdir/../libs/libpaper/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`libpaper' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`libpaper' headers and library from TL tree" >&6;}
+    with_system_libpaper=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`libpaper' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`libpaper' headers and library" >&6;}
+    with_system_libpaper=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-libpaper=$with_system_libpaper'"
+fi
+
 ## libs/luajit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/luajit/
 ## configure options and TL libraries required for luajit
 
@@ -4585,6 +6283,41 @@ printf "%s\n" "$as_me: Assuming installed \`zlib' headers and library" >&6;}
 fi
 
 
+## texk/ptexenc/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/
+## configure options and TL libraries required for ptexenc
+
+# Check whether --with-system-ptexenc was given.
+if test ${with_system_ptexenc+y}
+then :
+  withval=$with_system_ptexenc;
+fi
+if test "x$with_system_ptexenc" = x; then
+  if test -f $srcdir/../texk/ptexenc/configure; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`ptexenc' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`ptexenc' headers and library from TL tree" >&6;}
+    with_system_ptexenc=no
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`ptexenc' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`ptexenc' headers and library" >&6;}
+    with_system_ptexenc=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-ptexenc=$with_system_ptexenc'"
+fi
+if test "x$with_system_ptexenc" = xyes; then
+  if test "x$with_system_kpathsea" = x; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ->  installed \`kpathsea' headers and library" >&5
+printf "%s\n" "$as_me:   ->  installed \`kpathsea' headers and library" >&6;}
+    with_system_kpathsea=yes
+    ac_configure_args="$ac_configure_args '--with-system-kpathsea'"
+  elif test "x$with_system_kpathsea" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-ptexenc' requires \`--with-system-kpathsea'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_ptexenc" = xyes && {
+  need_kpathsea=yes
+}
+
 ## texk/kpathsea/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
 ## configure options and TL libraries required for kpathsea
 
@@ -5591,6 +7324,90 @@ printf %s "checking for Utils programs to build... " >&6; }
 echo 'tldbg:_KPSE_RECURSE called: list=utils, text=Utils programs, cond=test "x$enable_[]Kpse_pkg" = xyes, prefix=.' >&5
 MAKE_SUBDIRS=
 CONF_SUBDIRS=
+if test -x $srcdir/autosp/configure; then
+  test "x$enable_autosp" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS autosp"
+  CONF_SUBDIRS="$CONF_SUBDIRS autosp"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/autosp/configure' >&5
+fi
+if test -x $srcdir/axodraw2/configure; then
+  test "x$enable_axodraw2" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS axodraw2"
+  CONF_SUBDIRS="$CONF_SUBDIRS axodraw2"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/axodraw2/configure' >&5
+fi
+if test -x $srcdir/devnag/configure; then
+  test "x$enable_devnag" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS devnag"
+  CONF_SUBDIRS="$CONF_SUBDIRS devnag"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/devnag/configure' >&5
+fi
+if test -x $srcdir/lacheck/configure; then
+  test "x$enable_lacheck" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS lacheck"
+  CONF_SUBDIRS="$CONF_SUBDIRS lacheck"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/lacheck/configure' >&5
+fi
+if test -x $srcdir/m-tx/configure; then
+  test "x$enable_m_tx" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS m-tx"
+  CONF_SUBDIRS="$CONF_SUBDIRS m-tx"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/m-tx/configure' >&5
+fi
+if test -x $srcdir/pmx/configure; then
+  test "x$enable_pmx" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS pmx"
+  CONF_SUBDIRS="$CONF_SUBDIRS pmx"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/pmx/configure' >&5
+fi
+if test -x $srcdir/ps2eps/configure; then
+  test "x$enable_ps2eps" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ps2eps"
+  CONF_SUBDIRS="$CONF_SUBDIRS ps2eps"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/ps2eps/configure' >&5
+fi
+if test -x $srcdir/t1utils/configure; then
+  test "x$enable_t1utils" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS t1utils"
+  CONF_SUBDIRS="$CONF_SUBDIRS t1utils"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/t1utils/configure' >&5
+fi
+if test -x $srcdir/texdoctk/configure; then
+  test "x$enable_texdoctk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS texdoctk"
+  CONF_SUBDIRS="$CONF_SUBDIRS texdoctk"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/texdoctk/configure' >&5
+fi
+if test -x $srcdir/tpic2pdftex/configure; then
+  test "x$enable_tpic2pdftex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS tpic2pdftex"
+  CONF_SUBDIRS="$CONF_SUBDIRS tpic2pdftex"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/tpic2pdftex/configure' >&5
+fi
+if test -x $srcdir/vlna/configure; then
+  test "x$enable_vlna" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS vlna"
+  CONF_SUBDIRS="$CONF_SUBDIRS vlna"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/vlna/configure' >&5
+fi
+if test -x $srcdir/xindy/configure; then
+  test "x$enable_xindy" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS xindy"
+  CONF_SUBDIRS="$CONF_SUBDIRS xindy"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/xindy/configure' >&5
+fi
+if test -x $srcdir/xml2pmx/configure; then
+  test "x$enable_xml2pmx" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS xml2pmx"
+  CONF_SUBDIRS="$CONF_SUBDIRS xml2pmx"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/xml2pmx/configure' >&5
+fi
+if test -x $srcdir/xpdfopen/configure; then
+  test "x$enable_xpdfopen" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS xpdfopen"
+  CONF_SUBDIRS="$CONF_SUBDIRS xpdfopen"
+else
+  echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/xpdfopen/configure' >&5
+fi
 
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
 printf "%s\n" "$MAKE_SUBDIRS" >&6; }