pdftex[787] branches/stable/source/src: sync with tl 46069

commits+karl at tug.org commits+karl at tug.org
Fri Dec 15 17:53:58 CET 2017


Revision: 787
          http://tug.org/svn/pdftex?view=revision&revision=787
Author:   karl
Date:     2017-12-15 17:53:58 +0100 (Fri, 15 Dec 2017)
Log Message:
-----------
sync with tl 46069

Modified Paths:
--------------
    branches/stable/source/src/Makefile.in
    branches/stable/source/src/build-aux/config.guess
    branches/stable/source/src/build-aux/config.sub
    branches/stable/source/src/build-aux/texinfo.tex
    branches/stable/source/src/configure
    branches/stable/source/src/doc/Makefile.in
    branches/stable/source/src/libs/Makefile.in
    branches/stable/source/src/libs/README
    branches/stable/source/src/libs/aclocal.m4
    branches/stable/source/src/libs/configure
    branches/stable/source/src/libs/libpng/ChangeLog
    branches/stable/source/src/libs/libpng/Makefile.am
    branches/stable/source/src/libs/libpng/Makefile.in
    branches/stable/source/src/libs/libpng/aclocal.m4
    branches/stable/source/src/libs/libpng/config.h.in
    branches/stable/source/src/libs/libpng/configure
    branches/stable/source/src/libs/libpng/configure.ac
    branches/stable/source/src/libs/libpng/include/Makefile.in
    branches/stable/source/src/libs/libpng/libpng.test
    branches/stable/source/src/libs/poppler/configure
    branches/stable/source/src/libs/zlib/configure
    branches/stable/source/src/libs/zlib/zlib.test
    branches/stable/source/src/m4/ChangeLog
    branches/stable/source/src/m4/kpse-icu-flags.m4
    branches/stable/source/src/m4/kpse-visibility.m4
    branches/stable/source/src/texk/Makefile.in
    branches/stable/source/src/texk/aclocal.m4
    branches/stable/source/src/texk/configure
    branches/stable/source/src/texk/kpathsea/ChangeLog
    branches/stable/source/src/texk/kpathsea/c-minmax.h
    branches/stable/source/src/texk/kpathsea/cnf.c
    branches/stable/source/src/texk/kpathsea/db.c
    branches/stable/source/src/texk/kpathsea/default.h
    branches/stable/source/src/texk/kpathsea/doc/kpathsea.info
    branches/stable/source/src/texk/kpathsea/doc/kpathsea.texi
    branches/stable/source/src/texk/kpathsea/doc/unixtex.texi
    branches/stable/source/src/texk/kpathsea/hash.c
    branches/stable/source/src/texk/kpathsea/kdefault.c
    branches/stable/source/src/texk/kpathsea/tests/cnfnewline.test
    branches/stable/source/src/texk/kpathsea/tests/kpseaccess.test
    branches/stable/source/src/texk/kpathsea/tests/kpsereadlink.test
    branches/stable/source/src/texk/kpathsea/tests/kpsestat.test
    branches/stable/source/src/texk/kpathsea/tests/kpsewhich.test
    branches/stable/source/src/texk/kpathsea/tex-file.c
    branches/stable/source/src/texk/kpathsea/tex-glyph.c
    branches/stable/source/src/texk/web2c/Makefile.in
    branches/stable/source/src/texk/web2c/NEWS
    branches/stable/source/src/texk/web2c/configure
    branches/stable/source/src/texk/web2c/cwebdir/cweave.test
    branches/stable/source/src/texk/web2c/etexdir/etriptest.test
    branches/stable/source/src/texk/web2c/etexdir/wprob.test
    branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
    branches/stable/source/src/texk/web2c/pdftexdir/am/pdftex.am
    branches/stable/source/src/texk/web2c/pdftexdir/pdfimage.test
    branches/stable/source/src/texk/web2c/pdftexdir/pdftex.test
    branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc.test
    branches/stable/source/src/texk/web2c/pdftexdir/tounicode.c
    branches/stable/source/src/texk/web2c/pdftexdir/ttf2afm.test
    branches/stable/source/src/texk/web2c/pdftexdir/wprob.test
    branches/stable/source/src/texk/web2c/synctexdir/synctex.test
    branches/stable/source/src/texk/web2c/tangle.test
    branches/stable/source/src/texk/web2c/tiedir/tie.test
    branches/stable/source/src/utils/Makefile.in
    branches/stable/source/src/utils/aclocal.m4
    branches/stable/source/src/utils/configure

Modified: branches/stable/source/src/Makefile.in
===================================================================
--- branches/stable/source/src/Makefile.in	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/Makefile.in	2017-12-15 16:53:58 UTC (rev 787)
@@ -121,19 +121,99 @@
 	$(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/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/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/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/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/poppler/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/potrace/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/lua52/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/potrace/ac/potrace.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/poppler/ac/poppler.ac \
-	$(top_srcdir)/libs/xpdf/ac/xpdf.ac $(top_srcdir)/configure.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) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
@@ -204,10 +284,11 @@
 	$(top_srcdir)/build-aux/config.sub \
 	$(top_srcdir)/build-aux/install-sh \
 	$(top_srcdir)/build-aux/ltmain.sh \
-	$(top_srcdir)/build-aux/missing README 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 \
-	build-aux/missing build-aux/texinfo.tex build-aux/ylwrap
+	$(top_srcdir)/build-aux/missing ChangeLog README \
+	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 build-aux/missing build-aux/texinfo.tex \
+	build-aux/ylwrap
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)

Modified: branches/stable/source/src/build-aux/config.guess
===================================================================
--- branches/stable/source/src/build-aux/config.guess	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/build-aux/config.guess	2017-12-15 16:53:58 UTC (rev 787)
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2017-09-26'
+timestamp='2017-11-07'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@
 
 Output the configuration name of the system \`$me' is run on.
 
-Operation modes:
+Options:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
@@ -244,6 +244,9 @@
 	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
 	exit ;;
+    *:MidnightBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-midnightbsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
@@ -479,13 +482,13 @@
 #endif
 	#if defined (host_mips) && defined (MIPSEB)
 	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	  printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
 	#endif
 	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	  printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
 	#endif
 	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	  printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
 	#endif
 	#endif
 	  exit (-1);
@@ -608,7 +611,7 @@
     *:AIX:*:*)
 	echo rs6000-ibm-aix
 	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
 	echo romp-ibm-bsd4.4
 	exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
@@ -629,8 +632,8 @@
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/31?)            HP_ARCH=m68000 ;;
+	    9000/[34]??)         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
@@ -743,7 +746,7 @@
 		{ echo "$SYSTEM_NAME"; exit; }
 	echo unknown-hitachi-hiuxwe2
 	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
 	echo hppa1.1-hp-bsd
 	exit ;;
     9000/8??:4.3bsd:*:*)
@@ -752,7 +755,7 @@
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
 	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
 	echo hppa1.1-hp-osf
 	exit ;;
     hp8??:OSF1:*:*)
@@ -1072,7 +1075,7 @@
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
 	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+    i*86:*:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}

Modified: branches/stable/source/src/build-aux/config.sub
===================================================================
--- branches/stable/source/src/build-aux/config.sub	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/build-aux/config.sub	2017-12-15 16:53:58 UTC (rev 787)
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2017-09-26'
+timestamp='2017-11-23'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@
 
 Canonicalize a configuration name.
 
-Operation modes:
+Options:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
@@ -313,7 +313,6 @@
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| visium \
 	| wasm32 \
-	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
@@ -640,7 +639,7 @@
 		basic_machine=rs6000-bull
 		os=-bosx
 		;;
-	dpx2* | dpx2*-bull)
+	dpx2*)
 		basic_machine=m68k-bull
 		os=-sysv3
 		;;
@@ -902,7 +901,7 @@
 		basic_machine=v70-nec
 		os=-sysv
 		;;
-	next | m*-next )
+	next | m*-next)
 		basic_machine=m68k-next
 		case $os in
 		    -nextstep* )
@@ -1492,7 +1491,7 @@
 	-nova*)
 		os=-rtmk-nova
 		;;
-	-ns2 )
+	-ns2)
 		os=-nextstep2
 		;;
 	-nsk*)
@@ -1547,6 +1546,19 @@
 	-dicos*)
 		os=-dicos
 		;;
+	-pikeos*)
+		# Until real need of OS specific support for
+		# particular features comes up, bare metal
+		# configurations are quite functional.
+		case $basic_machine in
+		    arm*)
+			os=-eabi
+			;;
+		    *)
+			os=-elf
+			;;
+		esac
+		;;
 	-nacl*)
 		;;
 	-ios)
@@ -1694,7 +1706,7 @@
 	m88k-omron*)
 		os=-luna
 		;;
-	*-next )
+	*-next)
 		os=-nextstep
 		;;
 	*-sequent)

Modified: branches/stable/source/src/build-aux/texinfo.tex
===================================================================
--- branches/stable/source/src/build-aux/texinfo.tex	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/build-aux/texinfo.tex	2017-12-15 16:53:58 UTC (rev 787)
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2017-09-16.10}
+\def\texinfoversion{2017-12-01.13}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2503,13 +2503,25 @@
 
 
 % In order for the font changes to affect most math symbols and letters,
-% we have to define the \textfont of the standard families.  We don't
-% bother to reset \scriptfont and \scriptscriptfont; awaiting user need.
+% we have to define the \textfont of the standard families.
 %
 \def\resetmathfonts{%
   \textfont0=\rmfont \textfont1=\ifont \textfont2=\syfont
   \textfont\itfam=\itfont \textfont\slfam=\slfont \textfont\bffam=\bffont
   \textfont\ttfam=\ttfont \textfont\sffam=\sffont
+  %
+  \scriptfont0=\rmfont \scriptfont1=\ifont \scriptfont2=\syfont
+  \scriptfont\itfam=\itfont \scriptfont\slfam=\slfont \scriptfont\bffam=\bffont
+  \scriptfont\ttfam=\ttfont \scriptfont\sffam=\sffont
+  %
+  \scriptscriptfont0=\rmfont
+  \scriptscriptfont1=\ifont
+  \scriptscriptfont2=\syfont
+  \scriptscriptfont\itfam=\itfont
+  \scriptscriptfont\slfam=\slfont
+  \scriptscriptfont\bffam=\bffont
+  \scriptscriptfont\ttfam=\ttfont
+  \scriptscriptfont\sffam=\sffont
 }
 
 %
@@ -5969,24 +5981,30 @@
     % Split the last of the double-column material.
     \savemarks
     \balancecolumns
-    %
+  }%
+  \eject % call the \output just set
+  \ifdim\pagetotal=0pt
     % Having called \balancecolumns once, we do not
     % want to call it again.  Therefore, reset \output to its normal
     % definition right away.
     \global\output = {\onepageout{\pagecontents\PAGE}}%
-  }%
-  \eject
-  \endgroup % started in \begindoublecolumns
-  \restoremarks
-  % Leave the double-column material on the current page, no automatic
-  % page break.
-  \box\balancedcolumns
-  %
-  % \pagegoal was set to the doubled \vsize above, since we restarted
-  % the current page.  We're now back to normal single-column
-  % typesetting, so reset \pagegoal to the normal \vsize.
-  \global\vsize = \txipageheight %
-  \pagegoal = \txipageheight %
+    %
+    \endgroup % started in \begindoublecolumns
+    \restoremarks
+    % Leave the double-column material on the current page, no automatic
+    % page break.
+    \box\balancedcolumns
+    %
+    % \pagegoal was set to the doubled \vsize above, since we restarted
+    % the current page.  We're now back to normal single-column
+    % typesetting, so reset \pagegoal to the normal \vsize.
+    \global\vsize = \txipageheight %
+    \pagegoal = \txipageheight %
+  \else
+    % We had some left-over material.  This might happen when \doublecolumnout
+    % is called in \balancecolumns.  Try again.
+    \expandafter\enddoublecolumns
+  \fi
 }
 \newbox\balancedcolumns
 \setbox\balancedcolumns=\vbox{shouldnt see this}%
@@ -6001,6 +6019,7 @@
   \ifdim\dimen@<5\baselineskip
     % Don't split a short final column in two.
     \setbox2=\vbox{}%
+    \global\setbox\balancedcolumns=\vbox{\pagesofar}%
   \else
     \divide\dimen@ by 2 % target to split to
     \dimen at ii = \dimen@
@@ -6016,15 +6035,15 @@
       \repeat
     }%
     % Now the left column is in box 1, and the right column in box 3.
+    %
     % Check whether the left column has come out higher than the page itself.  
     % (Note that we have doubled \vsize for the double columns, so
     % the actual height of the page is 0.5\vsize).
     \ifdim2\ht1>\vsize
-      % Just split the last of the double column material roughly in half.
-      \setbox2=\box0
-      \setbox0 = \vsplit2 to \dimen at ii
-      \setbox0=\vbox to \dimen at ii {\unvbox0\vfill}%
-      \setbox2=\vbox to \dimen at ii {\unvbox2\vfill}%
+      % It appears that we have been called upon to balance too much material.
+      % Output some of it with \doublecolumnout, leaving the rest on the page.
+      \setbox\PAGE=\box0
+      \doublecolumnout
     \else
       % Compare the heights of the two columns.
       \ifdim4\ht1>5\ht3
@@ -6037,10 +6056,10 @@
         \setbox2=\vbox to\ht1{\unvbox3\unskip}%
         \setbox0=\vbox to\ht1{\unvbox1\unskip}%
       \fi
+      \global\setbox\balancedcolumns=\vbox{\pagesofar}%
     \fi
   \fi
   %
-  \global\setbox\balancedcolumns=\vbox{\pagesofar}%
 }
 \catcode`\@ = \other
 
@@ -11425,9 +11444,11 @@
   %
   \dimen0 = #1\relax
   \advance\dimen0 by \voffset
+  \advance\dimen0 by 1in % reference point for DVI is 1 inch from top of page
   %
   \dimen2 = \hsize
   \advance\dimen2 by \normaloffset
+  \advance\dimen2 by 1in % reference point is 1 inch from left edge of page
   %
   \internalpagesizes{#1}{\hsize}%
                     {\voffset}{\normaloffset}%

Modified: branches/stable/source/src/configure
===================================================================
--- branches/stable/source/src/configure	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/configure	2017-12-15 16:53:58 UTC (rev 787)
@@ -785,6 +785,21 @@
 enable_multiplatform
 enable_cxx_runtime_hack
 enable_libtool_hack
+enable_autosp
+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_xpdfopen
 enable_web2c
 with_banner_add
 with_editor
@@ -830,12 +845,85 @@
 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_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_xpdf
 with_system_poppler
+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_potrace
+with_potrace_includes
+with_potrace_libdir
+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
@@ -1506,6 +1594,20 @@
                           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-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-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
@@ -1551,6 +1653,58 @@
   --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-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
   --disable-mktexpk-default   do not run mktexpk if PK font missing
   --disable-mktextfm-default  do not run mktextfm if TFM file missing
@@ -1580,20 +1734,66 @@
 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 (motif/xaw/xaw3d/neXtaw) for xdvi
+                          [default: Motif if available, else 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-xpdf      use installed poppler headers and library instead of
                           xpdf library from TL (requires pkg-config)
   --with-system-poppler   use installed poppler 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-potrace   use installed potrace headers and library
+  --with-potrace-includes=DIR
+                          potrace headers installed in DIR
+  --with-potrace-libdir=DIR
+                          potrace library installed in DIR
+  --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)
   --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
@@ -3979,7 +4179,285 @@
 esac ;;
 esac
 
+## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir
+## configure options and TL libraries required for vlna
+# Check whether --enable-autosp was given.
+if test "${enable_autosp+set}" = set; then :
+  enableval=$enable_autosp;
+fi
+case $enable_autosp in #(
+  yes|no) :
+     ;; #(
+  *) :
 
+   enable_autosp=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-autosp=$enable_autosp'" >&5
+$as_echo "$as_me: Assuming \`--enable-autosp=$enable_autosp'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-autosp=$enable_autosp'"
+    ;;
+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+set}" = set; then :
+  enableval=$enable_devnag;
+fi
+case $enable_devnag in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_devnag=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-devnag=$enable_devnag'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_lacheck;
+fi
+case $enable_lacheck in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_lacheck=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-lacheck=$enable_lacheck'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_m_tx;
+fi
+case $enable_m_tx in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_m_tx=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-m-tx=$enable_m_tx'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_pmx;
+fi
+case $enable_pmx in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_pmx=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-pmx=$enable_pmx'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_ps2eps;
+fi
+case $enable_ps2eps in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ps2eps=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_t1utils;
+fi
+case $enable_t1utils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_t1utils=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-t1utils=$enable_t1utils'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_texdoctk;
+fi
+case $enable_texdoctk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_texdoctk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texdoctk=$enable_texdoctk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_tpic2pdftex;
+fi
+case $enable_tpic2pdftex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_tpic2pdftex=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_vlna;
+fi
+case $enable_vlna in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_vlna=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-vlna=$enable_vlna'" >&5
+$as_echo "$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 the TeX Live subdirectory utils/xindy/
+## configure options and TL libraries required for xindy
+# Check whether --enable-xindy was given.
+if test "${enable_xindy+set}" = set; then :
+  enableval=$enable_xindy;
+fi
+case $enable_xindy in #(
+  yes) :
+    if test "x$cross_compiling" = xyes; then :
+  as_fn_error $? "Unable to cross compile xindy" "$LINENO" 5
+fi ;; #(
+  no) :
+     ;; #(
+  *) :
+    if test "x$cross_compiling" = xyes; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: Cross compiling -> \`--disable-xindy'" >&5
+$as_echo "$as_me: Cross compiling -> \`--disable-xindy'" >&6;}
+            enable_xindy=no
+            ac_configure_args="$ac_configure_args '--disable-xindy'"
+          else
+   enable_xindy=no
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xindy=$enable_xindy'" >&5
+$as_echo "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'"
+   fi ;;
+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+set}" = set; then :
+  enableval=$enable_xindy_rules;
+fi
+# Check whether --enable-xindy-docs was given.
+if test "${enable_xindy_docs+set}" = set; then :
+  enableval=$enable_xindy_docs;
+fi
+
+# Check whether --with-clisp-runtime was given.
+if test "${with_clisp_runtime+set}" = set; 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
+  with_clisp_runtime=system
+fi
+               { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--with-clisp-runtime=$with_clisp_runtime'" >&5
+$as_echo "$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/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+set}" = set; then :
+  enableval=$enable_xpdfopen;
+fi
+if test "x$with_x" = xno; then :
+  case $enable_xpdfopen in #(
+  "") :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: \`--without-x' -> \`--disable-xpdfopen'" >&5
+$as_echo "$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
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xpdfopen=$enable_xpdfopen'" >&5
+$as_echo "$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
 # Check whether --enable-web2c was given.
@@ -4394,7 +4872,1014 @@
 fi
 
 
+## 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+set}" = set; then :
+  enableval=$enable_afm2pl;
+fi
+case $enable_afm2pl in #(
+  yes|no) :
+     ;; #(
+  *) :
 
+   enable_afm2pl=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&5
+$as_echo "$as_me: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-afm2pl=$enable_afm2pl'"
+    ;;
+esac
+
+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+set}" = set; then :
+  enableval=$enable_bibtex_x;
+fi
+case $enable_bibtex_x in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_bibtex_x=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-bibtex-x=$enable_bibtex_x'" >&5
+$as_echo "$as_me: Assuming \`--enable-bibtex-x=$enable_bibtex_x'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-bibtex-x=$enable_bibtex_x'"
+    ;;
+esac
+
+test "x$enable_bibtex_x" = xno || {
+  need_kpathsea=yes
+}
+
+## 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+set}" = set; then :
+  enableval=$enable_bibtex8;
+fi
+
+case $enable_bibtex8 in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_bibtex8=yes ;;
+esac
+# Check whether --enable-bibtexu was given.
+if test "${enable_bibtexu+set}" = set; then :
+  enableval=$enable_bibtexu;
+fi
+
+case $enable_bibtexu in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_bibtexu=yes ;;
+esac
+
+test "x$enable_bibtex_x:$enable_bibtexu" = xyes:yes && need_icu=yes
+
+## 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+set}" = set; then :
+  enableval=$enable_chktex;
+fi
+case $enable_chktex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_chktex=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-chktex=$enable_chktex'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_cjkutils;
+fi
+case $enable_cjkutils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_cjkutils=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_detex;
+fi
+case $enable_detex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_detex=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-detex=$enable_detex'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dtl;
+fi
+case $enable_dtl in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dtl=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dtl=$enable_dtl'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dvi2tty;
+fi
+case $enable_dvi2tty in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvi2tty=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dvidvi;
+fi
+case $enable_dvidvi in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvidvi=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dviljk;
+fi
+case $enable_dviljk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dviljk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dviljk=$enable_dviljk'" >&5
+$as_echo "$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/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+set}" = set; then :
+  enableval=$enable_dvipdfm_x;
+fi
+case $enable_dvipdfm_x in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipdfm_x=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipdfm-x=$enable_dvipdfm_x'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dvipng;
+fi
+case $enable_dvipng in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipng=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipng=$enable_dvipng'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_debug;
+fi
+
+# Check whether --enable-timing was given.
+if test "${enable_timing+set}" = set; then :
+  enableval=$enable_timing;
+fi
+
+
+# Check whether --with-gs was given.
+if test "${with_gs+set}" = set; 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+set}" = set; then :
+  enableval=$enable_dvipos;
+fi
+case $enable_dvipos in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipos=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipos=$enable_dvipos'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dvipsk;
+fi
+case $enable_dvipsk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipsk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dvisvgm;
+fi
+case $enable_dvisvgm in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvisvgm=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvisvgm=$enable_dvisvgm'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_gregorio;
+fi
+case $enable_gregorio in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_gregorio=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-gregorio=$enable_gregorio'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_gsftopk;
+fi
+case $enable_gsftopk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_gsftopk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_lcdf_typetools;
+fi
+case $enable_lcdf_typetools in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_lcdf_typetools=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_cfftot1;
+fi
+# Check whether --enable-mmafm was given.
+if test "${enable_mmafm+set}" = set; then :
+  enableval=$enable_mmafm;
+fi
+# Check whether --enable-mmpfb was given.
+if test "${enable_mmpfb+set}" = set; then :
+  enableval=$enable_mmpfb;
+fi
+# Check whether --enable-otfinfo was given.
+if test "${enable_otfinfo+set}" = set; then :
+  enableval=$enable_otfinfo;
+fi
+# Check whether --enable-otftotfm was given.
+if test "${enable_otftotfm+set}" = set; then :
+  enableval=$enable_otftotfm;
+fi
+# Check whether --enable-t1dotlessj was given.
+if test "${enable_t1dotlessj+set}" = set; then :
+  enableval=$enable_t1dotlessj;
+fi
+# Check whether --enable-t1lint was given.
+if test "${enable_t1lint+set}" = set; then :
+  enableval=$enable_t1lint;
+fi
+# Check whether --enable-t1rawafm was given.
+if test "${enable_t1rawafm+set}" = set; then :
+  enableval=$enable_t1rawafm;
+fi
+# Check whether --enable-t1reencode was given.
+if test "${enable_t1reencode+set}" = set; then :
+  enableval=$enable_t1reencode;
+fi
+# Check whether --enable-t1testpage was given.
+if test "${enable_t1testpage+set}" = set; then :
+  enableval=$enable_t1testpage;
+fi
+# Check whether --enable-ttftotype42 was given.
+if test "${enable_ttftotype42+set}" = set; then :
+  enableval=$enable_ttftotype42;
+fi
+
+# Check whether --enable-cfftot1 was given.
+if test "${enable_cfftot1+set}" = set; then :
+  enableval=$enable_cfftot1;
+fi
+# Check whether --enable-t1dotlessj was given.
+if test "${enable_t1dotlessj+set}" = set; then :
+  enableval=$enable_t1dotlessj;
+fi
+# Check whether --enable-ttftotype42 was given.
+if test "${enable_ttftotype42+set}" = set; then :
+  enableval=$enable_ttftotype42;
+fi
+# Check whether --enable-updmap was given.
+if test "${enable_updmap+set}" = set; 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+set}" = set; then :
+  enableval=$enable_makeindexk;
+fi
+case $enable_makeindexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_makeindexk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_makejvf;
+fi
+case $enable_makejvf in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_makejvf=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-makejvf=$enable_makejvf'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_mendexk;
+fi
+case $enable_mendexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_mendexk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-mendexk=$enable_mendexk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_musixtnt;
+fi
+case $enable_musixtnt in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_musixtnt=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-musixtnt=$enable_musixtnt'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_ps2pk;
+fi
+case $enable_ps2pk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ps2pk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_psutils;
+fi
+case $enable_psutils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_psutils=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-psutils=$enable_psutils'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_seetexk;
+fi
+case $enable_seetexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_seetexk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-seetexk=$enable_seetexk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_tex4htk;
+fi
+case $enable_tex4htk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_tex4htk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_ttf2pk2;
+fi
+case $enable_ttf2pk2 in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ttf2pk2=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_ttfdump;
+fi
+case $enable_ttfdump in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ttfdump=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_upmendex;
+fi
+case $enable_upmendex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_upmendex=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-upmendex=$enable_upmendex'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_xdvik;
+fi
+if test "x$with_x" = xno; then :
+  case $enable_xdvik in #(
+  "") :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: \`--without-x' -> \`--disable-xdvik'" >&5
+$as_echo "$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
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xdvik=$enable_xdvik'" >&5
+$as_echo "$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+set}" = set; 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+set}" = set; then :
+  enableval=$enable_texlive;
+fi
+case $enable_texlive in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_texlive=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texlive=$enable_texlive'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_linked_scripts;
+fi
+
+
+## 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+set}" = set; then :
+  withval=$with_system_harfbuzz;
+fi
+if test "x$with_system_harfbuzz" = x; then
+  if test -f $srcdir/libs/harfbuzz/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`harfbuzz' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`harfbuzz' headers and library from TL tree" >&6;}
+    with_system_harfbuzz=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`harfbuzz' headers and library" >&5
+$as_echo "$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'"
+elif test "x$with_system_harfbuzz" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`harfbuzz' headers and library" >&5
+$as_echo "$as_me: Using installed \`harfbuzz' headers and library" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`harfbuzz' headers and library from TL tree" >&5
+$as_echo "$as_me: Using \`harfbuzz' headers and library from TL tree" >&6;}
+  if test "x$with_system_harfbuzz" != xno; then
+    with_system_harfbuzz=no
+    ac_configure_args="$ac_configure_args '--without-system-harfbuzz'"
+  fi
+fi
+if test "x$with_system_harfbuzz" = xyes; then
+  if test "x$with_system_graphite2" = x; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`graphite2' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`icu' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_icu;
+fi
+if test "x$with_system_icu" = x; then
+  if test -f $srcdir/libs/icu/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`icu' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`icu' headers and library from TL tree" >&6;}
+    with_system_icu=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`icu' headers and library" >&5
+$as_echo "$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'"
+elif test "x$with_system_icu" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`icu' headers and library" >&5
+$as_echo "$as_me: Using installed \`icu' headers and library" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`icu' headers and library from TL tree" >&5
+$as_echo "$as_me: Using \`icu' headers and library from TL tree" >&6;}
+  if test "x$with_system_icu" != xno; then
+    with_system_icu=no
+    ac_configure_args="$ac_configure_args '--without-system-icu'"
+  fi
+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+set}" = set; then :
+  withval=$with_system_teckit;
+fi
+if test "x$with_system_teckit" = x; then
+  if test -f $srcdir/libs/teckit/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`teckit' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`teckit' headers and library from TL tree" >&6;}
+    with_system_teckit=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`teckit' headers and library" >&5
+$as_echo "$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'"
+elif test "x$with_system_teckit" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`teckit' headers and library" >&5
+$as_echo "$as_me: Using installed \`teckit' headers and library" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`teckit' headers and library from TL tree" >&5
+$as_echo "$as_me: Using \`teckit' headers and library from TL tree" >&6;}
+  if test "x$with_system_teckit" != xno; then
+    with_system_teckit=no
+    ac_configure_args="$ac_configure_args '--without-system-teckit'"
+  fi
+fi
+if test "x$with_system_teckit" = xyes; then
+  if test "x$with_system_zlib" = x; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_graphite2;
+fi
+if test "x$with_system_graphite2" = x; then
+  if test -f $srcdir/libs/graphite2/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`graphite2' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`graphite2' headers and library from TL tree" >&6;}
+    with_system_graphite2=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`graphite2' headers and library" >&5
+$as_echo "$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'"
+elif test "x$with_system_graphite2" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`graphite2' headers and library" >&5
+$as_echo "$as_me: Using installed \`graphite2' headers and library" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`graphite2' headers and library from TL tree" >&5
+$as_echo "$as_me: Using \`graphite2' headers and library from TL tree" >&6;}
+  if test "x$with_system_graphite2" != xno; then
+    with_system_graphite2=no
+    ac_configure_args="$ac_configure_args '--without-system-graphite2'"
+  fi
+fi
+
+## 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+set}" = set; then :
+  withval=$with_system_zziplib;
+fi
+if test "x$with_system_zziplib" = x; then
+  if test -f $srcdir/libs/zziplib/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`zziplib' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`zziplib' headers and library from TL tree" >&6;}
+    with_system_zziplib=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`zziplib' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`zziplib' headers and library" >&6;}
+    with_system_zziplib=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-zziplib=$with_system_zziplib'"
+elif test "x$with_system_zziplib" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`zziplib' headers and library" >&5
+$as_echo "$as_me: Using installed \`zziplib' headers and library" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`zziplib' headers and library from TL tree" >&5
+$as_echo "$as_me: Using \`zziplib' headers and library from TL tree" >&6;}
+  if test "x$with_system_zziplib" != xno; then
+    with_system_zziplib=no
+    ac_configure_args="$ac_configure_args '--without-system-zziplib'"
+  fi
+fi
+if test "x$with_system_zziplib" = xyes; then
+  if test "x$with_system_zlib" = x; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
+$as_echo "$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-zziplib' requires \`--with-system-zlib'" "$LINENO" 5
+  fi
+fi
+
+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
 
@@ -4469,6 +5954,321 @@
   need_zlib=yes
 }
 
+## 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+set}" = set; then :
+  withval=$with_system_mpfr;
+fi
+
+# Check whether --with-mpfr-includes was given.
+if test "${with_mpfr_includes+set}" = set; then :
+  withval=$with_mpfr_includes;
+fi
+
+# Check whether --with-mpfr-libdir was given.
+if test "${with_mpfr_libdir+set}" = set; then :
+  withval=$with_mpfr_libdir;
+fi
+if test "x$with_system_mpfr" = x; then
+  if test -f $srcdir/libs/mpfr/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`mpfr' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`mpfr' headers and library from TL tree" >&6;}
+    with_system_mpfr=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`mpfr' headers and library" >&5
+$as_echo "$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'"
+elif test "x$with_system_mpfr" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`mpfr' headers and library" >&5
+$as_echo "$as_me: Using installed \`mpfr' headers and library" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`mpfr' headers and library from TL tree" >&5
+$as_echo "$as_me: Using \`mpfr' headers and library from TL tree" >&6;}
+  if test "x$with_system_mpfr" != xno; then
+    with_system_mpfr=no
+    ac_configure_args="$ac_configure_args '--without-system-mpfr'"
+  fi
+fi
+if test "x$with_system_mpfr" = xyes; then
+  if test "x$with_system_gmp" = x; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`gmp' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_gmp;
+fi
+
+# Check whether --with-gmp-includes was given.
+if test "${with_gmp_includes+set}" = set; then :
+  withval=$with_gmp_includes;
+fi
+
+# Check whether --with-gmp-libdir was given.
+if test "${with_gmp_libdir+set}" = set; then :
+  withval=$with_gmp_libdir;
+fi
+if test "x$with_system_gmp" = x; then
+  if test -f $srcdir/libs/gmp/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`gmp' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`gmp' headers and library from TL tree" >&6;}
+    with_system_gmp=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`gmp' headers and library" >&5
+$as_echo "$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'"
+elif test "x$with_system_gmp" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`gmp' headers and library" >&5
+$as_echo "$as_me: Using installed \`gmp' headers and library" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`gmp' headers and library from TL tree" >&5
+$as_echo "$as_me: Using \`gmp' headers and library from TL tree" >&6;}
+  if test "x$with_system_gmp" != xno; then
+    with_system_gmp=no
+    ac_configure_args="$ac_configure_args '--without-system-gmp'"
+  fi
+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+set}" = set; then :
+  withval=$with_system_cairo;
+fi
+if test "x$with_system_cairo" = x; then
+  if test -f $srcdir/libs/cairo/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`cairo' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`cairo' headers and library from TL tree" >&6;}
+    with_system_cairo=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`cairo' headers and library" >&5
+$as_echo "$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'"
+elif test "x$with_system_cairo" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`cairo' headers and library" >&5
+$as_echo "$as_me: Using installed \`cairo' headers and library" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`cairo' headers and library from TL tree" >&5
+$as_echo "$as_me: Using \`cairo' headers and library from TL tree" >&6;}
+  if test "x$with_system_cairo" != xno; then
+    with_system_cairo=no
+    ac_configure_args="$ac_configure_args '--without-system-cairo'"
+  fi
+fi
+if test "x$with_system_cairo" = xyes; then
+  if test "x$with_system_pixman" = x; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`pixman' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_pixman;
+fi
+if test "x$with_system_pixman" = x; then
+  if test -f $srcdir/libs/pixman/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`pixman' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`pixman' headers and library from TL tree" >&6;}
+    with_system_pixman=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`pixman' headers and library" >&5
+$as_echo "$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'"
+elif test "x$with_system_pixman" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`pixman' headers and library" >&5
+$as_echo "$as_me: Using installed \`pixman' headers and library" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`pixman' headers and library from TL tree" >&5
+$as_echo "$as_me: Using \`pixman' headers and library from TL tree" >&6;}
+  if test "x$with_system_pixman" != xno; then
+    with_system_pixman=no
+    ac_configure_args="$ac_configure_args '--without-system-pixman'"
+  fi
+fi
+
+## libs/potrace/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/potrace/
+## configure options and TL libraries required for potrace
+
+# Check whether --with-system-potrace was given.
+if test "${with_system_potrace+set}" = set; then :
+  withval=$with_system_potrace;
+fi
+
+# Check whether --with-potrace-includes was given.
+if test "${with_potrace_includes+set}" = set; then :
+  withval=$with_potrace_includes;
+fi
+
+# Check whether --with-potrace-libdir was given.
+if test "${with_potrace_libdir+set}" = set; then :
+  withval=$with_potrace_libdir;
+fi
+if test "x$with_system_potrace" = x; then
+  if test -f $srcdir/libs/potrace/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`potrace' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`potrace' headers and library from TL tree" >&6;}
+    with_system_potrace=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`potrace' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`potrace' headers and library" >&6;}
+    with_system_potrace=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-potrace=$with_system_potrace'"
+elif test "x$with_system_potrace" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`potrace' headers and library" >&5
+$as_echo "$as_me: Using installed \`potrace' headers and library" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`potrace' headers and library from TL tree" >&5
+$as_echo "$as_me: Using \`potrace' headers and library from TL tree" >&6;}
+  if test "x$with_system_potrace" != xno; then
+    with_system_potrace=no
+    ac_configure_args="$ac_configure_args '--without-system-potrace'"
+  fi
+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+set}" = set; then :
+  withval=$with_system_gd;
+fi
+
+# Check whether --with-gd-includes was given.
+if test "${with_gd_includes+set}" = set; then :
+  withval=$with_gd_includes;
+fi
+
+# Check whether --with-gd-libdir was given.
+if test "${with_gd_libdir+set}" = set; then :
+  withval=$with_gd_libdir;
+fi
+if test "x$with_system_gd" = x; then
+  if test -f $srcdir/libs/gd/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`gd' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`gd' headers and library from TL tree" >&6;}
+    with_system_gd=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`gd' headers and library" >&5
+$as_echo "$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'"
+elif test "x$with_system_gd" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`gd' headers and library" >&5
+$as_echo "$as_me: Using installed \`gd' headers and library" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`gd' headers and library from TL tree" >&5
+$as_echo "$as_me: Using \`gd' headers and library from TL tree" >&6;}
+  if test "x$with_system_gd" != xno; then
+    with_system_gd=no
+    ac_configure_args="$ac_configure_args '--without-system-gd'"
+  fi
+fi
+if test "x$with_system_gd" = xyes; then
+  if test "x$with_system_libpng" = x; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`libpng' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`freetype2' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_freetype2;
+fi
+if test "x$with_system_freetype2" = x; then
+  if test -f $srcdir/libs/freetype2/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`freetype2' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`freetype2' headers and library from TL tree" >&6;}
+    with_system_freetype2=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`freetype2' headers and library" >&5
+$as_echo "$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'"
+elif test "x$with_system_freetype2" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`freetype2' headers and library" >&5
+$as_echo "$as_me: Using installed \`freetype2' headers and library" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`freetype2' headers and library from TL tree" >&5
+$as_echo "$as_me: Using \`freetype2' headers and library from TL tree" >&6;}
+  if test "x$with_system_freetype2" != xno; then
+    with_system_freetype2=no
+    ac_configure_args="$ac_configure_args '--without-system-freetype2'"
+  fi
+fi
+if test "x$with_system_freetype2" = xyes; then
+  if test "x$with_system_zlib" = x; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
+$as_echo "$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
 
@@ -4513,6 +6313,52 @@
   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+set}" = set; then :
+  withval=$with_system_libpaper;
+fi
+
+# Check whether --with-libpaper-includes was given.
+if test "${with_libpaper_includes+set}" = set; then :
+  withval=$with_libpaper_includes;
+fi
+
+# Check whether --with-libpaper-libdir was given.
+if test "${with_libpaper_libdir+set}" = set; then :
+  withval=$with_libpaper_libdir;
+fi
+if test "x$with_system_libpaper" = x; then
+  if test -f $srcdir/libs/libpaper/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`libpaper' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`libpaper' headers and library from TL tree" >&6;}
+    with_system_libpaper=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`libpaper' headers and library" >&5
+$as_echo "$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'"
+elif test "x$with_system_libpaper" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`libpaper' headers and library" >&5
+$as_echo "$as_me: Using installed \`libpaper' headers and library" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`libpaper' headers and library from TL tree" >&5
+$as_echo "$as_me: Using \`libpaper' headers and library from TL tree" >&6;}
+  if test "x$with_system_libpaper" != xno; then
+    with_system_libpaper=no
+    ac_configure_args="$ac_configure_args '--without-system-libpaper'"
+  fi
+fi
+
+## libs/luajit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/luajit/
+## configure options and TL libraries required for luajit
+
+## libs/lua52/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/lua52/
+## configure options and TL libraries required for lua52
+
 ## libs/zlib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/
 ## configure options and TL libraries required for zlib
 
@@ -4554,6 +6400,50 @@
 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+set}" = set; then :
+  withval=$with_system_ptexenc;
+fi
+if test "x$with_system_ptexenc" = x; then
+  if test -f $srcdir/texk/ptexenc/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`ptexenc' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`ptexenc' headers and library from TL tree" >&6;}
+    with_system_ptexenc=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`ptexenc' headers and library" >&5
+$as_echo "$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'"
+elif test "x$with_system_ptexenc" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`ptexenc' headers and library" >&5
+$as_echo "$as_me: Using installed \`ptexenc' headers and library" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`ptexenc' headers and library from TL tree" >&5
+$as_echo "$as_me: Using \`ptexenc' headers and library from TL tree" >&6;}
+  if test "x$with_system_ptexenc" != xno; then
+    with_system_ptexenc=no
+    ac_configure_args="$ac_configure_args '--without-system-ptexenc'"
+  fi
+fi
+if test "x$with_system_ptexenc" = xyes; then
+  if test "x$with_system_kpathsea" = x; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`kpathsea' headers and library" >&5
+$as_echo "$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
 
@@ -19189,6 +21079,10 @@
 echo 'dbg:_KPSE_RECURSE called: list=texlibs, text=TeX specific libraries, cond=test "x$with_system_Kpse_pkg" != xyes && test "x$need_Kpse_pkg" = xyes, prefix=texk/.' >&5
 MAKE_SUBDIRS=
 CONF_SUBDIRS=
+if test -x $srcdir/texk/ptexenc/configure; then
+  test "x$with_system_ptexenc" != xyes && test "x$need_ptexenc" = xyes && MAKE_SUBDIRS="texk/ptexenc $MAKE_SUBDIRS"
+  CONF_SUBDIRS="texk/ptexenc $CONF_SUBDIRS"
+fi
 if test -x $srcdir/texk/kpathsea/configure; then
   test "x$with_system_kpathsea" != xyes && test "x$need_kpathsea" = xyes && MAKE_SUBDIRS="texk/kpathsea $MAKE_SUBDIRS"
   CONF_SUBDIRS="texk/kpathsea $CONF_SUBDIRS"
@@ -19516,6 +21410,7 @@
   as_fn_error $? "did not find teckit" "$LINENO" 5
 fi
 
+echo 'dbg:_KPSE_ICU_SYSTEM_FLAGS called.' >&5
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}icu-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}icu-config; ac_word=$2
@@ -19607,11 +21502,105 @@
 else
   ICU_CONFIG="$ac_cv_prog_ICU_CONFIG"
 fi
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$PKG_CONFIG"; then
+  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_PKG_CONFIG"; then
+  ac_ct_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_PKG_CONFIG"; then
+  ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+if test -n "$ac_ct_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+$as_echo "$ac_ct_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_PKG_CONFIG" = x; then
+    PKG_CONFIG="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_ct_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+fi
 if $ICU_CONFIG --version >/dev/null 2>&1; then
   ICU_INCLUDES=`$ICU_CONFIG --cppflags`
   ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-system`
+elif $PKG_CONFIG --libs icu-uc icu-io >/dev/null 2>&1; then
+  ICU_INCLUDES=`$PKG_CONFIG --cflags icu-uc icu-io`
+  ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io`
 elif test "x$need_icu:$with_system_icu" = xyes:yes; then
-  as_fn_error $? "did not find icu-config required for system icu libraries" "$LINENO" 5
+  as_fn_error $? "did not find either pkg-config or icu-config; one is required for system icu library support" "$LINENO" 5
 fi
 
 if $PKG_CONFIG harfbuzz-icu; then
@@ -19657,6 +21646,36 @@
 $as_echo "$kpse_res" >&6; }
 fi
 
+## texk/ptexenc/ac/ptexenc.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/
+## basic check of system ptexenc
+if test "x$need_ptexenc:$with_system_ptexenc" = xyes:yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`ptexenc' library" >&5
+$as_echo_n "checking requested system \`ptexenc' library... " >&6; }
+  CPPFLAGS="$PTEXENC_INCLUDES $CPPFLAGS"
+  LIBS="$PTEXENC_LIBS $LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ptexenc/ptexenc.h>
+int
+main ()
+{
+const char *version = ptexenc_version_string;
+set_enc_string("prog", "name");
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  syslib_used=yes kpse_res=ok
+else
+  syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+$as_echo "$kpse_res" >&6; }
+fi
+
 ## libs/zlib/ac/zlib.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/
 ## basic check of system zlib
 if test "x$need_zlib:$with_system_zlib" = xyes:yes; then
@@ -19688,6 +21707,35 @@
 $as_echo "$kpse_res" >&6; }
 fi
 
+## libs/libpaper/ac/libpaper.ac: configure.ac fragment for the TeX Live subdirectory libs/libpaper/
+## basic check of system libpaper
+if test "x$need_libpaper:$with_system_libpaper" = xyes:yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`libpaper' library" >&5
+$as_echo_n "checking requested system \`libpaper' library... " >&6; }
+  CPPFLAGS="$LIBPAPER_INCLUDES $CPPFLAGS"
+  LIBS="$LIBPAPER_LIBS $LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <paper.h>
+int
+main ()
+{
+const char *v = defaultpapername();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  syslib_used=yes kpse_res=ok
+else
+  syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+$as_echo "$kpse_res" >&6; }
+fi
+
 ## libs/libpng/ac/libpng.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/
 ## basic check of system libpng
 if test "x$need_libpng:$with_system_libpng" = xyes:yes; then
@@ -19718,6 +21766,212 @@
 $as_echo "$kpse_res" >&6; }
 fi
 
+## libs/freetype2/ac/freetype2.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/
+## basic check of system freetype2
+if test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`freetype2' library" >&5
+$as_echo_n "checking requested system \`freetype2' library... " >&6; }
+  CPPFLAGS="$FREETYPE2_INCLUDES $CPPFLAGS"
+  LIBS="$FREETYPE2_LIBS $LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ft2build.h>
+#include FT_FREETYPE_H
+int
+main ()
+{
+FT_Library library; FT_Init_FreeType(&library);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  syslib_used=yes kpse_res=ok
+else
+  syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+$as_echo "$kpse_res" >&6; }
+fi
+
+## libs/gd/ac/gd.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
+## basic check of system gd
+if test "x$need_gd:$with_system_gd" = xyes:yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`gd' library" >&5
+$as_echo_n "checking requested system \`gd' library... " >&6; }
+  CPPFLAGS="$GD_INCLUDES $CPPFLAGS"
+  LIBS="$GD_LIBS $LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <gd.h>
+int
+main ()
+{
+gdImageCreate(1, 2);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  syslib_used=yes kpse_res=ok
+else
+  syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+$as_echo "$kpse_res" >&6; }
+fi
+
+## libs/potrace/ac/potrace.ac: configure.ac fragment for the TeX Live subdirectory libs/potrace/
+## basic check of system potrace
+if test "x$need_potrace:$with_system_potrace" = xyes:yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`potrace' library" >&5
+$as_echo_n "checking requested system \`potrace' library... " >&6; }
+  CPPFLAGS="$POTRACE_INCLUDES $CPPFLAGS"
+  LIBS="$POTRACE_LIBS $LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <potracelib.h>
+int
+main ()
+{
+potrace_state_t st;
+const char *version = potrace_version();
+potrace_state_free(&st);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  syslib_used=yes kpse_res=ok
+else
+  syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+$as_echo "$kpse_res" >&6; }
+fi
+
+## libs/pixman/ac/pixman.ac: configure.ac fragment for the TeX Live subdirectory libs/pixman/
+## basic check of system pixman
+if test "x$need_pixman:$with_system_pixman" = xyes:yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`pixman' library" >&5
+$as_echo_n "checking requested system \`pixman' library... " >&6; }
+  CPPFLAGS="$PIXMAN_INCLUDES $CPPFLAGS"
+  LIBS="$PIXMAN_LIBS $LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pixman.h>
+int
+main ()
+{
+const char *s = pixman_version_string();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  syslib_used=yes kpse_res=ok
+else
+  syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+$as_echo "$kpse_res" >&6; }
+fi
+
+## libs/cairo/ac/cairo.ac: configure.ac fragment for the TeX Live subdirectory libs/cairo/
+## basic check of system cairo
+if test "x$need_cairo:$with_system_cairo" = xyes:yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`cairo' library" >&5
+$as_echo_n "checking requested system \`cairo' library... " >&6; }
+  CPPFLAGS="$CAIRO_INCLUDES $CPPFLAGS"
+  LIBS="$CAIRO_LIBS $LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <cairo.h>
+int
+main ()
+{
+const char *s = cairo_version_string();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  syslib_used=yes kpse_res=ok
+else
+  syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+$as_echo "$kpse_res" >&6; }
+fi
+
+## libs/gmp/ac/gmp.ac: configure.ac fragment for the TeX Live subdirectory libs/gmp/
+## basic check of system gmp
+if test "x$need_gmp:$with_system_gmp" = xyes:yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`gmp' library" >&5
+$as_echo_n "checking requested system \`gmp' library... " >&6; }
+  CPPFLAGS="$GMP_INCLUDES $CPPFLAGS"
+  LIBS="$GMP_LIBS $LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <gmp.h>
+int
+main ()
+{
+const char *s = gmp_version;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  syslib_used=yes kpse_res=ok
+else
+  syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+$as_echo "$kpse_res" >&6; }
+fi
+
+## libs/mpfr/ac/mpfr.ac: configure.ac fragment for the TeX Live subdirectory libs/mpfr/
+## basic check of system mpfr
+if test "x$need_mpfr:$with_system_mpfr" = xyes:yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`mpfr' library" >&5
+$as_echo_n "checking requested system \`mpfr' library... " >&6; }
+  CPPFLAGS="$MPFR_INCLUDES $CPPFLAGS"
+  LIBS="$MPFR_LIBS $LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <mpfr.h>
+int
+main ()
+{
+const char *s = mpfr_get_version();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  syslib_used=yes kpse_res=ok
+else
+  syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+$as_echo "$kpse_res" >&6; }
+fi
+
 ## libs/poppler/ac/poppler.ac: configure.ac fragment for the TeX Live subdirectory libs/poppler/
 ## basic check of system poppler
 ac_ext=cpp
@@ -19796,6 +22050,173 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+## libs/zziplib/ac/zziplib.ac: configure.ac fragment for the TeX Live subdirectory libs/zziplib/
+## basic check of system zziplib
+if test "x$need_zziplib:$with_system_zziplib" = xyes:yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`zziplib' library" >&5
+$as_echo_n "checking requested system \`zziplib' library... " >&6; }
+  CPPFLAGS="$ZZIPLIB_INCLUDES $CPPFLAGS"
+  LIBS="$ZZIPLIB_LIBS $LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <zzip/zzip.h>
+int
+main ()
+{
+ZZIP_FILE *z_FILE = zzip_open("file_name", 0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  syslib_used=yes kpse_res=ok
+else
+  syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+$as_echo "$kpse_res" >&6; }
+fi
+
+## libs/graphite2/ac/graphite2.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite2/
+## basic check of system graphite2
+if test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`graphite2' library" >&5
+$as_echo_n "checking requested system \`graphite2' library... " >&6; }
+  CPPFLAGS="$GRAPHITE2_INCLUDES $CPPFLAGS"
+  LIBS="$GRAPHITE2_LIBS $LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <graphite2/Font.h>
+int
+main ()
+{
+int *nMajor, *nMinor, *nBugFix;
+gr_engine_version(nMajor, nMinor, nBugFix);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  syslib_used=yes kpse_res=ok
+else
+  syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+$as_echo "$kpse_res" >&6; }
+fi
+
+## libs/teckit/ac/teckit.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/
+## basic check of system teckit
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test "x$need_teckit:$with_system_teckit" = xyes:yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`teckit' library" >&5
+$as_echo_n "checking requested system \`teckit' library... " >&6; }
+  CPPFLAGS="$TECKIT_INCLUDES $CPPFLAGS"
+  LIBS="$TECKIT_LIBS $LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <teckit/TECkit_Engine.h>
+int
+main ()
+{
+TECkit_Converter converter; TECkit_DisposeConverter(converter);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  syslib_used=yes kpse_res=ok
+else
+  syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+$as_echo "$kpse_res" >&6; }
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+## libs/icu/ac/icu.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/
+## basic check of system icu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test "x$need_icu:$with_system_icu" = xyes:yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`icu' library" >&5
+$as_echo_n "checking requested system \`icu' library... " >&6; }
+  CPPFLAGS="$ICU_INCLUDES $CPPFLAGS"
+  LIBS="$ICU_LIBS $LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <unicode/ustring.h>
+int
+main ()
+{
+UErrorCode code; const UChar *src; UChar *dst;
+u_strToLower(dst, -1, src, -1, NULL, &code);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  syslib_used=yes kpse_res=ok
+else
+  syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+$as_echo "$kpse_res" >&6; }
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+## libs/harfbuzz/ac/harfbuzz.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/
+## basic check of system harfbuzz
+if test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`harfbuzz' library" >&5
+$as_echo_n "checking requested system \`harfbuzz' library... " >&6; }
+  CPPFLAGS="$HARFBUZZ_INCLUDES $CPPFLAGS"
+  LIBS="$HARFBUZZ_LIBS $LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <hb.h>
+int
+main ()
+{
+const char *v = hb_version_string();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  syslib_used=yes kpse_res=ok
+else
+  syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+$as_echo "$kpse_res" >&6; }
+fi
+
 if test "x$syslib_status" = xno; then
   as_fn_error $? "some requested system libraries failed" "$LINENO" 5
 fi

Modified: branches/stable/source/src/doc/Makefile.in
===================================================================
--- branches/stable/source/src/doc/Makefile.in	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/doc/Makefile.in	2017-12-15 16:53:58 UTC (rev 787)
@@ -121,19 +121,99 @@
 	$(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/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/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/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/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/poppler/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/potrace/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/lua52/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/potrace/ac/potrace.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/poppler/ac/poppler.ac \
-	$(top_srcdir)/libs/xpdf/ac/xpdf.ac $(top_srcdir)/configure.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) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)

Modified: branches/stable/source/src/libs/Makefile.in
===================================================================
--- branches/stable/source/src/libs/Makefile.in	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/libs/Makefile.in	2017-12-15 16:53:58 UTC (rev 787)
@@ -89,28 +89,107 @@
 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-poppler-flags.m4 \
+	$(top_srcdir)/../m4/kpse-potrace-flags.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/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/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/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/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/poppler/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/potrace/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/lua52/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

Modified: branches/stable/source/src/libs/README
===================================================================
--- branches/stable/source/src/libs/README	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/libs/README	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,4 +1,4 @@
-$Id: README 45614 2017-10-26 23:41:55Z kakuto $
+$Id: README 46010 2017-12-07 06:44:07Z kakuto $
 Public domain.  Originally created by Karl Berry, 2005.
 
 Libraries we compile for TeX Live.
@@ -9,7 +9,7 @@
 
 See also comments in ../texk/README.
 
-cairo 1.14.10 - checked 20jun17
+cairo 1.14.12 - checked 07dec17
   http://cairographics.org/releases/
 
 freetype2 2.8.1 - checked 16sep17
@@ -24,7 +24,7 @@
 graphite2 1.3.10 - checked 20jun17
   http://sourceforge.net/projects/silgraphite/files/graphite2/
 
-harfbuzz 1.6.3 - checked 26oct17
+harfbuzz 1.7.2 - checked 05dec17
   http://www.freedesktop.org/software/harfbuzz/release/
 
 icu 58.2 - checked 13mar17

Modified: branches/stable/source/src/libs/aclocal.m4
===================================================================
--- branches/stable/source/src/libs/aclocal.m4	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/libs/aclocal.m4	2017-12-15 16:53:58 UTC (rev 787)
@@ -1186,18 +1186,32 @@
 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-poppler-flags.m4])
+m4_include([../m4/kpse-potrace-flags.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])

Modified: branches/stable/source/src/libs/configure
===================================================================
--- branches/stable/source/src/libs/configure	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/libs/configure	2017-12-15 16:53:58 UTC (rev 787)
@@ -694,6 +694,21 @@
 enable_multiplatform
 enable_cxx_runtime_hack
 enable_libtool_hack
+enable_autosp
+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_xpdfopen
 enable_web2c
 with_banner_add
 with_editor
@@ -739,12 +754,85 @@
 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_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_xpdf
 with_system_poppler
+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_potrace
+with_potrace_includes
+with_potrace_libdir
+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
@@ -1393,6 +1481,20 @@
                           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-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-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
@@ -1438,6 +1540,58 @@
   --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-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
   --disable-mktexpk-default   do not run mktexpk if PK font missing
   --disable-mktextfm-default  do not run mktextfm if TFM file missing
@@ -1461,20 +1615,66 @@
 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 (motif/xaw/xaw3d/neXtaw) for xdvi
+                          [default: Motif if available, else 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-xpdf      use installed poppler headers and library instead of
                           xpdf library from TL (requires pkg-config)
   --with-system-poppler   use installed poppler 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-potrace   use installed potrace headers and library
+  --with-potrace-includes=DIR
+                          potrace headers installed in DIR
+  --with-potrace-libdir=DIR
+                          potrace library installed in DIR
+  --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)
 
@@ -3159,7 +3359,285 @@
 esac ;;
 esac
 
+## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir
+## configure options and TL libraries required for vlna
+# Check whether --enable-autosp was given.
+if test "${enable_autosp+set}" = set; then :
+  enableval=$enable_autosp;
+fi
+case $enable_autosp in #(
+  yes|no) :
+     ;; #(
+  *) :
 
+   enable_autosp=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-autosp=$enable_autosp'" >&5
+$as_echo "$as_me: Assuming \`--enable-autosp=$enable_autosp'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-autosp=$enable_autosp'"
+    ;;
+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+set}" = set; then :
+  enableval=$enable_devnag;
+fi
+case $enable_devnag in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_devnag=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-devnag=$enable_devnag'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_lacheck;
+fi
+case $enable_lacheck in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_lacheck=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-lacheck=$enable_lacheck'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_m_tx;
+fi
+case $enable_m_tx in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_m_tx=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-m-tx=$enable_m_tx'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_pmx;
+fi
+case $enable_pmx in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_pmx=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-pmx=$enable_pmx'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_ps2eps;
+fi
+case $enable_ps2eps in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ps2eps=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_t1utils;
+fi
+case $enable_t1utils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_t1utils=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-t1utils=$enable_t1utils'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_texdoctk;
+fi
+case $enable_texdoctk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_texdoctk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texdoctk=$enable_texdoctk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_tpic2pdftex;
+fi
+case $enable_tpic2pdftex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_tpic2pdftex=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_vlna;
+fi
+case $enable_vlna in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_vlna=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-vlna=$enable_vlna'" >&5
+$as_echo "$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 the TeX Live subdirectory utils/xindy/
+## configure options and TL libraries required for xindy
+# Check whether --enable-xindy was given.
+if test "${enable_xindy+set}" = set; then :
+  enableval=$enable_xindy;
+fi
+case $enable_xindy in #(
+  yes) :
+    if test "x$cross_compiling" = xyes; then :
+  as_fn_error $? "Unable to cross compile xindy" "$LINENO" 5
+fi ;; #(
+  no) :
+     ;; #(
+  *) :
+    if test "x$cross_compiling" = xyes; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: Cross compiling -> \`--disable-xindy'" >&5
+$as_echo "$as_me: Cross compiling -> \`--disable-xindy'" >&6;}
+            enable_xindy=no
+            ac_configure_args="$ac_configure_args '--disable-xindy'"
+          else
+   enable_xindy=no
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xindy=$enable_xindy'" >&5
+$as_echo "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'"
+   fi ;;
+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+set}" = set; then :
+  enableval=$enable_xindy_rules;
+fi
+# Check whether --enable-xindy-docs was given.
+if test "${enable_xindy_docs+set}" = set; then :
+  enableval=$enable_xindy_docs;
+fi
+
+# Check whether --with-clisp-runtime was given.
+if test "${with_clisp_runtime+set}" = set; 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
+  with_clisp_runtime=system
+fi
+               { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--with-clisp-runtime=$with_clisp_runtime'" >&5
+$as_echo "$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/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+set}" = set; then :
+  enableval=$enable_xpdfopen;
+fi
+if test "x$with_x" = xno; then :
+  case $enable_xpdfopen in #(
+  "") :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: \`--without-x' -> \`--disable-xpdfopen'" >&5
+$as_echo "$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
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xpdfopen=$enable_xpdfopen'" >&5
+$as_echo "$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
 # Check whether --enable-web2c was given.
@@ -3574,7 +4052,964 @@
 fi
 
 
+## 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+set}" = set; then :
+  enableval=$enable_afm2pl;
+fi
+case $enable_afm2pl in #(
+  yes|no) :
+     ;; #(
+  *) :
 
+   enable_afm2pl=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&5
+$as_echo "$as_me: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-afm2pl=$enable_afm2pl'"
+    ;;
+esac
+
+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+set}" = set; then :
+  enableval=$enable_bibtex_x;
+fi
+case $enable_bibtex_x in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_bibtex_x=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-bibtex-x=$enable_bibtex_x'" >&5
+$as_echo "$as_me: Assuming \`--enable-bibtex-x=$enable_bibtex_x'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-bibtex-x=$enable_bibtex_x'"
+    ;;
+esac
+
+test "x$enable_bibtex_x" = xno || {
+  need_kpathsea=yes
+}
+
+## 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+set}" = set; then :
+  enableval=$enable_bibtex8;
+fi
+
+case $enable_bibtex8 in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_bibtex8=yes ;;
+esac
+# Check whether --enable-bibtexu was given.
+if test "${enable_bibtexu+set}" = set; then :
+  enableval=$enable_bibtexu;
+fi
+
+case $enable_bibtexu in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_bibtexu=yes ;;
+esac
+
+test "x$enable_bibtex_x:$enable_bibtexu" = xyes:yes && need_icu=yes
+
+## 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+set}" = set; then :
+  enableval=$enable_chktex;
+fi
+case $enable_chktex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_chktex=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-chktex=$enable_chktex'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_cjkutils;
+fi
+case $enable_cjkutils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_cjkutils=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_detex;
+fi
+case $enable_detex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_detex=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-detex=$enable_detex'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dtl;
+fi
+case $enable_dtl in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dtl=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dtl=$enable_dtl'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dvi2tty;
+fi
+case $enable_dvi2tty in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvi2tty=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dvidvi;
+fi
+case $enable_dvidvi in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvidvi=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dviljk;
+fi
+case $enable_dviljk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dviljk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dviljk=$enable_dviljk'" >&5
+$as_echo "$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/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+set}" = set; then :
+  enableval=$enable_dvipdfm_x;
+fi
+case $enable_dvipdfm_x in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipdfm_x=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipdfm-x=$enable_dvipdfm_x'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dvipng;
+fi
+case $enable_dvipng in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipng=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipng=$enable_dvipng'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_debug;
+fi
+
+# Check whether --enable-timing was given.
+if test "${enable_timing+set}" = set; then :
+  enableval=$enable_timing;
+fi
+
+
+# Check whether --with-gs was given.
+if test "${with_gs+set}" = set; 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+set}" = set; then :
+  enableval=$enable_dvipos;
+fi
+case $enable_dvipos in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipos=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipos=$enable_dvipos'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dvipsk;
+fi
+case $enable_dvipsk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipsk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dvisvgm;
+fi
+case $enable_dvisvgm in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvisvgm=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvisvgm=$enable_dvisvgm'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_gregorio;
+fi
+case $enable_gregorio in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_gregorio=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-gregorio=$enable_gregorio'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_gsftopk;
+fi
+case $enable_gsftopk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_gsftopk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_lcdf_typetools;
+fi
+case $enable_lcdf_typetools in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_lcdf_typetools=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_cfftot1;
+fi
+# Check whether --enable-mmafm was given.
+if test "${enable_mmafm+set}" = set; then :
+  enableval=$enable_mmafm;
+fi
+# Check whether --enable-mmpfb was given.
+if test "${enable_mmpfb+set}" = set; then :
+  enableval=$enable_mmpfb;
+fi
+# Check whether --enable-otfinfo was given.
+if test "${enable_otfinfo+set}" = set; then :
+  enableval=$enable_otfinfo;
+fi
+# Check whether --enable-otftotfm was given.
+if test "${enable_otftotfm+set}" = set; then :
+  enableval=$enable_otftotfm;
+fi
+# Check whether --enable-t1dotlessj was given.
+if test "${enable_t1dotlessj+set}" = set; then :
+  enableval=$enable_t1dotlessj;
+fi
+# Check whether --enable-t1lint was given.
+if test "${enable_t1lint+set}" = set; then :
+  enableval=$enable_t1lint;
+fi
+# Check whether --enable-t1rawafm was given.
+if test "${enable_t1rawafm+set}" = set; then :
+  enableval=$enable_t1rawafm;
+fi
+# Check whether --enable-t1reencode was given.
+if test "${enable_t1reencode+set}" = set; then :
+  enableval=$enable_t1reencode;
+fi
+# Check whether --enable-t1testpage was given.
+if test "${enable_t1testpage+set}" = set; then :
+  enableval=$enable_t1testpage;
+fi
+# Check whether --enable-ttftotype42 was given.
+if test "${enable_ttftotype42+set}" = set; then :
+  enableval=$enable_ttftotype42;
+fi
+
+# Check whether --enable-cfftot1 was given.
+if test "${enable_cfftot1+set}" = set; then :
+  enableval=$enable_cfftot1;
+fi
+# Check whether --enable-t1dotlessj was given.
+if test "${enable_t1dotlessj+set}" = set; then :
+  enableval=$enable_t1dotlessj;
+fi
+# Check whether --enable-ttftotype42 was given.
+if test "${enable_ttftotype42+set}" = set; then :
+  enableval=$enable_ttftotype42;
+fi
+# Check whether --enable-updmap was given.
+if test "${enable_updmap+set}" = set; 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+set}" = set; then :
+  enableval=$enable_makeindexk;
+fi
+case $enable_makeindexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_makeindexk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_makejvf;
+fi
+case $enable_makejvf in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_makejvf=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-makejvf=$enable_makejvf'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_mendexk;
+fi
+case $enable_mendexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_mendexk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-mendexk=$enable_mendexk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_musixtnt;
+fi
+case $enable_musixtnt in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_musixtnt=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-musixtnt=$enable_musixtnt'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_ps2pk;
+fi
+case $enable_ps2pk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ps2pk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_psutils;
+fi
+case $enable_psutils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_psutils=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-psutils=$enable_psutils'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_seetexk;
+fi
+case $enable_seetexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_seetexk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-seetexk=$enable_seetexk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_tex4htk;
+fi
+case $enable_tex4htk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_tex4htk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_ttf2pk2;
+fi
+case $enable_ttf2pk2 in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ttf2pk2=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_ttfdump;
+fi
+case $enable_ttfdump in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ttfdump=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_upmendex;
+fi
+case $enable_upmendex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_upmendex=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-upmendex=$enable_upmendex'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_xdvik;
+fi
+if test "x$with_x" = xno; then :
+  case $enable_xdvik in #(
+  "") :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: \`--without-x' -> \`--disable-xdvik'" >&5
+$as_echo "$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
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xdvik=$enable_xdvik'" >&5
+$as_echo "$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+set}" = set; 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+set}" = set; then :
+  enableval=$enable_texlive;
+fi
+case $enable_texlive in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_texlive=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texlive=$enable_texlive'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_linked_scripts;
+fi
+
+
+## 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+set}" = set; then :
+  withval=$with_system_harfbuzz;
+fi
+if test "x$with_system_harfbuzz" = x; then
+  if test -f $srcdir/../libs/harfbuzz/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`harfbuzz' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`harfbuzz' headers and library from TL tree" >&6;}
+    with_system_harfbuzz=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`harfbuzz' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`graphite2' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`icu' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_icu;
+fi
+if test "x$with_system_icu" = x; then
+  if test -f $srcdir/../libs/icu/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`icu' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`icu' headers and library from TL tree" >&6;}
+    with_system_icu=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`icu' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_teckit;
+fi
+if test "x$with_system_teckit" = x; then
+  if test -f $srcdir/../libs/teckit/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`teckit' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`teckit' headers and library from TL tree" >&6;}
+    with_system_teckit=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`teckit' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_graphite2;
+fi
+if test "x$with_system_graphite2" = x; then
+  if test -f $srcdir/../libs/graphite2/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`graphite2' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`graphite2' headers and library from TL tree" >&6;}
+    with_system_graphite2=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`graphite2' headers and library" >&5
+$as_echo "$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
+
+# Check whether --with-system-zziplib was given.
+if test "${with_system_zziplib+set}" = set; then :
+  withval=$with_system_zziplib;
+fi
+if test "x$with_system_zziplib" = x; then
+  if test -f $srcdir/../libs/zziplib/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`zziplib' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`zziplib' headers and library from TL tree" >&6;}
+    with_system_zziplib=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`zziplib' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`zziplib' headers and library" >&6;}
+    with_system_zziplib=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-zziplib=$with_system_zziplib'"
+fi
+if test "x$with_system_zziplib" = xyes; then
+  if test "x$with_system_zlib" = x; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
+$as_echo "$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-zziplib' requires \`--with-system-zlib'" "$LINENO" 5
+  fi
+fi
+
+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
 
@@ -3629,6 +5064,251 @@
   need_zlib=yes
 }
 
+## 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+set}" = set; then :
+  withval=$with_system_mpfr;
+fi
+
+# Check whether --with-mpfr-includes was given.
+if test "${with_mpfr_includes+set}" = set; then :
+  withval=$with_mpfr_includes;
+fi
+
+# Check whether --with-mpfr-libdir was given.
+if test "${with_mpfr_libdir+set}" = set; then :
+  withval=$with_mpfr_libdir;
+fi
+if test "x$with_system_mpfr" = x; then
+  if test -f $srcdir/../libs/mpfr/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`mpfr' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`mpfr' headers and library from TL tree" >&6;}
+    with_system_mpfr=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`mpfr' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`gmp' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_gmp;
+fi
+
+# Check whether --with-gmp-includes was given.
+if test "${with_gmp_includes+set}" = set; then :
+  withval=$with_gmp_includes;
+fi
+
+# Check whether --with-gmp-libdir was given.
+if test "${with_gmp_libdir+set}" = set; then :
+  withval=$with_gmp_libdir;
+fi
+if test "x$with_system_gmp" = x; then
+  if test -f $srcdir/../libs/gmp/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`gmp' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`gmp' headers and library from TL tree" >&6;}
+    with_system_gmp=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`gmp' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_cairo;
+fi
+if test "x$with_system_cairo" = x; then
+  if test -f $srcdir/../libs/cairo/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`cairo' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`cairo' headers and library from TL tree" >&6;}
+    with_system_cairo=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`cairo' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`pixman' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_pixman;
+fi
+if test "x$with_system_pixman" = x; then
+  if test -f $srcdir/../libs/pixman/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`pixman' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`pixman' headers and library from TL tree" >&6;}
+    with_system_pixman=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`pixman' headers and library" >&5
+$as_echo "$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/potrace/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/potrace/
+## configure options and TL libraries required for potrace
+
+# Check whether --with-system-potrace was given.
+if test "${with_system_potrace+set}" = set; then :
+  withval=$with_system_potrace;
+fi
+
+# Check whether --with-potrace-includes was given.
+if test "${with_potrace_includes+set}" = set; then :
+  withval=$with_potrace_includes;
+fi
+
+# Check whether --with-potrace-libdir was given.
+if test "${with_potrace_libdir+set}" = set; then :
+  withval=$with_potrace_libdir;
+fi
+if test "x$with_system_potrace" = x; then
+  if test -f $srcdir/../libs/potrace/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`potrace' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`potrace' headers and library from TL tree" >&6;}
+    with_system_potrace=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`potrace' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`potrace' headers and library" >&6;}
+    with_system_potrace=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-potrace=$with_system_potrace'"
+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+set}" = set; then :
+  withval=$with_system_gd;
+fi
+
+# Check whether --with-gd-includes was given.
+if test "${with_gd_includes+set}" = set; then :
+  withval=$with_gd_includes;
+fi
+
+# Check whether --with-gd-libdir was given.
+if test "${with_gd_libdir+set}" = set; then :
+  withval=$with_gd_libdir;
+fi
+if test "x$with_system_gd" = x; then
+  if test -f $srcdir/../libs/gd/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`gd' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`gd' headers and library from TL tree" >&6;}
+    with_system_gd=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`gd' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`libpng' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`freetype2' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_freetype2;
+fi
+if test "x$with_system_freetype2" = x; then
+  if test -f $srcdir/../libs/freetype2/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`freetype2' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`freetype2' headers and library from TL tree" >&6;}
+    with_system_freetype2=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`freetype2' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
+$as_echo "$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
 
@@ -3663,6 +5343,42 @@
   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+set}" = set; then :
+  withval=$with_system_libpaper;
+fi
+
+# Check whether --with-libpaper-includes was given.
+if test "${with_libpaper_includes+set}" = set; then :
+  withval=$with_libpaper_includes;
+fi
+
+# Check whether --with-libpaper-libdir was given.
+if test "${with_libpaper_libdir+set}" = set; then :
+  withval=$with_libpaper_libdir;
+fi
+if test "x$with_system_libpaper" = x; then
+  if test -f $srcdir/../libs/libpaper/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`libpaper' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`libpaper' headers and library from TL tree" >&6;}
+    with_system_libpaper=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`libpaper' headers and library" >&5
+$as_echo "$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
+
+## libs/lua52/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/lua52/
+## configure options and TL libraries required for lua52
+
 ## libs/zlib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/
 ## configure options and TL libraries required for zlib
 
@@ -3694,6 +5410,40 @@
 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+set}" = set; then :
+  withval=$with_system_ptexenc;
+fi
+if test "x$with_system_ptexenc" = x; then
+  if test -f $srcdir/../texk/ptexenc/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`ptexenc' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`ptexenc' headers and library from TL tree" >&6;}
+    with_system_ptexenc=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`ptexenc' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`kpathsea' headers and library" >&5
+$as_echo "$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
 
@@ -4647,6 +6397,26 @@
 echo 'dbg:_KPSE_RECURSE called: list=libs, text=generic libraries, cond=test "x$with_system_Kpse_pkg" != xyes && test "x$need_Kpse_pkg" = xyes, prefix=.' >&5
 MAKE_SUBDIRS=
 CONF_SUBDIRS=
+if test -x $srcdir/harfbuzz/configure; then
+  test "x$with_system_harfbuzz" != xyes && test "x$need_harfbuzz" = xyes && MAKE_SUBDIRS="harfbuzz $MAKE_SUBDIRS"
+  CONF_SUBDIRS="harfbuzz $CONF_SUBDIRS"
+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"
+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"
+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"
+fi
+if test -x $srcdir/zziplib/configure; then
+  test "x$with_system_zziplib" != xyes && test "x$need_zziplib" = xyes && MAKE_SUBDIRS="zziplib $MAKE_SUBDIRS"
+  CONF_SUBDIRS="zziplib $CONF_SUBDIRS"
+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"
@@ -4655,10 +6425,50 @@
   test "x$with_system_poppler" != xyes && test "x$need_poppler" = xyes && MAKE_SUBDIRS="poppler $MAKE_SUBDIRS"
   CONF_SUBDIRS="poppler $CONF_SUBDIRS"
 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"
+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"
+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"
+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"
+fi
+if test -x $srcdir/potrace/configure; then
+  test "x$with_system_potrace" != xyes && test "x$need_potrace" = xyes && MAKE_SUBDIRS="potrace $MAKE_SUBDIRS"
+  CONF_SUBDIRS="potrace $CONF_SUBDIRS"
+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"
+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"
+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"
 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"
+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"
+fi
+if test -x $srcdir/lua52/configure; then
+  test "x$with_system_lua52" != xyes && test "x$need_lua52" = xyes && MAKE_SUBDIRS="lua52 $MAKE_SUBDIRS"
+  CONF_SUBDIRS="lua52 $CONF_SUBDIRS"
+fi
 if test -x $srcdir/zlib/configure; then
   test "x$with_system_zlib" != xyes && test "x$need_zlib" = xyes && MAKE_SUBDIRS="zlib $MAKE_SUBDIRS"
   CONF_SUBDIRS="zlib $CONF_SUBDIRS"

Modified: branches/stable/source/src/libs/libpng/ChangeLog
===================================================================
--- branches/stable/source/src/libs/libpng/ChangeLog	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/libs/libpng/ChangeLog	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,3 +1,12 @@
+2017-12-02  Karl Berry  <karl at freefriends.org>
+
+	Import ARM support from upstream to TL configure.
+	* Makefile.am (nodist_libpng_a_SOURCES): add arm/*.[cS] files
+	per upstream Makefile.am.
+	* configure.ac (AM_PROG_AS),
+	(AC_ARG_ENABLE([arm-neon]): add.
+	Report from Johannes Hielscher, tlbuild mail 1 Nov 2017 02:39:55.
+
 2017-09-29 Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	Import libpng-1.6.34.

Modified: branches/stable/source/src/libs/libpng/Makefile.am
===================================================================
--- branches/stable/source/src/libs/libpng/Makefile.am	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/libs/libpng/Makefile.am	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 43617 2017-03-27 18:00:45Z karl $
+## $Id: Makefile.am 45971 2017-12-02 23:51:48Z karl $
 ## Proxy Makefile.am to build libpng for TeX Live.
 ##
 ##   Copyright 2016-2017 Karl Berry <tex-live at tug.org>
@@ -28,21 +28,26 @@
 
 nodist_libpng_a_SOURCES = \
 	@LIBPNG_TREE@/png.c \
-	@LIBPNG_TREE@/pngset.c \
+	@LIBPNG_TREE@/pngerror.c \
 	@LIBPNG_TREE@/pngget.c \
+	@LIBPNG_TREE@/pngmem.c \
+	@LIBPNG_TREE@/pngpread.c \
+	@LIBPNG_TREE@/pngread.c \
+	@LIBPNG_TREE@/pngrio.c \
+	@LIBPNG_TREE@/pngrtran.c \
 	@LIBPNG_TREE@/pngrutil.c \
+	@LIBPNG_TREE@/pngset.c \
 	@LIBPNG_TREE@/pngtrans.c \
-	@LIBPNG_TREE@/pngwutil.c \
-	@LIBPNG_TREE@/pngread.c \
-	@LIBPNG_TREE@/pngrio.c \
 	@LIBPNG_TREE@/pngwio.c \
 	@LIBPNG_TREE@/pngwrite.c \
-	@LIBPNG_TREE@/pngrtran.c \
 	@LIBPNG_TREE@/pngwtran.c \
-	@LIBPNG_TREE@/pngmem.c \
-	@LIBPNG_TREE@/pngerror.c \
-	@LIBPNG_TREE@/pngpread.c
+	@LIBPNG_TREE@/pngwutil.c
 
+if PNG_ARM_NEON
+nodist_libpng_a_SOURCES += @LIBPNG_TREE@/arm/arm_init.c\
+	@LIBPNG_TREE@/arm/filter_neon.S @LIBPNG_TREE@/arm/filter_neon_intrinsics.c
+endif
+
 $(libpng_a_OBJECTS): config.force
 
 ## Tests

Modified: branches/stable/source/src/libs/libpng/Makefile.in
===================================================================
--- branches/stable/source/src/libs/libpng/Makefile.in	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/libs/libpng/Makefile.in	2017-12-15 16:53:58 UTC (rev 787)
@@ -86,6 +86,9 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+ at PNG_ARM_NEON_TRUE@am__append_1 = @LIBPNG_TREE@/arm/arm_init.c\
+ at PNG_ARM_NEON_TRUE@	@LIBPNG_TREE@/arm/filter_neon.S @LIBPNG_TREE@/arm/filter_neon_intrinsics.c
+
 @build_TRUE at check_PROGRAMS = pngtest$(EXEEXT)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -115,19 +118,23 @@
 libpng_a_AR = $(AR) $(ARFLAGS)
 libpng_a_LIBADD =
 am__dirstamp = $(am__leading_dot)dirstamp
+ at PNG_ARM_NEON_TRUE@am__objects_1 =  \
+ at PNG_ARM_NEON_TRUE@	@LIBPNG_TREE@/arm/arm_init.$(OBJEXT) \
+ at PNG_ARM_NEON_TRUE@	@LIBPNG_TREE@/arm/filter_neon.$(OBJEXT) \
+ at PNG_ARM_NEON_TRUE@	@LIBPNG_TREE@/arm/filter_neon_intrinsics.$(OBJEXT)
 nodist_libpng_a_OBJECTS = @LIBPNG_TREE@/png.$(OBJEXT) \
-	@LIBPNG_TREE@/pngset.$(OBJEXT) @LIBPNG_TREE@/pngget.$(OBJEXT) \
+	@LIBPNG_TREE@/pngerror.$(OBJEXT) \
+	@LIBPNG_TREE@/pngget.$(OBJEXT) @LIBPNG_TREE@/pngmem.$(OBJEXT) \
+	@LIBPNG_TREE@/pngpread.$(OBJEXT) \
+	@LIBPNG_TREE@/pngread.$(OBJEXT) @LIBPNG_TREE@/pngrio.$(OBJEXT) \
+	@LIBPNG_TREE@/pngrtran.$(OBJEXT) \
 	@LIBPNG_TREE@/pngrutil.$(OBJEXT) \
+	@LIBPNG_TREE@/pngset.$(OBJEXT) \
 	@LIBPNG_TREE@/pngtrans.$(OBJEXT) \
-	@LIBPNG_TREE@/pngwutil.$(OBJEXT) \
-	@LIBPNG_TREE@/pngread.$(OBJEXT) @LIBPNG_TREE@/pngrio.$(OBJEXT) \
 	@LIBPNG_TREE@/pngwio.$(OBJEXT) \
 	@LIBPNG_TREE@/pngwrite.$(OBJEXT) \
-	@LIBPNG_TREE@/pngrtran.$(OBJEXT) \
 	@LIBPNG_TREE@/pngwtran.$(OBJEXT) \
-	@LIBPNG_TREE@/pngmem.$(OBJEXT) \
-	@LIBPNG_TREE@/pngerror.$(OBJEXT) \
-	@LIBPNG_TREE@/pngpread.$(OBJEXT)
+	@LIBPNG_TREE@/pngwutil.$(OBJEXT) $(am__objects_1)
 libpng_a_OBJECTS = $(nodist_libpng_a_OBJECTS)
 nodist_pngtest_OBJECTS = @LIBPNG_TREE@/pngtest.$(OBJEXT)
 pngtest_OBJECTS = $(nodist_pngtest_OBJECTS)
@@ -150,6 +157,12 @@
 depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
+CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS)
+AM_V_CPPAS = $(am__v_CPPAS_ at AM_V@)
+am__v_CPPAS_ = $(am__v_CPPAS_ at AM_DEFAULT_V@)
+am__v_CPPAS_0 = @echo "  CPPAS   " $@;
+am__v_CPPAS_1 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_ at AM_V@)
@@ -472,6 +485,9 @@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
@@ -575,23 +591,14 @@
 
 AM_CFLAGS = $(VISIBILITY_CFLAGS) $(WARNING_CFLAGS)
 noinst_LIBRARIES = libpng.a
-nodist_libpng_a_SOURCES = \
-	@LIBPNG_TREE@/png.c \
-	@LIBPNG_TREE@/pngset.c \
-	@LIBPNG_TREE@/pngget.c \
-	@LIBPNG_TREE@/pngrutil.c \
-	@LIBPNG_TREE@/pngtrans.c \
-	@LIBPNG_TREE@/pngwutil.c \
-	@LIBPNG_TREE@/pngread.c \
-	@LIBPNG_TREE@/pngrio.c \
-	@LIBPNG_TREE@/pngwio.c \
-	@LIBPNG_TREE@/pngwrite.c \
-	@LIBPNG_TREE@/pngrtran.c \
-	@LIBPNG_TREE@/pngwtran.c \
-	@LIBPNG_TREE@/pngmem.c \
-	@LIBPNG_TREE@/pngerror.c \
-	@LIBPNG_TREE@/pngpread.c
-
+nodist_libpng_a_SOURCES = @LIBPNG_TREE@/png.c @LIBPNG_TREE@/pngerror.c \
+	@LIBPNG_TREE@/pngget.c @LIBPNG_TREE@/pngmem.c \
+	@LIBPNG_TREE@/pngpread.c @LIBPNG_TREE@/pngread.c \
+	@LIBPNG_TREE@/pngrio.c @LIBPNG_TREE@/pngrtran.c \
+	@LIBPNG_TREE@/pngrutil.c @LIBPNG_TREE@/pngset.c \
+	@LIBPNG_TREE@/pngtrans.c @LIBPNG_TREE@/pngwio.c \
+	@LIBPNG_TREE@/pngwrite.c @LIBPNG_TREE@/pngwtran.c \
+	@LIBPNG_TREE@/pngwutil.c $(am__append_1)
 AM_TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE); export LIBPNG_TREE;
 @build_TRUE at TESTS = libpng.test
 @build_TRUE at dist_check_SCRIPTS = libpng.test
@@ -610,7 +617,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs
+.SUFFIXES: .S .c .log .o .obj .test .test$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@@ -671,34 +678,49 @@
 	@: > @LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
 @LIBPNG_TREE@/png.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
 	@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
- at LIBPNG_TREE@/pngset.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
+ at LIBPNG_TREE@/pngerror.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
 	@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
 @LIBPNG_TREE@/pngget.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
 	@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
- at LIBPNG_TREE@/pngrutil.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
+ at LIBPNG_TREE@/pngmem.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
 	@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
- at LIBPNG_TREE@/pngtrans.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
+ at LIBPNG_TREE@/pngpread.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
 	@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
- at LIBPNG_TREE@/pngwutil.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
-	@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
 @LIBPNG_TREE@/pngread.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
 	@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
 @LIBPNG_TREE@/pngrio.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
 	@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
+ at LIBPNG_TREE@/pngrtran.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
+	@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
+ at LIBPNG_TREE@/pngrutil.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
+	@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
+ at LIBPNG_TREE@/pngset.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
+	@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
+ at LIBPNG_TREE@/pngtrans.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
+	@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
 @LIBPNG_TREE@/pngwio.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
 	@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
 @LIBPNG_TREE@/pngwrite.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
 	@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
- at LIBPNG_TREE@/pngrtran.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
-	@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
 @LIBPNG_TREE@/pngwtran.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
 	@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
- at LIBPNG_TREE@/pngmem.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
+ at LIBPNG_TREE@/pngwutil.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
 	@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
- at LIBPNG_TREE@/pngerror.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
-	@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
- at LIBPNG_TREE@/pngpread.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
-	@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
+ at LIBPNG_TREE@/arm/$(am__dirstamp):
+	@$(MKDIR_P) @LIBPNG_TREE@/arm
+	@: > @LIBPNG_TREE@/arm/$(am__dirstamp)
+ at LIBPNG_TREE@/arm/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) @LIBPNG_TREE@/arm/$(DEPDIR)
+	@: > @LIBPNG_TREE@/arm/$(DEPDIR)/$(am__dirstamp)
+ at LIBPNG_TREE@/arm/arm_init.$(OBJEXT):  \
+	@LIBPNG_TREE@/arm/$(am__dirstamp) \
+	@LIBPNG_TREE@/arm/$(DEPDIR)/$(am__dirstamp)
+ at LIBPNG_TREE@/arm/filter_neon.$(OBJEXT):  \
+	@LIBPNG_TREE@/arm/$(am__dirstamp) \
+	@LIBPNG_TREE@/arm/$(DEPDIR)/$(am__dirstamp)
+ at LIBPNG_TREE@/arm/filter_neon_intrinsics.$(OBJEXT):  \
+	@LIBPNG_TREE@/arm/$(am__dirstamp) \
+	@LIBPNG_TREE@/arm/$(DEPDIR)/$(am__dirstamp)
 
 libpng.a: $(libpng_a_OBJECTS) $(libpng_a_DEPENDENCIES) $(EXTRA_libpng_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libpng.a
@@ -717,6 +739,7 @@
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 	-rm -f @LIBPNG_TREE@/*.$(OBJEXT)
+	-rm -f @LIBPNG_TREE@/arm/*.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -737,7 +760,26 @@
 @AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngwrite.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngwtran.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngwutil.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/arm/$(DEPDIR)/arm_init.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon_intrinsics.Po at am__quote@
 
+.S.o:
+ at am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCCAS_TRUE@	$(CPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCCAS_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCCAS_FALSE@	$(AM_V_CPPAS at am__nodep@)$(CPPASCOMPILE) -c -o $@ $<
+
+.S.obj:
+ at am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCCAS_TRUE@	$(CPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCCAS_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCCAS_FALSE@	$(AM_V_CPPAS at am__nodep@)$(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -1247,6 +1289,8 @@
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 	-rm -f @LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
 	-rm -f @LIBPNG_TREE@/$(am__dirstamp)
+	-rm -f @LIBPNG_TREE@/arm/$(DEPDIR)/$(am__dirstamp)
+	-rm -f @LIBPNG_TREE@/arm/$(am__dirstamp)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -1259,7 +1303,7 @@
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf @LIBPNG_TREE@/$(DEPDIR)
+	-rm -rf @LIBPNG_TREE@/$(DEPDIR) @LIBPNG_TREE@/arm/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-tags
@@ -1307,7 +1351,7 @@
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf @LIBPNG_TREE@/$(DEPDIR)
+	-rm -rf @LIBPNG_TREE@/$(DEPDIR) @LIBPNG_TREE@/arm/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 

Modified: branches/stable/source/src/libs/libpng/aclocal.m4
===================================================================
--- branches/stable/source/src/libs/libpng/aclocal.m4	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/libs/libpng/aclocal.m4	2017-12-15 16:53:58 UTC (rev 787)
@@ -56,6 +56,26 @@
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
+# Figure out how to run the assembler.                      -*- Autoconf -*-
+
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_AS
+# ----------
+AC_DEFUN([AM_PROG_AS],
+[# By default we simply use the C compiler to build assembly code.
+AC_REQUIRE([AC_PROG_CC])
+test "${CCAS+set}" = set || CCAS=$CC
+test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
+AC_ARG_VAR([CCAS],      [assembler compiler command (defaults to CC)])
+AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
+_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
+])
+
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
 # Copyright (C) 2001-2017 Free Software Foundation, Inc.

Modified: branches/stable/source/src/libs/libpng/config.h.in
===================================================================
--- branches/stable/source/src/libs/libpng/config.h.in	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/libs/libpng/config.h.in	2017-12-15 16:53:58 UTC (rev 787)
@@ -54,6 +54,15 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Turn on ARM Neon optimizations at run-time */
+#undef PNG_ARM_NEON_API_SUPPORTED
+
+/* Check for ARM Neon support at run-time */
+#undef PNG_ARM_NEON_CHECK_SUPPORTED
+
+/* Enable ARM Neon optimizations */
+#undef PNG_ARM_NEON_OPT
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 

Modified: branches/stable/source/src/libs/libpng/configure
===================================================================
--- branches/stable/source/src/libs/libpng/configure	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/libs/libpng/configure	2017-12-15 16:53:58 UTC (rev 787)
@@ -625,6 +625,8 @@
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
+PNG_ARM_NEON_FALSE
+PNG_ARM_NEON_TRUE
 LIBPNG_DEFINES
 LIBPNG_TREE
 build_FALSE
@@ -641,6 +643,11 @@
 VISIBILITY_CFLAGS
 LN_S
 RANLIB
+am__fastdepCCAS_FALSE
+am__fastdepCCAS_TRUE
+CCASDEPMODE
+CCASFLAGS
+CCAS
 WARNING_CFLAGS
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
@@ -737,6 +744,7 @@
 with_system_zlib
 with_zlib_includes
 with_zlib_libdir
+enable_arm_neon
 '
       ac_precious_vars='build_alias
 host_alias
@@ -746,6 +754,8 @@
 LDFLAGS
 LIBS
 CPPFLAGS
+CCAS
+CCASFLAGS
 CPP'
 
 
@@ -1374,6 +1384,13 @@
   --enable-compiler-warnings=[no|min|yes|max|all]
                           Turn on compiler warnings [default: yes if
                           maintainer-mode, min otherwise]
+  --enable-arm-neon     Enable ARM NEON optimizations: =no/off, check, api,
+                          yes/on: no/off: disable the optimizations; check:
+                          use internal checking code (deprecated and poorly
+                          supported); api: disable by default, enable by a
+                          call to png_set_option; yes/on: turn on
+                          unconditionally. If not specified: determined by the
+                          compiler.
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1391,6 +1408,8 @@
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
+  CCAS        assembler compiler command (defaults to CC)
+  CCASFLAGS   assembler compiler flags (defaults to CFLAGS)
   CPP         C preprocessor
 
 Use these variables to override the choices made by `configure' or to help
@@ -4732,6 +4751,139 @@
 fi
 
 
+# By default we simply use the C compiler to build assembly code.
+
+test "${CCAS+set}" = set || CCAS=$CC
+test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
+
+
+
+depcc="$CCAS"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CCAS_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CCAS_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CCAS_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CCAS_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; }
+CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then
+  am__fastdepCCAS_TRUE=
+  am__fastdepCCAS_FALSE='#'
+else
+  am__fastdepCCAS_TRUE='#'
+  am__fastdepCCAS_FALSE=
+fi
+
+
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -4836,6 +4988,7 @@
 fi
 
 
+echo 'dbg:_KPSE_COMPILER_VISIBILITY called.' >&5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for C to hide external symbols" >&5
 $as_echo_n "checking CFLAGS for C to hide external symbols... " >&6; }
 if ${kpse_cv_visibility_cflags+:} false; then :
@@ -4863,6 +5016,7 @@
 fi
 rm -f core conftest.err conftest.$ac_objext
 done
+CFLAGS=$kpse_save_flags
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4873,7 +5027,6 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_visibility_cflags" >&5
 $as_echo "$kpse_cv_visibility_cflags" >&6; }
-CFLAGS=$kpse_save_flags
 case $kpse_cv_visibility_cflags in #(
   unknown) :
      ;; #(
@@ -4889,6 +5042,7 @@
 ac_config_headers="$ac_config_headers config.h"
 
 
+if false; then
 # For GCC 5 the default mode for C is -std=gnu11 instead of -std=gnu89
 # In pngpriv.h we request just the POSIX 1003.1 and C89 APIs by defining _POSIX_SOURCE to 1
 # This is incompatible with the new default mode, so we test for that and force the
@@ -4921,6 +5075,7 @@
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
 
 # Checks for header files.
 ac_ext=c
@@ -5813,6 +5968,63 @@
 LIBPNG_DEFINES='-DPNG_CONFIGURE_LIBPNG -DPNG_NO_MMX_CODE'
 
 
+# emacs-page
+# ARM
+# ===
+#
+# ARM NEON (SIMD) support.
+
+# Check whether --enable-arm-neon was given.
+if test "${enable_arm_neon+set}" = set; then :
+  enableval=$enable_arm_neon; case "$enableval" in
+      no|off)
+         # disable the default enabling on __ARM_NEON__ systems:
+
+$as_echo "#define PNG_ARM_NEON_OPT 0" >>confdefs.h
+
+         # Prevent inclusion of the assembler files below:
+         enable_arm_neon=no;;
+      check)
+
+$as_echo "#define PNG_ARM_NEON_CHECK_SUPPORTED /**/" >>confdefs.h
+;;
+      api)
+
+$as_echo "#define PNG_ARM_NEON_API_SUPPORTED /**/" >>confdefs.h
+;;
+      yes|on)
+
+$as_echo "#define PNG_ARM_NEON_OPT 2" >>confdefs.h
+
+         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --enable-arm-neon: please specify 'check' or 'api', if
+            you want the optimizations unconditionally pass -mfpu=neon
+            to the compiler." >&5
+$as_echo "$as_me: WARNING: --enable-arm-neon: please specify 'check' or 'api', if
+            you want the optimizations unconditionally pass -mfpu=neon
+            to the compiler." >&2;};;
+      *)
+         as_fn_error $? "--enable-arm-neon=${enable_arm_neon}: invalid value" "$LINENO" 5
+   esac
+fi
+
+
+# Add ARM specific files to all builds where the host_cpu is arm ('arm*') or
+# where ARM optimizations were explicitly requested (this allows a fallback if a
+# future host CPU does not match 'arm*')
+
+ if test "$enable_arm_neon" != 'no' &&
+    case "$host_cpu" in
+      arm*|aarch64*) :;;
+      *)    test "$enable_arm_neon" != '';;
+    esac; then
+  PNG_ARM_NEON_TRUE=
+  PNG_ARM_NEON_FALSE='#'
+else
+  PNG_ARM_NEON_TRUE='#'
+  PNG_ARM_NEON_FALSE=
+fi
+
+
 ac_config_files="$ac_config_files Makefile include/Makefile"
 
 
@@ -5957,10 +6169,18 @@
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${build_TRUE}" && test -z "${build_FALSE}"; then
   as_fn_error $? "conditional \"build\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${PNG_ARM_NEON_TRUE}" && test -z "${PNG_ARM_NEON_FALSE}"; then
+  as_fn_error $? "conditional \"PNG_ARM_NEON\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0

Modified: branches/stable/source/src/libs/libpng/configure.ac
===================================================================
--- branches/stable/source/src/libs/libpng/configure.ac	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/libs/libpng/configure.ac	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,7 +1,8 @@
+dnl $Id: configure.ac 45971 2017-12-02 23:51:48Z karl $
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2016 Karl Berry <tex-live at tug.org>
-dnl   Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
+dnl   Copyright 2016-2017 Karl Berry <tex-live at tug.org>
+dnl   Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -17,6 +18,7 @@
 KPSE_BASIC([libpng])
 
 AC_PROG_CC
+AM_PROG_AS
 AC_PROG_RANLIB
 AC_PROG_LN_S
 
@@ -24,6 +26,7 @@
 
 AC_CONFIG_HEADERS([config.h])
 
+if false; then
 # For GCC 5 the default mode for C is -std=gnu11 instead of -std=gnu89
 # In pngpriv.h we request just the POSIX 1003.1 and C89 APIs by defining _POSIX_SOURCE to 1
 # This is incompatible with the new default mode, so we test for that and force the 
@@ -37,6 +40,7 @@
 AC_MSG_RESULT(yes)
 CFLAGS="$CFLAGS -std=c89"
 ])
+fi
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -70,6 +74,53 @@
 
 AC_SUBST([LIBPNG_DEFINES], ['-DPNG_CONFIGURE_LIBPNG -DPNG_NO_MMX_CODE'])
 
+# emacs-page
+# ARM
+# ===
+#
+# ARM NEON (SIMD) support.
+
+AC_ARG_ENABLE([arm-neon],
+   AS_HELP_STRING([[[--enable-arm-neon]]],
+      [Enable ARM NEON optimizations: =no/off, check, api, yes/on:]
+      [no/off: disable the optimizations; check: use internal checking code]
+      [(deprecated and poorly supported); api: disable by default, enable by]
+      [a call to png_set_option; yes/on: turn on unconditionally.]
+      [If not specified: determined by the compiler.]),
+   [case "$enableval" in
+      no|off)
+         # disable the default enabling on __ARM_NEON__ systems:
+         AC_DEFINE([PNG_ARM_NEON_OPT], [0],
+                   [Disable ARM Neon optimizations])
+         # Prevent inclusion of the assembler files below:
+         enable_arm_neon=no;;
+      check)
+         AC_DEFINE([PNG_ARM_NEON_CHECK_SUPPORTED], [],
+                   [Check for ARM Neon support at run-time]);;
+      api)
+         AC_DEFINE([PNG_ARM_NEON_API_SUPPORTED], [],
+                   [Turn on ARM Neon optimizations at run-time]);;
+      yes|on)
+         AC_DEFINE([PNG_ARM_NEON_OPT], [2],
+                   [Enable ARM Neon optimizations])
+         AC_MSG_WARN([--enable-arm-neon: please specify 'check' or 'api', if]
+            [you want the optimizations unconditionally pass -mfpu=neon]
+            [to the compiler.]);;
+      *)
+         AC_MSG_ERROR([--enable-arm-neon=${enable_arm_neon}: invalid value])
+   esac])
+
+# Add ARM specific files to all builds where the host_cpu is arm ('arm*') or
+# where ARM optimizations were explicitly requested (this allows a fallback if a
+# future host CPU does not match 'arm*')
+
+AM_CONDITIONAL([PNG_ARM_NEON],
+   [test "$enable_arm_neon" != 'no' &&
+    case "$host_cpu" in
+      arm*|aarch64*) :;;
+      *)    test "$enable_arm_neon" != '';;
+    esac])
+
 AC_CONFIG_FILES([Makefile include/Makefile])
 
 AC_OUTPUT

Modified: branches/stable/source/src/libs/libpng/include/Makefile.in
===================================================================
--- branches/stable/source/src/libs/libpng/include/Makefile.in	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/libs/libpng/include/Makefile.in	2017-12-15 16:53:58 UTC (rev 787)
@@ -130,6 +130,9 @@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@

Modified: branches/stable/source/src/libs/libpng/libpng.test
===================================================================
--- branches/stable/source/src/libs/libpng/libpng.test	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/libs/libpng/libpng.test	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,7 @@
-#! /bin/sh
-
-# Copyright (C) 2009 Peter Breitenlohner <tex-live at tug.org>
+#! /bin/sh -vx
+# $Id: libpng.test 45809 2017-11-15 00:36:56Z karl $
+# Copyright 2017 Karl Berry <tex-live at tug.org>
+# Copyright 2009 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
 ./pngtest $srcdir/$LIBPNG_TREE/pngtest.png \

Modified: branches/stable/source/src/libs/poppler/configure
===================================================================
--- branches/stable/source/src/libs/poppler/configure	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/libs/poppler/configure	2017-12-15 16:53:58 UTC (rev 787)
@@ -5453,6 +5453,7 @@
 
 
 
+echo 'dbg:_KPSE_COMPILER_VISIBILITY called.' >&5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for C to hide external symbols" >&5
 $as_echo_n "checking CFLAGS for C to hide external symbols... " >&6; }
 if ${kpse_cv_visibility_cflags+:} false; then :
@@ -5480,6 +5481,7 @@
 fi
 rm -f core conftest.err conftest.$ac_objext
 done
+CFLAGS=$kpse_save_flags
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5490,7 +5492,6 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_visibility_cflags" >&5
 $as_echo "$kpse_cv_visibility_cflags" >&6; }
-CFLAGS=$kpse_save_flags
 case $kpse_cv_visibility_cflags in #(
   unknown) :
      ;; #(
@@ -5527,6 +5528,7 @@
 fi
 rm -f core conftest.err conftest.$ac_objext
 done
+CXXFLAGS=$kpse_save_flags
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5537,7 +5539,6 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_visibility_cxxflags" >&5
 $as_echo "$kpse_cv_visibility_cxxflags" >&6; }
-CXXFLAGS=$kpse_save_flags
 case $kpse_cv_visibility_cxxflags in #(
   unknown) :
      ;; #(

Modified: branches/stable/source/src/libs/zlib/configure
===================================================================
--- branches/stable/source/src/libs/zlib/configure	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/libs/zlib/configure	2017-12-15 16:53:58 UTC (rev 787)
@@ -4700,6 +4700,7 @@
 fi
 
 
+echo 'dbg:_KPSE_COMPILER_VISIBILITY called.' >&5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for C to hide external symbols" >&5
 $as_echo_n "checking CFLAGS for C to hide external symbols... " >&6; }
 if ${kpse_cv_visibility_cflags+:} false; then :
@@ -4727,6 +4728,7 @@
 fi
 rm -f core conftest.err conftest.$ac_objext
 done
+CFLAGS=$kpse_save_flags
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4737,7 +4739,6 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_visibility_cflags" >&5
 $as_echo "$kpse_cv_visibility_cflags" >&6; }
-CFLAGS=$kpse_save_flags
 case $kpse_cv_visibility_cflags in #(
   unknown) :
      ;; #(

Modified: branches/stable/source/src/libs/zlib/zlib.test
===================================================================
--- branches/stable/source/src/libs/zlib/zlib.test	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/libs/zlib/zlib.test	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,7 @@
-#! /bin/sh
-
-# Copyright (C) 2009 Peter Breitenlohner <tex-live at tug.org>
+#! /bin/sh -vx
+# $Id: zlib.test 45809 2017-11-15 00:36:56Z karl $
+# Copyright 2017 Karl Berry <tex-live at tug.org>
+# Copyright 2009 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
 echo hello world | ./minigzip | ./minigzip -d || { \

Modified: branches/stable/source/src/m4/ChangeLog
===================================================================
--- branches/stable/source/src/m4/ChangeLog	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/m4/ChangeLog	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,3 +1,26 @@
+2017-12-08  Norbert Preining  <preining at logic.at>
+
+	* kpse-icu-flags.m4 (KPSE_ICU_SYSTEM_FLAGS): also check for PKG_CONFIG.
+	(KPSE_ICU_SYSTEM_FLAGS): try pkg-config if icu-config fails.
+
+2017-12-02  Karl Berry  <karl at freefriends.org>
+
+	* kpse-visibility.m4 (KPSE_COMPILER_VISIBILITY): write debug line.
+	(_KPSE_VISIBILITY_FLAGS): only restore from kpse_save_flags
+	if we set it, i.e., if not using the cached value. (Otherwise,
+	e.g., in libpng, we can end up overriding the user-set CFLAGS with
+	the empty string.)
+
+2017-11-02  Karl Berry  <karl at freefriends.org>
+
+	* kpse-setup.m4 (_KPSE_RECURSE): revert previous change,
+	as (1) it causes configure to fail in the cut-down pdftex source tree,
+	and (2) for 2018, more packages (icu, poppler, ...) are going to
+	require C++11, so we can't hack around it again. So not worth
+	spending more time refining.
+	Also, write debug line to >&AS_MESSAGE_LOG_FD (config.log).
+	reautoconf.
+
 2017-02-17  Karl Berry  <karl at freefriends.org>
 
 	* kpse-setup.m4 (_KPSE_RECURSE): do not add a package to

Modified: branches/stable/source/src/m4/kpse-icu-flags.m4
===================================================================
--- branches/stable/source/src/m4/kpse-icu-flags.m4	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/m4/kpse-icu-flags.m4	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,5 +1,7 @@
-# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
+# $Id: kpse-icu-flags.m4 46014 2017-12-07 23:42:12Z karl $
+# ICU support for the TeX Live (TL) tree.
+# Copyright 2017 Karl Berry <tex-live at tug.org>
+# Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
 #
 # This file is free software; the copyright holder
 # gives unlimited permission to copy and/or distribute it,
@@ -24,7 +26,8 @@
 # Internal subroutine.
 #
 # LIBNAME and OPTIONS as for _KPSE_LIB_FLAGS().
-# MORE-ICU-LIBS: icu libraries from the TL tree in addition to icuuc and icudata.
+# MORE-ICU-LIBS: icu libraries from the TL tree in addition to icuuc and
+# icudata.
 m4_define([_KPSE_ICU_FLAGS], [dnl
 _KPSE_LIB_FLAGS([icu], [$1], [$2],
                 [-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include],
@@ -41,7 +44,7 @@
 m4_ifval([$1],
          [AC_ARG_WITH([system-icu],
                       AS_HELP_STRING([--with-system-icu],
-                                     [use installed ICU headers and libraries (requires icu-config)]))])[]dnl
+                                     [use installed ICU headers and libraries (requires pkg-config or icu-config)]))])[]dnl
 ]) # KPSE_ICU_OPTIONS
 
 # KPSE_ICU_SYSTEM_FLAGS
@@ -48,12 +51,17 @@
 # ---------------------
 AC_DEFUN([KPSE_ICU_SYSTEM_FLAGS], [dnl
 AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
+echo 'dbg:[_KPSE_ICU_SYSTEM_FLAGS] called.' >&AS_MESSAGE_LOG_FD
 AC_CHECK_TOOL([ICU_CONFIG], [icu-config], [false])[]dnl
+AC_CHECK_TOOL([PKG_CONFIG], [pkg-config], [false])[]dnl
 if $ICU_CONFIG --version >/dev/null 2>&1; then
   ICU_INCLUDES=`$ICU_CONFIG --cppflags`
   ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath m4_ifset([kpse_icu_config_args],
                                                       [kpse_icu_config_args ])--ldflags-libsonly --ldflags-system`
+elif $PKG_CONFIG --libs icu-uc icu-io >/dev/null 2>&1; then
+  ICU_INCLUDES=`$PKG_CONFIG --cflags icu-uc icu-io`
+  ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io`
 elif test "x$need_icu:$with_system_icu" = xyes:yes; then
-  AC_MSG_ERROR([did not find icu-config required for system icu libraries])
+  AC_MSG_ERROR([did not find either pkg-config or icu-config; one is required for system icu library support])
 fi
 ]) # KPSE_ICU_SYSTEM_FLAGS

Modified: branches/stable/source/src/m4/kpse-visibility.m4
===================================================================
--- branches/stable/source/src/m4/kpse-visibility.m4	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/m4/kpse-visibility.m4	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,5 +1,7 @@
+# $Id: kpse-visibility.m4 45970 2017-12-02 23:50:45Z karl $
 # Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live at tug.org>
+# Copyright 2017 Karl Berry <tex-live at tug.org>
+# Copyright 2013-2014 Peter Breitenlohner <tex-live at tug.org>
 #
 # This file is free software; the copyright holder
 # gives unlimited permission to copy and/or distribute it,
@@ -13,6 +15,7 @@
 # them a Makefile.am must use them, e.g., in AM_CFLAGS or AM_CXXFLAGS.
 AC_DEFUN([KPSE_COMPILER_VISIBILITY],
 [dnl arrange that AC_PROG_CC uses _KPSE_VISIBILITY_CFLAGS etc.
+echo 'dbg:[_KPSE_COMPILER_VISIBILITY] called.' >&AS_MESSAGE_LOG_FD
 AC_PROVIDE_IFELSE([AC_PROG_CC],
                   [_KPSE_VISIBILITY_CFLAGS],
                   [m4_define([AC_PROG_CC],
@@ -64,11 +67,10 @@
   AS_TR_CPP($2)="$kpse_save_flags -Werror $kpse_flag"
   AC_COMPILE_IFELSE([], [kpse_cv_visibility_$2=$kpse_flag; break])
 done
+AS_TR_CPP($2)=$kpse_save_flags
 AC_LANG_POP([$1])
 ])
-AS_TR_CPP($2)=$kpse_save_flags
 AS_CASE([$kpse_cv_visibility_$2],
         [unknown], [],
         [AC_SUBST([VISIBILITY_]AS_TR_CPP($2), [$kpse_cv_visibility_$2])])
 ]) # _KPSE_VISIBILITY_FLAGS
-

Modified: branches/stable/source/src/texk/Makefile.in
===================================================================
--- branches/stable/source/src/texk/Makefile.in	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/Makefile.in	2017-12-15 16:53:58 UTC (rev 787)
@@ -89,28 +89,107 @@
 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-poppler-flags.m4 \
+	$(top_srcdir)/../m4/kpse-potrace-flags.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/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/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/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/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/poppler/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/potrace/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/lua52/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

Modified: branches/stable/source/src/texk/aclocal.m4
===================================================================
--- branches/stable/source/src/texk/aclocal.m4	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/aclocal.m4	2017-12-15 16:53:58 UTC (rev 787)
@@ -1186,18 +1186,32 @@
 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-poppler-flags.m4])
+m4_include([../m4/kpse-potrace-flags.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])

Modified: branches/stable/source/src/texk/configure
===================================================================
--- branches/stable/source/src/texk/configure	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/configure	2017-12-15 16:53:58 UTC (rev 787)
@@ -694,6 +694,21 @@
 enable_multiplatform
 enable_cxx_runtime_hack
 enable_libtool_hack
+enable_autosp
+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_xpdfopen
 enable_web2c
 with_banner_add
 with_editor
@@ -739,12 +754,85 @@
 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_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_xpdf
 with_system_poppler
+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_potrace
+with_potrace_includes
+with_potrace_libdir
+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
@@ -1393,6 +1481,20 @@
                           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-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-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
@@ -1438,6 +1540,58 @@
   --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-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
   --disable-mktexpk-default   do not run mktexpk if PK font missing
   --disable-mktextfm-default  do not run mktextfm if TFM file missing
@@ -1461,20 +1615,66 @@
 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 (motif/xaw/xaw3d/neXtaw) for xdvi
+                          [default: Motif if available, else 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-xpdf      use installed poppler headers and library instead of
                           xpdf library from TL (requires pkg-config)
   --with-system-poppler   use installed poppler 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-potrace   use installed potrace headers and library
+  --with-potrace-includes=DIR
+                          potrace headers installed in DIR
+  --with-potrace-libdir=DIR
+                          potrace library installed in DIR
+  --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)
 
@@ -3159,7 +3359,285 @@
 esac ;;
 esac
 
+## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir
+## configure options and TL libraries required for vlna
+# Check whether --enable-autosp was given.
+if test "${enable_autosp+set}" = set; then :
+  enableval=$enable_autosp;
+fi
+case $enable_autosp in #(
+  yes|no) :
+     ;; #(
+  *) :
 
+   enable_autosp=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-autosp=$enable_autosp'" >&5
+$as_echo "$as_me: Assuming \`--enable-autosp=$enable_autosp'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-autosp=$enable_autosp'"
+    ;;
+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+set}" = set; then :
+  enableval=$enable_devnag;
+fi
+case $enable_devnag in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_devnag=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-devnag=$enable_devnag'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_lacheck;
+fi
+case $enable_lacheck in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_lacheck=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-lacheck=$enable_lacheck'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_m_tx;
+fi
+case $enable_m_tx in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_m_tx=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-m-tx=$enable_m_tx'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_pmx;
+fi
+case $enable_pmx in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_pmx=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-pmx=$enable_pmx'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_ps2eps;
+fi
+case $enable_ps2eps in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ps2eps=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_t1utils;
+fi
+case $enable_t1utils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_t1utils=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-t1utils=$enable_t1utils'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_texdoctk;
+fi
+case $enable_texdoctk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_texdoctk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texdoctk=$enable_texdoctk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_tpic2pdftex;
+fi
+case $enable_tpic2pdftex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_tpic2pdftex=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_vlna;
+fi
+case $enable_vlna in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_vlna=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-vlna=$enable_vlna'" >&5
+$as_echo "$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 the TeX Live subdirectory utils/xindy/
+## configure options and TL libraries required for xindy
+# Check whether --enable-xindy was given.
+if test "${enable_xindy+set}" = set; then :
+  enableval=$enable_xindy;
+fi
+case $enable_xindy in #(
+  yes) :
+    if test "x$cross_compiling" = xyes; then :
+  as_fn_error $? "Unable to cross compile xindy" "$LINENO" 5
+fi ;; #(
+  no) :
+     ;; #(
+  *) :
+    if test "x$cross_compiling" = xyes; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: Cross compiling -> \`--disable-xindy'" >&5
+$as_echo "$as_me: Cross compiling -> \`--disable-xindy'" >&6;}
+            enable_xindy=no
+            ac_configure_args="$ac_configure_args '--disable-xindy'"
+          else
+   enable_xindy=no
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xindy=$enable_xindy'" >&5
+$as_echo "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'"
+   fi ;;
+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+set}" = set; then :
+  enableval=$enable_xindy_rules;
+fi
+# Check whether --enable-xindy-docs was given.
+if test "${enable_xindy_docs+set}" = set; then :
+  enableval=$enable_xindy_docs;
+fi
+
+# Check whether --with-clisp-runtime was given.
+if test "${with_clisp_runtime+set}" = set; 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
+  with_clisp_runtime=system
+fi
+               { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--with-clisp-runtime=$with_clisp_runtime'" >&5
+$as_echo "$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/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+set}" = set; then :
+  enableval=$enable_xpdfopen;
+fi
+if test "x$with_x" = xno; then :
+  case $enable_xpdfopen in #(
+  "") :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: \`--without-x' -> \`--disable-xpdfopen'" >&5
+$as_echo "$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
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xpdfopen=$enable_xpdfopen'" >&5
+$as_echo "$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
 # Check whether --enable-web2c was given.
@@ -3574,7 +4052,964 @@
 fi
 
 
+## 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+set}" = set; then :
+  enableval=$enable_afm2pl;
+fi
+case $enable_afm2pl in #(
+  yes|no) :
+     ;; #(
+  *) :
 
+   enable_afm2pl=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&5
+$as_echo "$as_me: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-afm2pl=$enable_afm2pl'"
+    ;;
+esac
+
+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+set}" = set; then :
+  enableval=$enable_bibtex_x;
+fi
+case $enable_bibtex_x in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_bibtex_x=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-bibtex-x=$enable_bibtex_x'" >&5
+$as_echo "$as_me: Assuming \`--enable-bibtex-x=$enable_bibtex_x'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-bibtex-x=$enable_bibtex_x'"
+    ;;
+esac
+
+test "x$enable_bibtex_x" = xno || {
+  need_kpathsea=yes
+}
+
+## 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+set}" = set; then :
+  enableval=$enable_bibtex8;
+fi
+
+case $enable_bibtex8 in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_bibtex8=yes ;;
+esac
+# Check whether --enable-bibtexu was given.
+if test "${enable_bibtexu+set}" = set; then :
+  enableval=$enable_bibtexu;
+fi
+
+case $enable_bibtexu in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_bibtexu=yes ;;
+esac
+
+test "x$enable_bibtex_x:$enable_bibtexu" = xyes:yes && need_icu=yes
+
+## 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+set}" = set; then :
+  enableval=$enable_chktex;
+fi
+case $enable_chktex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_chktex=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-chktex=$enable_chktex'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_cjkutils;
+fi
+case $enable_cjkutils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_cjkutils=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_detex;
+fi
+case $enable_detex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_detex=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-detex=$enable_detex'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dtl;
+fi
+case $enable_dtl in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dtl=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dtl=$enable_dtl'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dvi2tty;
+fi
+case $enable_dvi2tty in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvi2tty=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dvidvi;
+fi
+case $enable_dvidvi in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvidvi=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dviljk;
+fi
+case $enable_dviljk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dviljk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dviljk=$enable_dviljk'" >&5
+$as_echo "$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/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+set}" = set; then :
+  enableval=$enable_dvipdfm_x;
+fi
+case $enable_dvipdfm_x in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipdfm_x=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipdfm-x=$enable_dvipdfm_x'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dvipng;
+fi
+case $enable_dvipng in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipng=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipng=$enable_dvipng'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_debug;
+fi
+
+# Check whether --enable-timing was given.
+if test "${enable_timing+set}" = set; then :
+  enableval=$enable_timing;
+fi
+
+
+# Check whether --with-gs was given.
+if test "${with_gs+set}" = set; 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+set}" = set; then :
+  enableval=$enable_dvipos;
+fi
+case $enable_dvipos in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipos=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipos=$enable_dvipos'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dvipsk;
+fi
+case $enable_dvipsk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipsk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dvisvgm;
+fi
+case $enable_dvisvgm in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvisvgm=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvisvgm=$enable_dvisvgm'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_gregorio;
+fi
+case $enable_gregorio in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_gregorio=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-gregorio=$enable_gregorio'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_gsftopk;
+fi
+case $enable_gsftopk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_gsftopk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_lcdf_typetools;
+fi
+case $enable_lcdf_typetools in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_lcdf_typetools=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_cfftot1;
+fi
+# Check whether --enable-mmafm was given.
+if test "${enable_mmafm+set}" = set; then :
+  enableval=$enable_mmafm;
+fi
+# Check whether --enable-mmpfb was given.
+if test "${enable_mmpfb+set}" = set; then :
+  enableval=$enable_mmpfb;
+fi
+# Check whether --enable-otfinfo was given.
+if test "${enable_otfinfo+set}" = set; then :
+  enableval=$enable_otfinfo;
+fi
+# Check whether --enable-otftotfm was given.
+if test "${enable_otftotfm+set}" = set; then :
+  enableval=$enable_otftotfm;
+fi
+# Check whether --enable-t1dotlessj was given.
+if test "${enable_t1dotlessj+set}" = set; then :
+  enableval=$enable_t1dotlessj;
+fi
+# Check whether --enable-t1lint was given.
+if test "${enable_t1lint+set}" = set; then :
+  enableval=$enable_t1lint;
+fi
+# Check whether --enable-t1rawafm was given.
+if test "${enable_t1rawafm+set}" = set; then :
+  enableval=$enable_t1rawafm;
+fi
+# Check whether --enable-t1reencode was given.
+if test "${enable_t1reencode+set}" = set; then :
+  enableval=$enable_t1reencode;
+fi
+# Check whether --enable-t1testpage was given.
+if test "${enable_t1testpage+set}" = set; then :
+  enableval=$enable_t1testpage;
+fi
+# Check whether --enable-ttftotype42 was given.
+if test "${enable_ttftotype42+set}" = set; then :
+  enableval=$enable_ttftotype42;
+fi
+
+# Check whether --enable-cfftot1 was given.
+if test "${enable_cfftot1+set}" = set; then :
+  enableval=$enable_cfftot1;
+fi
+# Check whether --enable-t1dotlessj was given.
+if test "${enable_t1dotlessj+set}" = set; then :
+  enableval=$enable_t1dotlessj;
+fi
+# Check whether --enable-ttftotype42 was given.
+if test "${enable_ttftotype42+set}" = set; then :
+  enableval=$enable_ttftotype42;
+fi
+# Check whether --enable-updmap was given.
+if test "${enable_updmap+set}" = set; 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+set}" = set; then :
+  enableval=$enable_makeindexk;
+fi
+case $enable_makeindexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_makeindexk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_makejvf;
+fi
+case $enable_makejvf in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_makejvf=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-makejvf=$enable_makejvf'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_mendexk;
+fi
+case $enable_mendexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_mendexk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-mendexk=$enable_mendexk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_musixtnt;
+fi
+case $enable_musixtnt in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_musixtnt=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-musixtnt=$enable_musixtnt'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_ps2pk;
+fi
+case $enable_ps2pk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ps2pk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_psutils;
+fi
+case $enable_psutils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_psutils=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-psutils=$enable_psutils'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_seetexk;
+fi
+case $enable_seetexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_seetexk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-seetexk=$enable_seetexk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_tex4htk;
+fi
+case $enable_tex4htk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_tex4htk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_ttf2pk2;
+fi
+case $enable_ttf2pk2 in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ttf2pk2=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_ttfdump;
+fi
+case $enable_ttfdump in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ttfdump=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_upmendex;
+fi
+case $enable_upmendex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_upmendex=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-upmendex=$enable_upmendex'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_xdvik;
+fi
+if test "x$with_x" = xno; then :
+  case $enable_xdvik in #(
+  "") :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: \`--without-x' -> \`--disable-xdvik'" >&5
+$as_echo "$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
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xdvik=$enable_xdvik'" >&5
+$as_echo "$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+set}" = set; 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+set}" = set; then :
+  enableval=$enable_texlive;
+fi
+case $enable_texlive in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_texlive=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texlive=$enable_texlive'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_linked_scripts;
+fi
+
+
+## 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+set}" = set; then :
+  withval=$with_system_harfbuzz;
+fi
+if test "x$with_system_harfbuzz" = x; then
+  if test -f $srcdir/../libs/harfbuzz/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`harfbuzz' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`harfbuzz' headers and library from TL tree" >&6;}
+    with_system_harfbuzz=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`harfbuzz' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`graphite2' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`icu' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_icu;
+fi
+if test "x$with_system_icu" = x; then
+  if test -f $srcdir/../libs/icu/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`icu' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`icu' headers and library from TL tree" >&6;}
+    with_system_icu=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`icu' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_teckit;
+fi
+if test "x$with_system_teckit" = x; then
+  if test -f $srcdir/../libs/teckit/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`teckit' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`teckit' headers and library from TL tree" >&6;}
+    with_system_teckit=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`teckit' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_graphite2;
+fi
+if test "x$with_system_graphite2" = x; then
+  if test -f $srcdir/../libs/graphite2/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`graphite2' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`graphite2' headers and library from TL tree" >&6;}
+    with_system_graphite2=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`graphite2' headers and library" >&5
+$as_echo "$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
+
+# Check whether --with-system-zziplib was given.
+if test "${with_system_zziplib+set}" = set; then :
+  withval=$with_system_zziplib;
+fi
+if test "x$with_system_zziplib" = x; then
+  if test -f $srcdir/../libs/zziplib/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`zziplib' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`zziplib' headers and library from TL tree" >&6;}
+    with_system_zziplib=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`zziplib' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`zziplib' headers and library" >&6;}
+    with_system_zziplib=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-zziplib=$with_system_zziplib'"
+fi
+if test "x$with_system_zziplib" = xyes; then
+  if test "x$with_system_zlib" = x; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
+$as_echo "$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-zziplib' requires \`--with-system-zlib'" "$LINENO" 5
+  fi
+fi
+
+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
 
@@ -3629,6 +5064,251 @@
   need_zlib=yes
 }
 
+## 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+set}" = set; then :
+  withval=$with_system_mpfr;
+fi
+
+# Check whether --with-mpfr-includes was given.
+if test "${with_mpfr_includes+set}" = set; then :
+  withval=$with_mpfr_includes;
+fi
+
+# Check whether --with-mpfr-libdir was given.
+if test "${with_mpfr_libdir+set}" = set; then :
+  withval=$with_mpfr_libdir;
+fi
+if test "x$with_system_mpfr" = x; then
+  if test -f $srcdir/../libs/mpfr/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`mpfr' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`mpfr' headers and library from TL tree" >&6;}
+    with_system_mpfr=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`mpfr' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`gmp' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_gmp;
+fi
+
+# Check whether --with-gmp-includes was given.
+if test "${with_gmp_includes+set}" = set; then :
+  withval=$with_gmp_includes;
+fi
+
+# Check whether --with-gmp-libdir was given.
+if test "${with_gmp_libdir+set}" = set; then :
+  withval=$with_gmp_libdir;
+fi
+if test "x$with_system_gmp" = x; then
+  if test -f $srcdir/../libs/gmp/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`gmp' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`gmp' headers and library from TL tree" >&6;}
+    with_system_gmp=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`gmp' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_cairo;
+fi
+if test "x$with_system_cairo" = x; then
+  if test -f $srcdir/../libs/cairo/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`cairo' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`cairo' headers and library from TL tree" >&6;}
+    with_system_cairo=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`cairo' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`pixman' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_pixman;
+fi
+if test "x$with_system_pixman" = x; then
+  if test -f $srcdir/../libs/pixman/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`pixman' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`pixman' headers and library from TL tree" >&6;}
+    with_system_pixman=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`pixman' headers and library" >&5
+$as_echo "$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/potrace/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/potrace/
+## configure options and TL libraries required for potrace
+
+# Check whether --with-system-potrace was given.
+if test "${with_system_potrace+set}" = set; then :
+  withval=$with_system_potrace;
+fi
+
+# Check whether --with-potrace-includes was given.
+if test "${with_potrace_includes+set}" = set; then :
+  withval=$with_potrace_includes;
+fi
+
+# Check whether --with-potrace-libdir was given.
+if test "${with_potrace_libdir+set}" = set; then :
+  withval=$with_potrace_libdir;
+fi
+if test "x$with_system_potrace" = x; then
+  if test -f $srcdir/../libs/potrace/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`potrace' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`potrace' headers and library from TL tree" >&6;}
+    with_system_potrace=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`potrace' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`potrace' headers and library" >&6;}
+    with_system_potrace=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-potrace=$with_system_potrace'"
+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+set}" = set; then :
+  withval=$with_system_gd;
+fi
+
+# Check whether --with-gd-includes was given.
+if test "${with_gd_includes+set}" = set; then :
+  withval=$with_gd_includes;
+fi
+
+# Check whether --with-gd-libdir was given.
+if test "${with_gd_libdir+set}" = set; then :
+  withval=$with_gd_libdir;
+fi
+if test "x$with_system_gd" = x; then
+  if test -f $srcdir/../libs/gd/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`gd' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`gd' headers and library from TL tree" >&6;}
+    with_system_gd=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`gd' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`libpng' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`freetype2' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_freetype2;
+fi
+if test "x$with_system_freetype2" = x; then
+  if test -f $srcdir/../libs/freetype2/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`freetype2' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`freetype2' headers and library from TL tree" >&6;}
+    with_system_freetype2=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`freetype2' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
+$as_echo "$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
 
@@ -3663,6 +5343,42 @@
   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+set}" = set; then :
+  withval=$with_system_libpaper;
+fi
+
+# Check whether --with-libpaper-includes was given.
+if test "${with_libpaper_includes+set}" = set; then :
+  withval=$with_libpaper_includes;
+fi
+
+# Check whether --with-libpaper-libdir was given.
+if test "${with_libpaper_libdir+set}" = set; then :
+  withval=$with_libpaper_libdir;
+fi
+if test "x$with_system_libpaper" = x; then
+  if test -f $srcdir/../libs/libpaper/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`libpaper' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`libpaper' headers and library from TL tree" >&6;}
+    with_system_libpaper=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`libpaper' headers and library" >&5
+$as_echo "$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
+
+## libs/lua52/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/lua52/
+## configure options and TL libraries required for lua52
+
 ## libs/zlib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/
 ## configure options and TL libraries required for zlib
 
@@ -3694,6 +5410,40 @@
 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+set}" = set; then :
+  withval=$with_system_ptexenc;
+fi
+if test "x$with_system_ptexenc" = x; then
+  if test -f $srcdir/../texk/ptexenc/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`ptexenc' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`ptexenc' headers and library from TL tree" >&6;}
+    with_system_ptexenc=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`ptexenc' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`kpathsea' headers and library" >&5
+$as_echo "$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
 
@@ -4651,6 +6401,126 @@
   test "x$enable_web2c" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS web2c"
   CONF_SUBDIRS="$CONF_SUBDIRS web2c"
 fi
+if test -x $srcdir/afm2pl/configure; then
+  test "x$enable_afm2pl" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS afm2pl"
+  CONF_SUBDIRS="$CONF_SUBDIRS afm2pl"
+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"
+fi
+if test -x $srcdir/chktex/configure; then
+  test "x$enable_chktex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS chktex"
+  CONF_SUBDIRS="$CONF_SUBDIRS chktex"
+fi
+if test -x $srcdir/cjkutils/configure; then
+  test "x$enable_cjkutils" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS cjkutils"
+  CONF_SUBDIRS="$CONF_SUBDIRS cjkutils"
+fi
+if test -x $srcdir/detex/configure; then
+  test "x$enable_detex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS detex"
+  CONF_SUBDIRS="$CONF_SUBDIRS detex"
+fi
+if test -x $srcdir/dtl/configure; then
+  test "x$enable_dtl" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dtl"
+  CONF_SUBDIRS="$CONF_SUBDIRS dtl"
+fi
+if test -x $srcdir/dvi2tty/configure; then
+  test "x$enable_dvi2tty" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvi2tty"
+  CONF_SUBDIRS="$CONF_SUBDIRS dvi2tty"
+fi
+if test -x $srcdir/dvidvi/configure; then
+  test "x$enable_dvidvi" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvidvi"
+  CONF_SUBDIRS="$CONF_SUBDIRS dvidvi"
+fi
+if test -x $srcdir/dviljk/configure; then
+  test "x$enable_dviljk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dviljk"
+  CONF_SUBDIRS="$CONF_SUBDIRS dviljk"
+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"
+fi
+if test -x $srcdir/dvipng/configure; then
+  test "x$enable_dvipng" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipng"
+  CONF_SUBDIRS="$CONF_SUBDIRS dvipng"
+fi
+if test -x $srcdir/dvipos/configure; then
+  test "x$enable_dvipos" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipos"
+  CONF_SUBDIRS="$CONF_SUBDIRS dvipos"
+fi
+if test -x $srcdir/dvipsk/configure; then
+  test "x$enable_dvipsk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipsk"
+  CONF_SUBDIRS="$CONF_SUBDIRS dvipsk"
+fi
+if test -x $srcdir/dvisvgm/configure; then
+  test "x$enable_dvisvgm" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvisvgm"
+  CONF_SUBDIRS="$CONF_SUBDIRS dvisvgm"
+fi
+if test -x $srcdir/gregorio/configure; then
+  test "x$enable_gregorio" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS gregorio"
+  CONF_SUBDIRS="$CONF_SUBDIRS gregorio"
+fi
+if test -x $srcdir/gsftopk/configure; then
+  test "x$enable_gsftopk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS gsftopk"
+  CONF_SUBDIRS="$CONF_SUBDIRS gsftopk"
+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"
+fi
+if test -x $srcdir/makeindexk/configure; then
+  test "x$enable_makeindexk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS makeindexk"
+  CONF_SUBDIRS="$CONF_SUBDIRS makeindexk"
+fi
+if test -x $srcdir/makejvf/configure; then
+  test "x$enable_makejvf" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS makejvf"
+  CONF_SUBDIRS="$CONF_SUBDIRS makejvf"
+fi
+if test -x $srcdir/mendexk/configure; then
+  test "x$enable_mendexk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS mendexk"
+  CONF_SUBDIRS="$CONF_SUBDIRS mendexk"
+fi
+if test -x $srcdir/musixtnt/configure; then
+  test "x$enable_musixtnt" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS musixtnt"
+  CONF_SUBDIRS="$CONF_SUBDIRS musixtnt"
+fi
+if test -x $srcdir/ps2pk/configure; then
+  test "x$enable_ps2pk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ps2pk"
+  CONF_SUBDIRS="$CONF_SUBDIRS ps2pk"
+fi
+if test -x $srcdir/psutils/configure; then
+  test "x$enable_psutils" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS psutils"
+  CONF_SUBDIRS="$CONF_SUBDIRS psutils"
+fi
+if test -x $srcdir/seetexk/configure; then
+  test "x$enable_seetexk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS seetexk"
+  CONF_SUBDIRS="$CONF_SUBDIRS seetexk"
+fi
+if test -x $srcdir/tex4htk/configure; then
+  test "x$enable_tex4htk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS tex4htk"
+  CONF_SUBDIRS="$CONF_SUBDIRS tex4htk"
+fi
+if test -x $srcdir/ttf2pk2/configure; then
+  test "x$enable_ttf2pk2" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ttf2pk2"
+  CONF_SUBDIRS="$CONF_SUBDIRS ttf2pk2"
+fi
+if test -x $srcdir/ttfdump/configure; then
+  test "x$enable_ttfdump" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ttfdump"
+  CONF_SUBDIRS="$CONF_SUBDIRS ttfdump"
+fi
+if test -x $srcdir/upmendex/configure; then
+  test "x$enable_upmendex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS upmendex"
+  CONF_SUBDIRS="$CONF_SUBDIRS upmendex"
+fi
+if test -x $srcdir/xdvik/configure; then
+  test "x$enable_xdvik" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS xdvik"
+  CONF_SUBDIRS="$CONF_SUBDIRS xdvik"
+fi
+if test -x $srcdir/texlive/configure; then
+  test "x$enable_texlive" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS texlive"
+  CONF_SUBDIRS="$CONF_SUBDIRS texlive"
+fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
 $as_echo "$MAKE_SUBDIRS" >&6; }

Modified: branches/stable/source/src/texk/kpathsea/ChangeLog
===================================================================
--- branches/stable/source/src/texk/kpathsea/ChangeLog	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/kpathsea/ChangeLog	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,3 +1,58 @@
+2017-12-09  Jiang Jiang  <gzjjgod at gmail.com>
+
+	* tex-glyph.c (try_fallback_resolutions):
+	Avoid warning: taking the absolute value of unsigned type
+	'unsigned int' has no effect [-Wabsolute-value]
+	ref. https://github.com/jjgod/texlive/commit/4cbec4c
+
+2017-12-08  Karl Berry  <karl at freefriends.org>
+
+	* tex-file.c (kpathsea_init_format_return_varlist)
+	<kpse_program_text_format>, <kpse_program_binary_format>:
+	use DIR_SEP_STRING instead of hardwired /
+	Report from Douglas McKenna, tex-k 5 Dec 2017 22:27:10.
+
+2017-12-05  Karl Berry  <karl at freefriends.org>
+
+	* c-minmax.h (SCHAR_MAX): decrement to the correct 127.
+	Report from Douglas McKenna, tex-k 4 Dec 2017 18:26:35.
+
+2017-11-28  Karl Berry  <karl at tug.org>
+
+	* doc/unixtex.texi: no longer in ~ftp, etc.
+	
+	* doc/kpathsea.texi (Fontmap): clarify that it's the last %
+	on a line that starts a comment. From Doug McKenna, personal
+	email, 21nov17.
+
+2017-11-18  Karl Berry  <karl at tug.org>
+
+	* db.c (elt_in_db): protect against either argument being NULL or
+	empty.  From Doug McKenna, personal mail, 17nov17.
+
+2017-11-11  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	* tex-file.c: Again use a custom kpathsea_getlongpath()
+	instead of a standard API function GetLongPathName(), since
+	the latter sometimes does not work as desired (W32 only).
+
+2017-11-09  Karl Berry  <karl at freefriends.org>
+
+	* db.c (kpathsea_db_search_list): remove redundant test of `found'.
+        From Doug McKenna, personal mail, 7nov17.
+
+2017-11-03  Karl Berry  <karl at freefriends.org>
+
+	* default.h: document that NULL or empty input path returns the
+	default string.
+	* kdefault.c (kpathsea_expand_default): check for empty input path.
+        From Doug McKenna, personal mail, 2nov17.	
+
+	* cnf.c (do_line): do not move past a nul byte on erroneous input
+	(with a . but no program name).
+	* hash.c: doc fix.
+        From Doug McKenna, personal mail, 31oct17.	
+
 2017-10-29  Karl Berry  <karl at freefriends.org>
 
 	* several files: missed copyright 2017 updates.

Modified: branches/stable/source/src/texk/kpathsea/c-minmax.h
===================================================================
--- branches/stable/source/src/texk/kpathsea/c-minmax.h	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/kpathsea/c-minmax.h	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,7 +1,7 @@
 /* c-minmax.h: define INT_MIN, etc.  Assume a 32-bit machine if the
    values aren't defined.
 
-   Copyright 1992, 1993, 2008 Karl Berry.
+   Copyright 1992, 1993, 2008, 2017 Karl Berry.
    Copyright 2005 Olaf Weber.
 
    This library is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@
 #define SCHAR_MIN (-127)
 #endif
 #ifndef SCHAR_MAX
-#define SCHAR_MAX 128
+#define SCHAR_MAX 127
 #endif
 #ifndef UCHAR_MAX
 #define UCHAR_MAX 255

Modified: branches/stable/source/src/texk/kpathsea/cnf.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/cnf.c	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/kpathsea/cnf.c	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,7 @@
 /* cnf.c: read config files.
 
-   Copyright 1994, 1995, 1996, 1997, 2008, 2009, 2011, 2012, 2016 Karl Berry.
+   Copyright 1994, 1995, 1996, 1997, 2008, 2009, 2011, 2012, 2016,
+   2017 Karl Berry.
    Copyright 1997-2005 Olaf Weber.
 
    This library is free software; you can redistribute it and/or
@@ -105,7 +106,7 @@
     while (ISSPACE (*line))
       line++;
     start = line;
-    while (!ISSPACE (*line) && *line != '=')
+    while (*line && !ISSPACE (*line) && *line != '=')
       line++;
 
     /* It's annoying to repeat all this, but making a tokenizing

Modified: branches/stable/source/src/texk/kpathsea/db.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/db.c	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/kpathsea/db.c	2017-12-15 16:53:58 UTC (rev 787)
@@ -296,6 +296,7 @@
    That is, the question is whether to try the db for a file looked up
    in PATH_ELT.  If PATH_ELT == ".", for example, the answer is no. If
    PATH_ELT == "/usr/local/lib/texmf/fonts//tfm", the answer is yes.
+   If either string is NULL or empty, return false.
 
    In practice, ls-R is only needed for lengthy subdirectory
    comparisons, but there's no gain to checking PATH_ELT to see if it is
@@ -307,6 +308,15 @@
 {
   boolean found = false;
 
+  /* If both strings are empty or null return false on the grounds that
+     it's useless to do anything further with such a strange case (which
+     likely never happens).  In theory one could argue that the empty
+     string is a prefix of any other string, but let's just declare the
+     result otherwise.  */
+  if (db_dir == NULL || *db_dir == 0
+      || path_elt == NULL || *path_elt == 0)
+    return false;
+     
   while (!found && FILECHARCASEEQ (*db_dir++, *path_elt++)) {
     /* If we've matched the entire db directory, it's good.  */
     if (*db_dir == 0)
@@ -772,7 +782,7 @@
               /* If we have a real file, add it to the list, maybe done.  */
               if (found) {
                 str_list_add (ret, found);
-                if (!all && found)
+                if (!all)
                   done = true;
               }
             } else { /* no match in the db */

Modified: branches/stable/source/src/texk/kpathsea/default.h
===================================================================
--- branches/stable/source/src/texk/kpathsea/default.h	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/kpathsea/default.h	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,6 @@
 /* default.h: declare default path expander.
 
-   Copyright 1993, 1994, 2008, 2011 Karl Berry.
+   Copyright 1993, 1994, 2008, 2011, 2017 Karl Berry.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -26,6 +26,7 @@
 
 /* Replace a leading or trailing or doubled : in PATH with DFLT.  If
    no extra colons, return PATH.  Only one extra colon is replaced.
+   If PATH is NULL or the empty string, DFLT is returned.
    DFLT may not be NULL.  The result is always in new memory.  */
 
 extern string kpathsea_expand_default (kpathsea kpse, const_string path,

Modified: branches/stable/source/src/texk/kpathsea/doc/kpathsea.info
===================================================================
--- branches/stable/source/src/texk/kpathsea/doc/kpathsea.info	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/kpathsea/doc/kpathsea.info	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,4 +1,4 @@
-This is kpathsea.info, produced by makeinfo version 6.3 from
+This is kpathsea.info, produced by makeinfo version 6.5 from
 kpathsea.texi.
 
 This file documents the Kpathsea library for path searching.
@@ -200,31 +200,30 @@
 2 'unixtex.ftp': Obtaining TeX
 ******************************
 
-This is <ftp://ftp.tug.org/tex/unixtex.ftp>, last updated 13 June 2010.
-Also available as <http://www.tug.org/unixtex.ftp>.  Email
-<tex-k at tug.org> with comments or questions.
+This is <https://tug.org/tex/unixtex.ftp>, last updated 28 November
+2017.  Email <tex-k at tug.org> with comments or questions.
 
    The principal free TeX distribution for Unix-like systems is TeX
 Live, on the web at <http://tug.org/texlive>.  The pages there describe
-many ways to acquire and build TeX, over the Internet or on physical
+many ways to acquire and.or build TeX, over the Internet or on physical
 media, both the sources and precompiled binaries for many systems,
 either standalone or as part of various operating system distributions.
 
-   Web2C, Kpathsea, Dvips, and Dviljk are no longer released as a
+   Web2c, Kpathsea, Dvips, and Dviljk are no longer released as a
 separate packages.  Their sources are now maintained as part of TeX
 Live.
 
    The host ftp.cs.stanford.edu is the original source for the files for
 which Donald Knuth is directly responsible: 'tex.web', 'plain.tex', etc.
-However, unless you want to undertake the very significant project of
-building your TeX installation from scratch, it is far more reliable and
-less work to retrieve these files as part of a larger package
+However, unless you want to undertake the project of building your TeX
+installation from scratch, it is more reliable and less work to retrieve
+these files as part of a larger package.
 
    In any case, the Stanford ftp site is not the canonical source for
 anything except what was created as part of Knuth's original TeX, so do
 not rely on any other files available there being up-to-date.  The best
 place to check for up-to-date files is CTAN (the Comprehensive TeX
-Archive Network), <http://www.ctan.org>.
+Archive Network), <https://ctan.org>.
 
 
 File: kpathsea.info,  Node: Security,  Next: TeX directory structure,  Prev: unixtex.ftp,  Up: Top
@@ -1733,14 +1732,22 @@
 
    The format of fontmap files is straightforward:
 
-   * Comments start with '%' and continue to the end of the line.
+   * Comments start with the last '%' on a line and continue to the end
+     of the line.  (This provides for names that include a %,
+     ill-advised as that may be.)
+
    * Blank lines are ignored.
+
    * Each nonblank line is broken up into a series of "words": a
      sequence of non-whitespace characters.
+
    * If the first word is 'include', the second word is used as a
      filename, and it is searched for and read.
+
    * Otherwise, the first word on each line is the true filename;
+
    * the second word is the alias;
+
    * subsequent words are ignored.
 
    If an alias has an extension, it matches only those files with that
@@ -3142,7 +3149,7 @@
                                                               (line 239)
 * fopen, redefined:                      Debugging.           (line  54)
 * format of external database:           Database format.     (line   6)
-* ftp.cs.stanford.edu:                   unixtex.ftp.         (line  20)
+* ftp.cs.stanford.edu:                   unixtex.ftp.         (line  19)
 * ftp.tug.org:                           unixtex.ftp.         (line   6)
 * fundamental purpose of Kpathsea:       Introduction.        (line   6)
 * gdb, recommended:                      Bug checklist.       (line  58)
@@ -3172,7 +3179,7 @@
 * home directories in paths:             Tilde expansion.     (line   6)
 * HOME, as ~ expansion:                  Tilde expansion.     (line   6)
 * identifiers, characters valid in:      Config files.        (line  47)
-* include fontmap directive:             Fontmap.             (line  30)
+* include fontmap directive:             Fontmap.             (line  36)
 * INDEXSTYLE:                            Supported file formats.
                                                               (line  84)
 * input lines, reading:                  Calling sequence.    (line 110)
@@ -3183,7 +3190,7 @@
 * kdebug::                               Debugging.           (line 105)
 * kdefault.c:                            Default expansion.   (line  48)
 * Knuth, Donald E.:                      History.             (line   6)
-* Knuth, Donald E., archive of programs by: unixtex.ftp.      (line  20)
+* Knuth, Donald E., archive of programs by: unixtex.ftp.      (line  19)
 * Kpathsea config file, source for path: Path sources.        (line  17)
 * kpathsea.h:                            Programming overview.
                                                               (line  24)
@@ -3493,7 +3500,7 @@
                                                               (line  24)
 * tex-k at tug.org:                         Mailing lists.       (line   6)
 * tex-k at tug.org (bug address):           Reporting bugs.      (line   6)
-* tex.web:                               unixtex.ftp.         (line  20)
+* tex.web:                               unixtex.ftp.         (line  19)
 * TEXBIB:                                Supported file formats.
                                                               (line  30)
 * TEXBIB <1>:                            Supported file formats.
@@ -3621,7 +3628,7 @@
 * Weber, Olaf:                           History.             (line  73)
 * WEBINPUTS:                             Supported file formats.
                                                               (line 223)
-* whitespace, in fontmap files:          Fontmap.             (line  27)
+* whitespace, in fontmap files:          Fontmap.             (line  31)
 * whitespace, not ignored on continuation lines: Config files.
                                                               (line  37)
 * www.tug.org:                           unixtex.ftp.         (line   6)
@@ -3640,55 +3647,55 @@
 Node: Introduction2259
 Node: History4204
 Node: unixtex.ftp8801
-Node: Security10296
-Node: TeX directory structure12800
-Node: Path searching16848
-Node: Searching overview17506
-Node: Path sources20901
-Node: Config files21959
-Node: Path expansion25886
-Node: Default expansion26835
-Node: Variable expansion28905
-Node: Tilde expansion30306
-Node: Brace expansion31286
-Node: KPSE_DOT expansion32211
-Node: Subdirectory expansion32724
-Node: Filename database35078
-Node: ls-R36132
-Node: Filename aliases39027
-Node: Database format40205
-Node: Invoking kpsewhich41218
-Node: Path searching options42173
-Node: Specially-recognized files50093
-Node: Auxiliary tasks51448
-Node: Standard options53787
-Node: TeX support54143
-Node: Supported file formats55495
-Node: File lookup63160
-Node: Glyph lookup64909
-Node: Basic glyph lookup66033
-Node: Fontmap66913
-Node: Fallback font69334
-Node: Suppressing warnings70246
-Node: mktex scripts71373
-Node: mktex configuration72588
-Node: mktex script names78391
-Node: mktex script arguments79777
-Node: Programming80656
-Node: Programming overview81178
-Node: Calling sequence83875
-Node: Program-specific files90407
-Node: Programming with config files91430
-Node: Reporting bugs92742
-Node: Bug checklist93420
-Node: Mailing lists96892
-Node: Debugging97567
-Node: Logging102644
-Node: Common problems104511
-Node: Unable to find files104988
-Node: Slow path searching107398
-Node: Unable to generate fonts108773
-Node: TeX or Metafont failing111244
-Node: Index112597
+Node: Security10226
+Node: TeX directory structure12730
+Node: Path searching16778
+Node: Searching overview17436
+Node: Path sources20831
+Node: Config files21889
+Node: Path expansion25816
+Node: Default expansion26765
+Node: Variable expansion28835
+Node: Tilde expansion30236
+Node: Brace expansion31216
+Node: KPSE_DOT expansion32141
+Node: Subdirectory expansion32654
+Node: Filename database35008
+Node: ls-R36062
+Node: Filename aliases38957
+Node: Database format40135
+Node: Invoking kpsewhich41148
+Node: Path searching options42103
+Node: Specially-recognized files50023
+Node: Auxiliary tasks51378
+Node: Standard options53717
+Node: TeX support54073
+Node: Supported file formats55425
+Node: File lookup63090
+Node: Glyph lookup64839
+Node: Basic glyph lookup65963
+Node: Fontmap66843
+Node: Fallback font69372
+Node: Suppressing warnings70284
+Node: mktex scripts71411
+Node: mktex configuration72626
+Node: mktex script names78429
+Node: mktex script arguments79815
+Node: Programming80694
+Node: Programming overview81216
+Node: Calling sequence83913
+Node: Program-specific files90445
+Node: Programming with config files91468
+Node: Reporting bugs92780
+Node: Bug checklist93458
+Node: Mailing lists96930
+Node: Debugging97605
+Node: Logging102682
+Node: Common problems104549
+Node: Unable to find files105026
+Node: Slow path searching107436
+Node: Unable to generate fonts108811
+Node: TeX or Metafont failing111282
+Node: Index112635
 
 End Tag Table

Modified: branches/stable/source/src/texk/kpathsea/doc/kpathsea.texi
===================================================================
--- branches/stable/source/src/texk/kpathsea/doc/kpathsea.texi	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/kpathsea/doc/kpathsea.texi	2017-12-15 16:53:58 UTC (rev 787)
@@ -2318,16 +2318,24 @@
 
 @itemize @bullet
 @cindex comments, in fontmap files
- at item Comments start with @samp{%} and continue to the end of the line.
+ at item Comments start with the last @samp{%} on a line and continue to
+the end of the line. (This provides for names that include a %,
+ill-advised as that may be.)
+
 @cindex whitespace, in fontmap files
 @item Blank lines are ignored.
+
 @item Each nonblank line is broken up into a series of @dfn{words}:
   a sequence of non-whitespace characters.
+
 @findex include @r{fontmap directive}
 @item If the first word is @samp{include}, the second word is used as
   a filename, and it is searched for and read.
+
 @item Otherwise, the first word on each line is the true filename;
+
 @item the second word is the alias;
+
 @item subsequent words are ignored.
 @end itemize
 

Modified: branches/stable/source/src/texk/kpathsea/doc/unixtex.texi
===================================================================
--- branches/stable/source/src/texk/kpathsea/doc/unixtex.texi	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/kpathsea/doc/unixtex.texi	2017-12-15 16:53:58 UTC (rev 787)
@@ -17,18 +17,17 @@
 @iftex
 chapter
 @end iftex
-is @uref{ftp://ftp.tug.org/tex/unixtex.ftp}, last updated 13 June
-2010.  Also available as @uref{http://www.tug.org/unixtex.ftp}.  Email
- at email{tex-k@@tug.org} with comments or questions.
+is @uref{https://tug.org/tex/unixtex.ftp}, last updated 28 November
+2017.  Email @email{tex-k@@tug.org} with comments or questions.
 
 The principal free @TeX{} distribution for Unix-like systems is @TeX{}
 Live, on the web at @url{http://tug.org/texlive}.  The pages there
-describe many ways to acquire and build @TeX{}, over the Internet or
-on physical media, both the sources and precompiled binaries for many
-systems, either standalone or as part of various operating system
+describe many ways to acquire and.or build @TeX{}, over the Internet
+or on physical media, both the sources and precompiled binaries for
+many systems, either standalone or as part of various operating system
 distributions.
 
-Web2C, Kpathsea, Dvips, and Dviljk are no longer released as a
+Web2c, Kpathsea, Dvips, and Dviljk are no longer released as a
 separate packages.  Their sources are now maintained as part of @TeX{}
 Live.
 
@@ -37,14 +36,14 @@
 @cindex Knuth, Donald E., archive of programs by
 The host @t{ftp.cs.stanford.edu} is the original source for the files
 for which Donald Knuth is directly responsible: @file{tex.web},
- at file{plain.tex}, etc. However, unless you want to undertake the very
-significant project of building your @TeX{} installation from scratch,
-it is far more reliable and less work to retrieve these files as part
-of a larger package
+ at file{plain.tex}, etc. However, unless you want to undertake the
+project of building your @TeX{} installation from scratch, it is more
+reliable and less work to retrieve these files as part of a larger
+package.
 
 In any case, the Stanford ftp site is not the canonical source for
 anything except what was created as part of Knuth's original @TeX{},
 so do not rely on any other files available there being up-to-date.
 The best place to check for up-to-date files is CTAN (the
-Comprehensive @TeX{} Archive Network), @url{http://www.ctan.org}.
+Comprehensive @TeX{} Archive Network), @url{https://ctan.org}.
 

Modified: branches/stable/source/src/texk/kpathsea/hash.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/hash.c	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/kpathsea/hash.c	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,6 @@
 /* hash.c: hash table operations.
 
-   Copyright 1994-2000, 2002, 2005, 2008, 2012, 2016
+   Copyright 1994-2000, 2002, 2005, 2008, 2012, 2016, 2017
    Karl Berry & Olaf Weber.
 
    This library is free software; you can redistribute it and/or
@@ -46,7 +46,7 @@
   return n;
 }
 
-/* Identical has function as above, but does not normalize keys. */
+/* Identical hash function as above, but does not normalize keys. */
 static unsigned
 hash_normalized (hash_table_type table,  const_string key)
 {

Modified: branches/stable/source/src/texk/kpathsea/kdefault.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/kdefault.c	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/kpathsea/kdefault.c	2017-12-15 16:53:58 UTC (rev 787)
@@ -3,7 +3,7 @@
    make a program `default' from it, since we have a target `default';
    and OSF/1 make doesn't understand .PHONY.)
 
-   Copyright 1993, 1994, 1996, 2008, 2009, 2011 Karl Berry.
+   Copyright 1993, 1994, 1996, 2008, 2009, 2011, 2017 Karl Berry.
    Copyright 2002, 2005 Olaf Weber.
 
    This library is free software; you can redistribute it and/or
@@ -34,12 +34,13 @@
 {
   unsigned path_length;
   string expansion;
-  (void)kpse; /* currenty not used */
 
+  (void) kpse; /* unused */
+
   /* The default path better not be null.  */
   assert (fallback);
 
-  if (path == NULL)
+  if (path == NULL || *path == 0)
     expansion = xstrdup (fallback);
 
   /* Solitary or leading :?  */

Modified: branches/stable/source/src/texk/kpathsea/tests/cnfnewline.test
===================================================================
--- branches/stable/source/src/texk/kpathsea/tests/cnfnewline.test	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/kpathsea/tests/cnfnewline.test	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/bin/sh -vx
+# $Id: cnfnewline.test 45809 2017-11-15 00:36:56Z karl $
+# Copyright 2017 Karl Berry <tex-live at tug.org>
 # Copyright 2013 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 

Modified: branches/stable/source/src/texk/kpathsea/tests/kpseaccess.test
===================================================================
--- branches/stable/source/src/texk/kpathsea/tests/kpseaccess.test	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/kpathsea/tests/kpseaccess.test	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,7 @@
-#! /bin/sh
-
-# Copyright (C) 2010 Peter Breitenlohner <tex-live at tug.org>
+#! /bin/sh -vx
+# $Id: kpseaccess.test 45809 2017-11-15 00:36:56Z karl $
+# Copyright 2017 Karl Berry <tex-live at tug.org>
+# Copyright 2010 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
 ret=0

Modified: branches/stable/source/src/texk/kpathsea/tests/kpsereadlink.test
===================================================================
--- branches/stable/source/src/texk/kpathsea/tests/kpsereadlink.test	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/kpathsea/tests/kpsereadlink.test	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,7 @@
-#! /bin/sh
-
-# Copyright (C) 2010 Peter Breitenlohner <tex-live at tug.org>
+#! /bin/sh -vx
+# $Id: kpsereadlink.test 45809 2017-11-15 00:36:56Z karl $
+# Copyright 2017 Karl Berry <tex-live at tug.org>
+# Copyright 2010 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
 test "x$LN_S" = 'xln -s' || exit 77

Modified: branches/stable/source/src/texk/kpathsea/tests/kpsestat.test
===================================================================
--- branches/stable/source/src/texk/kpathsea/tests/kpsestat.test	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/kpathsea/tests/kpsestat.test	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,7 @@
-#! /bin/sh
-
-# Copyright (C) 2010 Peter Breitenlohner <tex-live at tug.org>
+#! /bin/sh -vx
+# $Id: kpsestat.test 45809 2017-11-15 00:36:56Z karl $
+# Copyright 2017 Karl Berry <tex-live at tug.org>
+# Copyright 2010 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
 ./kpsestat = nonesuch 2>/dev/null && exit 1

Modified: branches/stable/source/src/texk/kpathsea/tests/kpsewhich.test
===================================================================
--- branches/stable/source/src/texk/kpathsea/tests/kpsewhich.test	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/kpathsea/tests/kpsewhich.test	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,4 +1,6 @@
-#! /bin/sh
+#! /bin/sh -vx
+# $Id: kpsewhich.test 45809 2017-11-15 00:36:56Z karl $
+# Copyright 2017 Karl Berry <tex-live at tug.org>
 # Copyright 2010-2013 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 

Modified: branches/stable/source/src/texk/kpathsea/tex-file.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/tex-file.c	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/kpathsea/tex-file.c	2017-12-15 16:53:58 UTC (rev 787)
@@ -730,14 +730,16 @@
       break;
     case kpse_program_text_format:
       INIT_FORMAT ("other text files",
-                   concatn (".", ENV_SEP_STRING, "$TEXMF/",
-                            kpse->program_name, "//", NULL),
+                   concatn (".", ENV_SEP_STRING, "$TEXMF", DIR_SEP_STRING,
+                            kpse->program_name,
+                            DIR_SEP_STRING, DIR_SEP_STRING, NULL),
                    concat (uppercasify (kpse->program_name), "INPUTS"));
       break;
     case kpse_program_binary_format:
       INIT_FORMAT ("other binary files",
-                   concatn (".", ENV_SEP_STRING, "$TEXMF/",
-                            kpse->program_name, "//", NULL),
+                   concatn (".", ENV_SEP_STRING, "$TEXMF", DIR_SEP_STRING,
+                            kpse->program_name,
+                            DIR_SEP_STRING, DIR_SEP_STRING, NULL),
                    concat (uppercasify (kpse->program_name), "INPUTS"));
       FMT_INFO.binmode = true;
       break;
@@ -1011,8 +1013,8 @@
                             kpse_file_format_type format,
                             boolean must_exist, boolean all)
 {
-#if defined(_WIN32)
-  char tmpbuffer[512];
+#if defined(_WIN32) && !defined(__MINGW32__)
+  char tmpbuffer1[512], tmpbuffer2[512];
 #endif
   string *target, name;
   const_string *ext;
@@ -1136,22 +1138,23 @@
   }
 
   free (name);
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(__MINGW32__)
   if (ret && *ret) {
-    size_t cplen;
     if (all) {
       for (count = 0; ret[count] != NULL; count++) {
-        if ((cplen = GetLongPathName (ret[count], tmpbuffer, 500))) {
-          if (cplen > strlen (ret[count]))
-            ret[count] = realloc (ret[count], cplen + 1);
-          strcpy (ret[count], tmpbuffer);
+        strcpy (tmpbuffer2, ret[count]);
+        if (kpathsea_getlongpath (kpse, tmpbuffer1, tmpbuffer2, 500)) {
+          if (strlen (tmpbuffer1) > strlen (ret[count]))
+            ret[count] = realloc (ret[count], strlen (tmpbuffer1) + 1);
+          strcpy (ret[count], tmpbuffer1);
         }
       }
     } else {
-      if ((cplen = GetLongPathName (*ret, tmpbuffer, 500))) {
-        if (cplen > strlen (*ret))
-          *ret = realloc (*ret, cplen + 1);
-        strcpy (*ret, tmpbuffer);
+      strcpy (tmpbuffer2, *ret);
+      if (kpathsea_getlongpath (kpse, tmpbuffer1, tmpbuffer2, 500)) {
+        if (strlen (tmpbuffer1) > strlen (*ret))
+          *ret = realloc (*ret, strlen (tmpbuffer1) + 1);
+        strcpy (*ret, tmpbuffer1);
       }
     } 
   }

Modified: branches/stable/source/src/texk/kpathsea/tex-glyph.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/tex-glyph.c	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/kpathsea/tex-glyph.c	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,6 @@
 /* tex-glyph.c: search for GF/PK files.
 
-   Copyright 1993, 1994, 1995, 1996, 2008, 2009, 2011 Karl Berry.
+   Copyright 1993, 1994, 1995, 1996, 2008, 2009, 2011, 2017 Karl Berry.
    Copyright 1997, 1998, 1999, 2005 Olaf Weber.
 
    This library is free software; you can redistribute it and/or
@@ -201,7 +201,10 @@
   /* First find the fallback size closest to DPI, even including DPI.  */
   for (s = 0; kpse->fallback_resolutions[s] != 0; s++)
     {
-      unsigned this_diff = abs (kpse->fallback_resolutions[s] - dpi);
+      unsigned this_diff =
+        kpse->fallback_resolutions[s] > dpi
+          ? kpse->fallback_resolutions[s] - dpi
+          : dpi - kpse->fallback_resolutions[s];
       if (this_diff < closest_diff)
         {
           closest_diff = this_diff;

Modified: branches/stable/source/src/texk/web2c/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/Makefile.in	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/web2c/Makefile.in	2017-12-15 16:53:58 UTC (rev 787)
@@ -14881,6 +14881,12 @@
 # Generate pdftex.ch
 pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs)
 	$(tie_c) $(pdftex_ch_srcs)
+
+# Convenience target for making the typeset output; not invoked automatically
+pdftex.pdf: pdftex.tex
+	env MKTEXFMT=0 pdftex '\nonstopmode\input pdftex.tex'
+pdftex.tex: $(srcdir)/pdftexdir/pdftex.web
+	weave $(srcdir)/pdftexdir/pdftex.web
 pdftexdir/wprob.log pdftexdir/pdftex.log pdftexdir/pdfimage.log: pdftex$(EXEEXT)
 pdftexdir/ttf2afm.log: ttf2afm$(EXEEXT)
 
@@ -15247,7 +15253,7 @@
 synctexdir/synctex.log: synctex$(EXEEXT)
 libmd5/md5.log: md5main$(EXEEXT)
 
-# $Id: Makefile.in 44682 2017-06-24 21:21:08Z karl $
+# $Id: bin_links.am 43248 2017-02-16 21:38:29Z karl $
 # am/bin_links.am: Makefile fragment for bindir links.
 .PHONY: install-bin-links uninstall-bin-links
 

Modified: branches/stable/source/src/texk/web2c/NEWS
===================================================================
--- branches/stable/source/src/texk/web2c/NEWS	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/web2c/NEWS	2017-12-15 16:53:58 UTC (rev 787)
@@ -8,15 +8,20 @@
 2016 (for TeX Live 2016, 21 May 2016)
 2015 (for TeX Live 2015, 21 May 2015)
 2014 (for TeX Live 2014, 24 May 2014)
+* Ditto.
+
 2013 (for TeX Live 2013, 30 May 2013)
+* Doc changes and bug fixes.
+
 2012 (for TeX Live 2012, 1 July 2012)
-* Ditto.
+* upTeX and e-upTeX Japanese engines added.
 
 2011 (for TeX Live 2011, 5 July 2011)
-* Doc changes and bug fixes.
+* epTeX Japanese engine added.
 
 2010 (for TeX Live 2010, 4 June 2010)
 * BibTeX line-breaking bug fix in bibtex.web.
+* pTeX Japanese engine added.
 

 2009 (for TeX Live 2009, 13 October 2009)
 * --shell-restricted aka shell_escape=p for restricted shell access.

Modified: branches/stable/source/src/texk/web2c/configure
===================================================================
--- branches/stable/source/src/texk/web2c/configure	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/web2c/configure	2017-12-15 16:53:58 UTC (rev 787)
@@ -1807,7 +1807,7 @@
   --with-system-teckit    use installed teckit headers and library (requires
                           pkg-config)
   --with-system-icu       use installed ICU headers and libraries (requires
-                          icu-config)
+                          pkg-config or icu-config)
   --with-system-graphite2 use installed graphite2 headers and library
                           (requires pkg-config)
   --with-system-harfbuzz  use installed harfbuzz headers and library (requires
@@ -24214,7 +24214,8 @@
   withval=$with_system_icu;
 fi
 if test "x$with_system_icu" = xyes; then
-  if test -n "$ac_tool_prefix"; then
+  echo 'dbg:_KPSE_ICU_SYSTEM_FLAGS called.' >&5
+if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}icu-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}icu-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -24305,11 +24306,105 @@
 else
   ICU_CONFIG="$ac_cv_prog_ICU_CONFIG"
 fi
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$PKG_CONFIG"; then
+  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_PKG_CONFIG"; then
+  ac_ct_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_PKG_CONFIG"; then
+  ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+if test -n "$ac_ct_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+$as_echo "$ac_ct_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_PKG_CONFIG" = x; then
+    PKG_CONFIG="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_ct_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+fi
 if $ICU_CONFIG --version >/dev/null 2>&1; then
   ICU_INCLUDES=`$ICU_CONFIG --cppflags`
   ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-system`
+elif $PKG_CONFIG --libs icu-uc icu-io >/dev/null 2>&1; then
+  ICU_INCLUDES=`$PKG_CONFIG --cflags icu-uc icu-io`
+  ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io`
 elif test "x$need_icu:$with_system_icu" = xyes:yes; then
-  as_fn_error $? "did not find icu-config required for system icu libraries" "$LINENO" 5
+  as_fn_error $? "did not find either pkg-config or icu-config; one is required for system icu library support" "$LINENO" 5
 fi
 else
   ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include"

Modified: branches/stable/source/src/texk/web2c/cwebdir/cweave.test
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweave.test	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweave.test	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,7 @@
-#! /bin/sh
-
-# Copyright (C) 2009 Peter Breitenlohner <tex-live at tug.org>
+#! /bin/sh -vx
+# $Id: cweave.test 45809 2017-11-15 00:36:56Z karl $
+# Copyright 2017 Karl Berry <tex-live at tug.org>
+# Copyright 2009 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
 TEXMFCNF=$srcdir/../kpathsea \

Modified: branches/stable/source/src/texk/web2c/etexdir/etriptest.test
===================================================================
--- branches/stable/source/src/texk/web2c/etexdir/etriptest.test	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/web2c/etexdir/etriptest.test	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,7 @@
-#! /bin/sh
-
-# Copyright (C) 2009-2014 Peter Breitenlohner <tex-live at tug.org>
+#! /bin/sh -vx
+# $Id: etriptest.test 45809 2017-11-15 00:36:56Z karl $
+# Copyright 2017 Karl Berry <tex-live at tug.org>
+# Copyright 2009-2014 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
 testdir=$abs_srcdir/triptrap

Modified: branches/stable/source/src/texk/web2c/etexdir/wprob.test
===================================================================
--- branches/stable/source/src/texk/web2c/etexdir/wprob.test	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/web2c/etexdir/wprob.test	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,7 @@
-#! /bin/sh
-
-# Copyright (C) 2011-2013 Peter Breitenlohner <tex-live at tug.org>
+#! /bin/sh -vx
+# $Id: wprob.test 45809 2017-11-15 00:36:56Z karl $
+# Copyright 2017 Karl Berry <tex-live at tug.org>
+# Copyright 2011-2013 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
 rm -rf ewprob.*

Modified: branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,7 +1,7 @@
-2017-12-15  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+2017-12-02  Karl Berry  <karl at tug.org>
 
-	* tounicode.c (deftounicode): check that value is in range [0,10FFFF].
-	Original report from Ross Moore, ntg-pdftex 30 May 2017 06:03:04.
+	* am/pdftex.am (pdftex.pdf, pdftex.tex): new convenience targets
+	for simple weave && pdftex to generate typeset output.
 
 2017-11-28  Hironori KITAGAWA <h_kitagawa2001 at yahoo.co.jp>
 

Modified: branches/stable/source/src/texk/web2c/pdftexdir/am/pdftex.am
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/am/pdftex.am	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/web2c/pdftexdir/am/pdftex.am	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,7 @@
 ## texk/web2c/pdftexdir/am/pdftex.am: Makefile fragment for pdfTeX.
 ##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2016-2017 Karl Berry <tex-live at tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 pdftex_cppflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES)
@@ -72,6 +73,13 @@
 	$(pdftex_ch_synctex) \
 	pdftexdir/pdftex.ch \
 	tex-binpool.ch
+
+# Convenience target for making the typeset output; not invoked automatically
+pdftex.pdf: pdftex.tex
+	env MKTEXFMT=0 pdftex '\nonstopmode\input pdftex.tex'
+pdftex.tex: $(srcdir)/pdftexdir/pdftex.web
+	weave $(srcdir)/pdftexdir/pdftex.web
+	
 ##
 EXTRA_DIST += $(pdftex_ch_srcs) pdftexdir/pdftex.defines
 

Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdfimage.test
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdfimage.test	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdfimage.test	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,7 @@
-#! /bin/sh
-#
-# Copyright (C) 2013 Peter Breitenlohner <tex-live at tug.org>
+#! /bin/sh -vx
+# $Id: pdfimage.test 45809 2017-11-15 00:36:56Z karl $
+# Copyright 2017 Karl Berry <tex-live at tug.org>#
+# Copyright 2013 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
 TEXMFCNF=$srcdir/../kpathsea
@@ -13,4 +14,4 @@
 
 ./pdftex -fmt=pdfimage pdfimage || exit 1
 
-exit 0
\ No newline at end of file
+exit 0

Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftex.test
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftex.test	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftex.test	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,7 @@
-#! /bin/sh
-
-# Copyright (C) 2010 Peter Breitenlohner <tex-live at tug.org>
+#! /bin/sh -vx
+# $Id: pdftex.test 45809 2017-11-15 00:36:56Z karl $
+# Copyright 2017 Karl Berry <tex-live at tug.org>
+# Copyright 2010 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
 # Not really a test, just making sure the program executes.

Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc.test
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc.test	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc.test	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,7 @@
-#! /bin/sh
-
-# Copyright (C) 2011 Peter Breitenlohner <tex-live at tug.org>
+#! /bin/sh -vx
+# $Id: pdftosrc.test 45809 2017-11-15 00:36:56Z karl $
+# Copyright 2017 Karl Berry <tex-live at tug.org>
+# Copyright 2011 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
 src=$srcdir/pdftexdir/tests

Modified: branches/stable/source/src/texk/web2c/pdftexdir/tounicode.c
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/tounicode.c	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/web2c/pdftexdir/tounicode.c	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,5 +1,5 @@
 /*
-Copyright 2006-2017 Han The Thanh, <thanh at pdftex.org>
+Copyright 2006-2014 Han The Thanh, <thanh at pdftex.org>
 
 This file is part of pdfTeX.
 
@@ -75,7 +75,7 @@
         p++;                    /* ignore leading spaces */
     l = strlen(p);
     while (l > 0 && p[l - 1] == ' ')
-        l--;                    /* ignore trailing spaces */
+        l--;                    /* ignore traling spaces */
     valid_unistr = 1;           /* a unicode value is the most common case */
     for (i = 0; i < l; i++) {
         if (p[i] == ' ')
@@ -117,11 +117,6 @@
     } else {
         i = sscanf(p, "%lX", &(gu->code));
         assert(i == 1);
-        if (gu->code < 0 || gu->code > 0x10FFFF) {
-            pdftex_warn("ToUnicode: value out of range [0,10FFFF]: %X",
-                        gu->code);
-            gu->code = UNI_UNDEF;
-        }
     }
     aa = avl_probe(glyph_unicode_tree, gu);
     assert(aa != NULL);

Modified: branches/stable/source/src/texk/web2c/pdftexdir/ttf2afm.test
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/ttf2afm.test	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/web2c/pdftexdir/ttf2afm.test	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,7 @@
-#! /bin/sh
-#
-# Copyright (C) 2013 Peter Breitenlohner <tex-live at tug.org>
+#! /bin/sh -vx
+# $Id: ttf2afm.test 45809 2017-11-15 00:36:56Z karl $
+# Copyright 2017 Karl Berry <tex-live at tug.org>#
+# Copyright 2013 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
 TEXMFCNF=$srcdir/../kpathsea

Modified: branches/stable/source/src/texk/web2c/pdftexdir/wprob.test
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/wprob.test	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/web2c/pdftexdir/wprob.test	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,7 @@
-#! /bin/sh
-
-# Copyright (C) 2011-2013 Peter Breitenlohner <tex-live at tug.org>
+#! /bin/sh -vx
+# $Id: wprob.test 45809 2017-11-15 00:36:56Z karl $
+# Copyright 2017 Karl Berry <tex-live at tug.org>
+# Copyright 2011-2013 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
 rm -rf pwprob.*

Modified: branches/stable/source/src/texk/web2c/synctexdir/synctex.test
===================================================================
--- branches/stable/source/src/texk/web2c/synctexdir/synctex.test	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/web2c/synctexdir/synctex.test	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,7 @@
-#! /bin/sh
-
-# Copyright (C) 2014 Peter Breitenlohner <tex-live at tug.org>
+#! /bin/sh -vx
+# $Id: synctex.test 45809 2017-11-15 00:36:56Z karl $
+# Copyright 2017 Karl Berry <tex-live at tug.org>
+# Copyright 2014 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
 ./synctex help || exit 1

Modified: branches/stable/source/src/texk/web2c/tangle.test
===================================================================
--- branches/stable/source/src/texk/web2c/tangle.test	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/web2c/tangle.test	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,7 @@
-#! /bin/sh
-
-# Copyright (C) 2009 Peter Breitenlohner <tex-live at tug.org>
+#! /bin/sh -vx
+# $Id: tangle.test 45809 2017-11-15 00:36:56Z karl $
+# Copyright 2017 Karl Berry <tex-live at tug.org>
+# Copyright 2009 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
 TEXMFCNF=$srcdir/../kpathsea WEBINPUTS=$srcdir/cftests \

Modified: branches/stable/source/src/texk/web2c/tiedir/tie.test
===================================================================
--- branches/stable/source/src/texk/web2c/tiedir/tie.test	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/texk/web2c/tiedir/tie.test	2017-12-15 16:53:58 UTC (rev 787)
@@ -1,6 +1,7 @@
-#! /bin/sh
-
-# Copyright (C) 2009 Peter Breitenlohner <tex-live at tug.org>
+#! /bin/sh -vx
+# $Id: tie.test 45809 2017-11-15 00:36:56Z karl $
+# Copyright 2017 Karl Berry <tex-live at tug.org>
+# Copyright 2009 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
 TEXMFCNF=$srcdir/../kpathsea \

Modified: branches/stable/source/src/utils/Makefile.in
===================================================================
--- branches/stable/source/src/utils/Makefile.in	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/utils/Makefile.in	2017-12-15 16:53:58 UTC (rev 787)
@@ -89,28 +89,107 @@
 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-poppler-flags.m4 \
+	$(top_srcdir)/../m4/kpse-potrace-flags.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/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/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/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/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/poppler/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/potrace/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/lua52/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
@@ -189,7 +268,7 @@
 	../build-aux/config.sub ../build-aux/depcomp \
 	../build-aux/install-sh ../build-aux/ltmain.sh \
 	../build-aux/missing ../build-aux/texinfo.tex \
-	../build-aux/ylwrap README
+	../build-aux/ylwrap ChangeLog README
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)

Modified: branches/stable/source/src/utils/aclocal.m4
===================================================================
--- branches/stable/source/src/utils/aclocal.m4	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/utils/aclocal.m4	2017-12-15 16:53:58 UTC (rev 787)
@@ -1186,18 +1186,32 @@
 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-poppler-flags.m4])
+m4_include([../m4/kpse-potrace-flags.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])

Modified: branches/stable/source/src/utils/configure
===================================================================
--- branches/stable/source/src/utils/configure	2017-12-15 16:40:43 UTC (rev 786)
+++ branches/stable/source/src/utils/configure	2017-12-15 16:53:58 UTC (rev 787)
@@ -694,6 +694,21 @@
 enable_multiplatform
 enable_cxx_runtime_hack
 enable_libtool_hack
+enable_autosp
+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_xpdfopen
 enable_web2c
 with_banner_add
 with_editor
@@ -739,12 +754,85 @@
 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_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_xpdf
 with_system_poppler
+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_potrace
+with_potrace_includes
+with_potrace_libdir
+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
@@ -1393,6 +1481,20 @@
                           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-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-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
@@ -1438,6 +1540,58 @@
   --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-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
   --disable-mktexpk-default   do not run mktexpk if PK font missing
   --disable-mktextfm-default  do not run mktextfm if TFM file missing
@@ -1461,20 +1615,66 @@
 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 (motif/xaw/xaw3d/neXtaw) for xdvi
+                          [default: Motif if available, else 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-xpdf      use installed poppler headers and library instead of
                           xpdf library from TL (requires pkg-config)
   --with-system-poppler   use installed poppler 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-potrace   use installed potrace headers and library
+  --with-potrace-includes=DIR
+                          potrace headers installed in DIR
+  --with-potrace-libdir=DIR
+                          potrace library installed in DIR
+  --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)
 
@@ -3159,7 +3359,285 @@
 esac ;;
 esac
 
+## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir
+## configure options and TL libraries required for vlna
+# Check whether --enable-autosp was given.
+if test "${enable_autosp+set}" = set; then :
+  enableval=$enable_autosp;
+fi
+case $enable_autosp in #(
+  yes|no) :
+     ;; #(
+  *) :
 
+   enable_autosp=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-autosp=$enable_autosp'" >&5
+$as_echo "$as_me: Assuming \`--enable-autosp=$enable_autosp'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-autosp=$enable_autosp'"
+    ;;
+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+set}" = set; then :
+  enableval=$enable_devnag;
+fi
+case $enable_devnag in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_devnag=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-devnag=$enable_devnag'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_lacheck;
+fi
+case $enable_lacheck in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_lacheck=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-lacheck=$enable_lacheck'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_m_tx;
+fi
+case $enable_m_tx in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_m_tx=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-m-tx=$enable_m_tx'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_pmx;
+fi
+case $enable_pmx in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_pmx=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-pmx=$enable_pmx'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_ps2eps;
+fi
+case $enable_ps2eps in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ps2eps=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_t1utils;
+fi
+case $enable_t1utils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_t1utils=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-t1utils=$enable_t1utils'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_texdoctk;
+fi
+case $enable_texdoctk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_texdoctk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texdoctk=$enable_texdoctk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_tpic2pdftex;
+fi
+case $enable_tpic2pdftex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_tpic2pdftex=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_vlna;
+fi
+case $enable_vlna in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_vlna=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-vlna=$enable_vlna'" >&5
+$as_echo "$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 the TeX Live subdirectory utils/xindy/
+## configure options and TL libraries required for xindy
+# Check whether --enable-xindy was given.
+if test "${enable_xindy+set}" = set; then :
+  enableval=$enable_xindy;
+fi
+case $enable_xindy in #(
+  yes) :
+    if test "x$cross_compiling" = xyes; then :
+  as_fn_error $? "Unable to cross compile xindy" "$LINENO" 5
+fi ;; #(
+  no) :
+     ;; #(
+  *) :
+    if test "x$cross_compiling" = xyes; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: Cross compiling -> \`--disable-xindy'" >&5
+$as_echo "$as_me: Cross compiling -> \`--disable-xindy'" >&6;}
+            enable_xindy=no
+            ac_configure_args="$ac_configure_args '--disable-xindy'"
+          else
+   enable_xindy=no
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xindy=$enable_xindy'" >&5
+$as_echo "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'"
+   fi ;;
+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+set}" = set; then :
+  enableval=$enable_xindy_rules;
+fi
+# Check whether --enable-xindy-docs was given.
+if test "${enable_xindy_docs+set}" = set; then :
+  enableval=$enable_xindy_docs;
+fi
+
+# Check whether --with-clisp-runtime was given.
+if test "${with_clisp_runtime+set}" = set; 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
+  with_clisp_runtime=system
+fi
+               { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--with-clisp-runtime=$with_clisp_runtime'" >&5
+$as_echo "$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/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+set}" = set; then :
+  enableval=$enable_xpdfopen;
+fi
+if test "x$with_x" = xno; then :
+  case $enable_xpdfopen in #(
+  "") :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: \`--without-x' -> \`--disable-xpdfopen'" >&5
+$as_echo "$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
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xpdfopen=$enable_xpdfopen'" >&5
+$as_echo "$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
 # Check whether --enable-web2c was given.
@@ -3574,7 +4052,964 @@
 fi
 
 
+## 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+set}" = set; then :
+  enableval=$enable_afm2pl;
+fi
+case $enable_afm2pl in #(
+  yes|no) :
+     ;; #(
+  *) :
 
+   enable_afm2pl=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&5
+$as_echo "$as_me: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-afm2pl=$enable_afm2pl'"
+    ;;
+esac
+
+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+set}" = set; then :
+  enableval=$enable_bibtex_x;
+fi
+case $enable_bibtex_x in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_bibtex_x=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-bibtex-x=$enable_bibtex_x'" >&5
+$as_echo "$as_me: Assuming \`--enable-bibtex-x=$enable_bibtex_x'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-bibtex-x=$enable_bibtex_x'"
+    ;;
+esac
+
+test "x$enable_bibtex_x" = xno || {
+  need_kpathsea=yes
+}
+
+## 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+set}" = set; then :
+  enableval=$enable_bibtex8;
+fi
+
+case $enable_bibtex8 in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_bibtex8=yes ;;
+esac
+# Check whether --enable-bibtexu was given.
+if test "${enable_bibtexu+set}" = set; then :
+  enableval=$enable_bibtexu;
+fi
+
+case $enable_bibtexu in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_bibtexu=yes ;;
+esac
+
+test "x$enable_bibtex_x:$enable_bibtexu" = xyes:yes && need_icu=yes
+
+## 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+set}" = set; then :
+  enableval=$enable_chktex;
+fi
+case $enable_chktex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_chktex=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-chktex=$enable_chktex'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_cjkutils;
+fi
+case $enable_cjkutils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_cjkutils=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_detex;
+fi
+case $enable_detex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_detex=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-detex=$enable_detex'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dtl;
+fi
+case $enable_dtl in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dtl=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dtl=$enable_dtl'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dvi2tty;
+fi
+case $enable_dvi2tty in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvi2tty=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dvidvi;
+fi
+case $enable_dvidvi in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvidvi=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dviljk;
+fi
+case $enable_dviljk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dviljk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dviljk=$enable_dviljk'" >&5
+$as_echo "$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/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+set}" = set; then :
+  enableval=$enable_dvipdfm_x;
+fi
+case $enable_dvipdfm_x in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipdfm_x=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipdfm-x=$enable_dvipdfm_x'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dvipng;
+fi
+case $enable_dvipng in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipng=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipng=$enable_dvipng'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_debug;
+fi
+
+# Check whether --enable-timing was given.
+if test "${enable_timing+set}" = set; then :
+  enableval=$enable_timing;
+fi
+
+
+# Check whether --with-gs was given.
+if test "${with_gs+set}" = set; 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+set}" = set; then :
+  enableval=$enable_dvipos;
+fi
+case $enable_dvipos in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipos=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipos=$enable_dvipos'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dvipsk;
+fi
+case $enable_dvipsk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvipsk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_dvisvgm;
+fi
+case $enable_dvisvgm in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dvisvgm=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvisvgm=$enable_dvisvgm'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_gregorio;
+fi
+case $enable_gregorio in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_gregorio=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-gregorio=$enable_gregorio'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_gsftopk;
+fi
+case $enable_gsftopk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_gsftopk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_lcdf_typetools;
+fi
+case $enable_lcdf_typetools in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_lcdf_typetools=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_cfftot1;
+fi
+# Check whether --enable-mmafm was given.
+if test "${enable_mmafm+set}" = set; then :
+  enableval=$enable_mmafm;
+fi
+# Check whether --enable-mmpfb was given.
+if test "${enable_mmpfb+set}" = set; then :
+  enableval=$enable_mmpfb;
+fi
+# Check whether --enable-otfinfo was given.
+if test "${enable_otfinfo+set}" = set; then :
+  enableval=$enable_otfinfo;
+fi
+# Check whether --enable-otftotfm was given.
+if test "${enable_otftotfm+set}" = set; then :
+  enableval=$enable_otftotfm;
+fi
+# Check whether --enable-t1dotlessj was given.
+if test "${enable_t1dotlessj+set}" = set; then :
+  enableval=$enable_t1dotlessj;
+fi
+# Check whether --enable-t1lint was given.
+if test "${enable_t1lint+set}" = set; then :
+  enableval=$enable_t1lint;
+fi
+# Check whether --enable-t1rawafm was given.
+if test "${enable_t1rawafm+set}" = set; then :
+  enableval=$enable_t1rawafm;
+fi
+# Check whether --enable-t1reencode was given.
+if test "${enable_t1reencode+set}" = set; then :
+  enableval=$enable_t1reencode;
+fi
+# Check whether --enable-t1testpage was given.
+if test "${enable_t1testpage+set}" = set; then :
+  enableval=$enable_t1testpage;
+fi
+# Check whether --enable-ttftotype42 was given.
+if test "${enable_ttftotype42+set}" = set; then :
+  enableval=$enable_ttftotype42;
+fi
+
+# Check whether --enable-cfftot1 was given.
+if test "${enable_cfftot1+set}" = set; then :
+  enableval=$enable_cfftot1;
+fi
+# Check whether --enable-t1dotlessj was given.
+if test "${enable_t1dotlessj+set}" = set; then :
+  enableval=$enable_t1dotlessj;
+fi
+# Check whether --enable-ttftotype42 was given.
+if test "${enable_ttftotype42+set}" = set; then :
+  enableval=$enable_ttftotype42;
+fi
+# Check whether --enable-updmap was given.
+if test "${enable_updmap+set}" = set; 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+set}" = set; then :
+  enableval=$enable_makeindexk;
+fi
+case $enable_makeindexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_makeindexk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_makejvf;
+fi
+case $enable_makejvf in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_makejvf=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-makejvf=$enable_makejvf'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_mendexk;
+fi
+case $enable_mendexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_mendexk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-mendexk=$enable_mendexk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_musixtnt;
+fi
+case $enable_musixtnt in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_musixtnt=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-musixtnt=$enable_musixtnt'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_ps2pk;
+fi
+case $enable_ps2pk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ps2pk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_psutils;
+fi
+case $enable_psutils in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_psutils=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-psutils=$enable_psutils'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_seetexk;
+fi
+case $enable_seetexk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_seetexk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-seetexk=$enable_seetexk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_tex4htk;
+fi
+case $enable_tex4htk in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_tex4htk=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_ttf2pk2;
+fi
+case $enable_ttf2pk2 in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ttf2pk2=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_ttfdump;
+fi
+case $enable_ttfdump in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ttfdump=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_upmendex;
+fi
+case $enable_upmendex in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_upmendex=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-upmendex=$enable_upmendex'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_xdvik;
+fi
+if test "x$with_x" = xno; then :
+  case $enable_xdvik in #(
+  "") :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: \`--without-x' -> \`--disable-xdvik'" >&5
+$as_echo "$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
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xdvik=$enable_xdvik'" >&5
+$as_echo "$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+set}" = set; 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+set}" = set; then :
+  enableval=$enable_texlive;
+fi
+case $enable_texlive in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_texlive=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texlive=$enable_texlive'" >&5
+$as_echo "$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+set}" = set; then :
+  enableval=$enable_linked_scripts;
+fi
+
+
+## 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+set}" = set; then :
+  withval=$with_system_harfbuzz;
+fi
+if test "x$with_system_harfbuzz" = x; then
+  if test -f $srcdir/../libs/harfbuzz/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`harfbuzz' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`harfbuzz' headers and library from TL tree" >&6;}
+    with_system_harfbuzz=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`harfbuzz' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`graphite2' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`icu' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_icu;
+fi
+if test "x$with_system_icu" = x; then
+  if test -f $srcdir/../libs/icu/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`icu' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`icu' headers and library from TL tree" >&6;}
+    with_system_icu=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`icu' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_teckit;
+fi
+if test "x$with_system_teckit" = x; then
+  if test -f $srcdir/../libs/teckit/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`teckit' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`teckit' headers and library from TL tree" >&6;}
+    with_system_teckit=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`teckit' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_graphite2;
+fi
+if test "x$with_system_graphite2" = x; then
+  if test -f $srcdir/../libs/graphite2/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`graphite2' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`graphite2' headers and library from TL tree" >&6;}
+    with_system_graphite2=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`graphite2' headers and library" >&5
+$as_echo "$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
+
+# Check whether --with-system-zziplib was given.
+if test "${with_system_zziplib+set}" = set; then :
+  withval=$with_system_zziplib;
+fi
+if test "x$with_system_zziplib" = x; then
+  if test -f $srcdir/../libs/zziplib/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`zziplib' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`zziplib' headers and library from TL tree" >&6;}
+    with_system_zziplib=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`zziplib' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`zziplib' headers and library" >&6;}
+    with_system_zziplib=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-zziplib=$with_system_zziplib'"
+fi
+if test "x$with_system_zziplib" = xyes; then
+  if test "x$with_system_zlib" = x; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
+$as_echo "$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-zziplib' requires \`--with-system-zlib'" "$LINENO" 5
+  fi
+fi
+
+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
 
@@ -3629,6 +5064,251 @@
   need_zlib=yes
 }
 
+## 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+set}" = set; then :
+  withval=$with_system_mpfr;
+fi
+
+# Check whether --with-mpfr-includes was given.
+if test "${with_mpfr_includes+set}" = set; then :
+  withval=$with_mpfr_includes;
+fi
+
+# Check whether --with-mpfr-libdir was given.
+if test "${with_mpfr_libdir+set}" = set; then :
+  withval=$with_mpfr_libdir;
+fi
+if test "x$with_system_mpfr" = x; then
+  if test -f $srcdir/../libs/mpfr/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`mpfr' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`mpfr' headers and library from TL tree" >&6;}
+    with_system_mpfr=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`mpfr' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`gmp' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_gmp;
+fi
+
+# Check whether --with-gmp-includes was given.
+if test "${with_gmp_includes+set}" = set; then :
+  withval=$with_gmp_includes;
+fi
+
+# Check whether --with-gmp-libdir was given.
+if test "${with_gmp_libdir+set}" = set; then :
+  withval=$with_gmp_libdir;
+fi
+if test "x$with_system_gmp" = x; then
+  if test -f $srcdir/../libs/gmp/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`gmp' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`gmp' headers and library from TL tree" >&6;}
+    with_system_gmp=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`gmp' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_cairo;
+fi
+if test "x$with_system_cairo" = x; then
+  if test -f $srcdir/../libs/cairo/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`cairo' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`cairo' headers and library from TL tree" >&6;}
+    with_system_cairo=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`cairo' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`pixman' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_pixman;
+fi
+if test "x$with_system_pixman" = x; then
+  if test -f $srcdir/../libs/pixman/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`pixman' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`pixman' headers and library from TL tree" >&6;}
+    with_system_pixman=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`pixman' headers and library" >&5
+$as_echo "$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/potrace/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/potrace/
+## configure options and TL libraries required for potrace
+
+# Check whether --with-system-potrace was given.
+if test "${with_system_potrace+set}" = set; then :
+  withval=$with_system_potrace;
+fi
+
+# Check whether --with-potrace-includes was given.
+if test "${with_potrace_includes+set}" = set; then :
+  withval=$with_potrace_includes;
+fi
+
+# Check whether --with-potrace-libdir was given.
+if test "${with_potrace_libdir+set}" = set; then :
+  withval=$with_potrace_libdir;
+fi
+if test "x$with_system_potrace" = x; then
+  if test -f $srcdir/../libs/potrace/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`potrace' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`potrace' headers and library from TL tree" >&6;}
+    with_system_potrace=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`potrace' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`potrace' headers and library" >&6;}
+    with_system_potrace=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-potrace=$with_system_potrace'"
+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+set}" = set; then :
+  withval=$with_system_gd;
+fi
+
+# Check whether --with-gd-includes was given.
+if test "${with_gd_includes+set}" = set; then :
+  withval=$with_gd_includes;
+fi
+
+# Check whether --with-gd-libdir was given.
+if test "${with_gd_libdir+set}" = set; then :
+  withval=$with_gd_libdir;
+fi
+if test "x$with_system_gd" = x; then
+  if test -f $srcdir/../libs/gd/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`gd' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`gd' headers and library from TL tree" >&6;}
+    with_system_gd=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`gd' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`libpng' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`freetype2' headers and library" >&5
+$as_echo "$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+set}" = set; then :
+  withval=$with_system_freetype2;
+fi
+if test "x$with_system_freetype2" = x; then
+  if test -f $srcdir/../libs/freetype2/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`freetype2' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`freetype2' headers and library from TL tree" >&6;}
+    with_system_freetype2=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`freetype2' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
+$as_echo "$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
 
@@ -3663,6 +5343,42 @@
   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+set}" = set; then :
+  withval=$with_system_libpaper;
+fi
+
+# Check whether --with-libpaper-includes was given.
+if test "${with_libpaper_includes+set}" = set; then :
+  withval=$with_libpaper_includes;
+fi
+
+# Check whether --with-libpaper-libdir was given.
+if test "${with_libpaper_libdir+set}" = set; then :
+  withval=$with_libpaper_libdir;
+fi
+if test "x$with_system_libpaper" = x; then
+  if test -f $srcdir/../libs/libpaper/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`libpaper' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`libpaper' headers and library from TL tree" >&6;}
+    with_system_libpaper=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`libpaper' headers and library" >&5
+$as_echo "$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
+
+## libs/lua52/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/lua52/
+## configure options and TL libraries required for lua52
+
 ## libs/zlib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/
 ## configure options and TL libraries required for zlib
 
@@ -3694,6 +5410,40 @@
 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+set}" = set; then :
+  withval=$with_system_ptexenc;
+fi
+if test "x$with_system_ptexenc" = x; then
+  if test -f $srcdir/../texk/ptexenc/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`ptexenc' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`ptexenc' headers and library from TL tree" >&6;}
+    with_system_ptexenc=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`ptexenc' headers and library" >&5
+$as_echo "$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
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`kpathsea' headers and library" >&5
+$as_echo "$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
 
@@ -4647,6 +6397,54 @@
 echo 'dbg:_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"
+fi
+if test -x $srcdir/devnag/configure; then
+  test "x$enable_devnag" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS devnag"
+  CONF_SUBDIRS="$CONF_SUBDIRS devnag"
+fi
+if test -x $srcdir/lacheck/configure; then
+  test "x$enable_lacheck" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS lacheck"
+  CONF_SUBDIRS="$CONF_SUBDIRS lacheck"
+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"
+fi
+if test -x $srcdir/pmx/configure; then
+  test "x$enable_pmx" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS pmx"
+  CONF_SUBDIRS="$CONF_SUBDIRS pmx"
+fi
+if test -x $srcdir/ps2eps/configure; then
+  test "x$enable_ps2eps" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ps2eps"
+  CONF_SUBDIRS="$CONF_SUBDIRS ps2eps"
+fi
+if test -x $srcdir/t1utils/configure; then
+  test "x$enable_t1utils" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS t1utils"
+  CONF_SUBDIRS="$CONF_SUBDIRS t1utils"
+fi
+if test -x $srcdir/texdoctk/configure; then
+  test "x$enable_texdoctk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS texdoctk"
+  CONF_SUBDIRS="$CONF_SUBDIRS texdoctk"
+fi
+if test -x $srcdir/tpic2pdftex/configure; then
+  test "x$enable_tpic2pdftex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS tpic2pdftex"
+  CONF_SUBDIRS="$CONF_SUBDIRS tpic2pdftex"
+fi
+if test -x $srcdir/vlna/configure; then
+  test "x$enable_vlna" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS vlna"
+  CONF_SUBDIRS="$CONF_SUBDIRS vlna"
+fi
+if test -x $srcdir/xindy/configure; then
+  test "x$enable_xindy" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS xindy"
+  CONF_SUBDIRS="$CONF_SUBDIRS xindy"
+fi
+if test -x $srcdir/xpdfopen/configure; then
+  test "x$enable_xpdfopen" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS xpdfopen"
+  CONF_SUBDIRS="$CONF_SUBDIRS xpdfopen"
+fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
 $as_echo "$MAKE_SUBDIRS" >&6; }



More information about the pdftex-commits mailing list