print/tex-luatex: Enable the new luahbtex engine

- There was an error in the MASTER_SITES but as the port shares the same distfile among other ports the error was never triggered. Reported by: tcberner
2023-07-17 19:03:12 +02:00 · 2023-07-17 19:03:12 +02:00 · cc6c8649d4
parent ad3475984c
commit cc6c8649d4
4 changed files with 73 additions and 731 deletions
--- a/Mk/Uses/tex.mk
+++ b/Mk/Uses/tex.mk
@ -386,7 +386,7 @@ TEX_FORMAT_LUATEX?= \
 	"luatex luatex language.def,language.dat.lua luatex.ini" \
 	"dviluatex luatex language.def,language.dat.lua dviluatex.ini" \
 	"dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini" \
-	"lualatex luatex language.dat,language.dat.lua lualatex.ini" \
+	"lualatex luahbtex language.dat,language.dat.lua lualatex.ini" \
 	"luajittex luajittex language.def,language.dat.lua luatex.ini" \
 	"pdfcsplain luatex - -etex csplain.ini" \
 	"lollipop luatex - lollipop.ini"
@ -397,15 +397,16 @@ TEX_FORMAT_LUATEX_FILES= \
 	${TEXMFVARDIR}/web2c/luatex/dvilualatex.fmt \
 	${TEXMFVARDIR}/web2c/luatex/luatex.log \
 	${TEXMFVARDIR}/web2c/luatex/luatex.fmt \
-	${TEXMFVARDIR}/web2c/luatex/lualatex.log \
-	${TEXMFVARDIR}/web2c/luatex/lualatex.fmt \
 	${TEXMFVARDIR}/web2c/luatex/pdfcsplain.log \
 	${TEXMFVARDIR}/web2c/luatex/pdfcsplain.fmt \
+	${TEXMFVARDIR}/web2c/luahbtex/lualatex.fmt \
+	${TEXMFVARDIR}/web2c/luahbtex/lualatex.log \
 	${TEXMFVARDIR}/web2c/luajittex/luajittex.log \
 	${TEXMFVARDIR}/web2c/luajittex/luajittex.fmt
 TEX_FORMAT_LUATEX_BIN= \
 	bin/dviluatex \
 	bin/dvilualatex \
+	bin/luahbtex \
 	bin/luajittex \
 	bin/lualatex \
 	bin/lualollipop \
@ -418,9 +419,9 @@ TEX_FORMAT_LUATEX_DIRS=	\
 	${TEXMFVARDIR}/web2c/luatex \
 	${TEXMFVARDIR}/web2c/luajittex
 post-install-luatex:
+	${LN} -sf luahbtex ${STAGEDIR}${PREFIX}/bin/lualatex
 	${LN} -sf luatex ${STAGEDIR}${PREFIX}/bin/dviluatex
 	${LN} -sf luatex ${STAGEDIR}${PREFIX}/bin/dvilualatex
-	${LN} -sf luatex ${STAGEDIR}${PREFIX}/bin/lualatex
 	${LN} -sf luatex ${STAGEDIR}${PREFIX}/bin/lualollipop
 	${LN} -sf luatex ${STAGEDIR}${PREFIX}/bin/texlua
 	${LN} -sf luatex ${STAGEDIR}${PREFIX}/bin/texluac
--- a/print/tex-luatex/Makefile
+++ b/print/tex-luatex/Makefile
@ -1,7 +1,8 @@
 PORTNAME=	luatex
 PORTVERSION=	1.16.0
+PORTREVISION=	1
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
+MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
 PKGNAMEPREFIX=	tex-
 DISTNAME=	texlive-${TEXLIVE_VERSION}-source
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@ -12,8 +13,13 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	tex@FreeBSD.org
 COMMENT=	Extended version of pdfTeX using Lua

-LIB_DEPENDS=	libmpfr.so:math/mpfr \
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libgmp.so:math/gmp \
+		libgraphite2.so:graphics/graphite2 \
+		libharfbuzz.so:print/harfbuzz \
+		libmpfr.so:math/mpfr \
 		libpng.so:graphics/png \
+		libTECkit.so:textproc/teckit \
 		libzzip.so:devel/zziplib

 USES=		gnome libtool localbase pkgconfig tar:xz tex xorg
@ -26,11 +32,13 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	${EXCLUDE_ENGINES:S/^/--disable-/} \
 			--enable-luajittex \
 			--enable-luatex \
+			--enable-luahbtex \
+			--enable-luajithbtex \
 			--with-system-zlib \
 			--with-system-zziplib \
 			CC="${CC}" \
 			CXX="${CXX}"
-.for L in cairo gmp kpathsea libpng mpfr pixman ptexenc
+.for L in cairo freetype2 gmp graphite2 harfbuzz kpathsea libpng mpfr pixman ptexenc teckit
 CONFIGURE_ARGS+=	--with-$L-include=${LOCALBASE}/include \
 			--with-$L-libdir=${LOCALBASE}/lib \
 			--with-system-$L
@ -60,8 +68,7 @@ EXTRACT_FILES_TEXMF=		texmf-dist/doc/lualatex texmf-dist/doc/luatex \
 WRKSRC=				${WRKDIR}/${DISTNAME}/texk/web2c
 EXCLUDE_ENGINES=		aleph etex pdftex mf mf-nowin ptex eptex uptex \
 				euptex otangle mp pmp upmp web2c web-progs \
-				xetex tex synctex mflua mfluajit luahbtex \
-				luajithbtex
+				xetex tex synctex mflua mfluajit
 TEX_FORMATS=			luatex

 TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFVARDIR}
--- a/print/tex-luatex/files/patch-Makefile.in
+++ b/print/tex-luatex/files/patch-Makefile.in
@ -1,4 +1,4 @@
--- Makefile.in.orig	2023-04-07 15:22:30 UTC
+--- Makefile.in.orig	2023-03-08 17:05:16 UTC
 +++ Makefile.in
@@ -101,18 +101,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
 	luajittex$(EXEEXT) luahbtex$(EXEEXT) luajithbtex$(EXEEXT) \
@ -16,11 +16,11 @@
 -	$(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \
 -	$(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \
 -	$(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31)
-+bin_PROGRAMS = luatex$(EXEEXT) luajittex$(EXEEXT)
+bin_PROGRAMS = luahbtex$(EXEEXT) luatex$(EXEEXT) luajittex$(EXEEXT)
 noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
 	$(am__EXEEXT_32) $(am__EXEEXT_33) $(am__EXEEXT_34) \
 	$(am__EXEEXT_35) $(am__EXEEXT_36) $(am__EXEEXT_37) \
-@@ -488,7 +477,7 @@ am__v_AR_0 = @echo "  AR      " $@;
+@@ -488,7 +477,7 @@ ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
 am__v_AR_0 = @echo "  AR      " $@;
@ -29,7 +29,7 @@
 libff_a_AR = $(AR) $(ARFLAGS)
 libff_a_LIBADD =
 am__dirstamp = $(am__leading_dot)dirstamp
-@@ -1234,7 +1223,7 @@ am__v_lt_0 = --silent
+@@ -1234,7 +1223,7 @@ libsynctex_la_OBJECTS = $(am_libsynctex_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@ -38,7 +38,7 @@
 libsynctex_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libsynctex_la_LDFLAGS) $(LDFLAGS) -o $@
-@@ -1699,11 +1688,11 @@ am__v_GEN_0 = @echo "  GEN     " $@;
+@@ -1699,11 +1688,11 @@ am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
@ -52,7 +52,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/w2c
 depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
 am__maybe_remake_depfiles = depfiles
-@@ -2395,7 +2384,7 @@ am__v_CC_0 = @echo "  CC      " $@;
+@@ -2395,7 +2384,7 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOO
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
@ -61,7 +61,7 @@
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-@@ -2403,7 +2392,7 @@ am__v_CCLD_0 = @echo "  CCLD    " $@;
+@@ -2403,7 +2392,7 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
@ -70,7 +70,7 @@
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-@@ -2413,14 +2402,14 @@ am__v_CXX_0 = @echo "  CXX     " $@;
+@@ -2413,14 +2402,14 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LI
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
 am__v_CXX_0 = @echo "  CXX     " $@;
@ -87,7 +87,7 @@
 OBJCXXCOMPILE = $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS)
 LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
-@@ -2430,7 +2419,7 @@ am__v_OBJCXX_0 = @echo "  OBJCXX  " $@;
+@@ -2430,7 +2419,7 @@ LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFL
 AM_V_OBJCXX = $(am__v_OBJCXX_@AM_V@)
 am__v_OBJCXX_ = $(am__v_OBJCXX_@AM_DEFAULT_V@)
 am__v_OBJCXX_0 = @echo "  OBJCXX  " $@;
@ -96,7 +96,7 @@
 OBJCXXLD = $(OBJCXX)
 OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
-@@ -2438,7 +2427,7 @@ am__v_OBJCXXLD_0 = @echo "  OBJCXXLD" $@;
+@@ -2438,7 +2427,7 @@ OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) 
 AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@)
 am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@)
 am__v_OBJCXXLD_0 = @echo "  OBJCXXLD" $@;
@ -105,7 +105,7 @@
 SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
 	$(nodist_libluaffi_a_SOURCES) $(libluaharfbuzz_a_SOURCES) \
 	$(nodist_libluahbtexspecific_a_SOURCES) \
-@@ -2959,14 +2948,16 @@ LUA53_DEFINES = @LUA53_DEFINES@
+@@ -2959,14 +2948,16 @@ LUA52_DEPEND = @LUA52_DEPEND@
 LUA52_INCLUDES = @LUA52_INCLUDES@
 LUA52_LIBS = @LUA52_LIBS@
 LUA53_DEFINES = @LUA53_DEFINES@
@ -128,7 +128,7 @@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
-@@ -3000,7 +2991,8 @@ PPLIB_DEPEND = @PPLIB_DEPEND@
+@@ -3000,7 +2991,8 @@ POTRACE_DEPEND = @POTRACE_DEPEND@
 POTRACE_INCLUDES = @POTRACE_INCLUDES@
 POTRACE_LIBS = @POTRACE_LIBS@
 PPLIB_DEPEND = @PPLIB_DEPEND@
@ -138,7 +138,7 @@
 PPLIB_LIBS = @PPLIB_LIBS@
 PTEXENC_DEPEND = @PTEXENC_DEPEND@
 PTEXENC_INCLUDES = @PTEXENC_INCLUDES@
-@@ -3105,14 +3097,14 @@ version = $(WEB2CVERSION)
+@@ -3105,14 +3097,14 @@ AM_CFLAGS = $(WARNING_CFLAGS)
 AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
 AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
 version = $(WEB2CVERSION)
@ -155,7 +155,7 @@
 EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a libmfluapotrace.a \
 	libmflualpeg.a libmfluaotfcc.a libmfluapotrace.a \
 	libmflualpeg.a libmfluajit.a libmfluaotfcc.a libmfluapotrace.a \
-@@ -3128,7 +3120,7 @@ dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/m
+@@ -3128,7 +3120,7 @@ EXTRA_LTLIBRARIES = libsynctex.la
 lib_LIBRARIES = $(am__append_126)
 lib_LTLIBRARIES = $(am__append_125)
 dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
@ -179,7 +179,7 @@
 install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \
 	$(am__append_39) $(am__append_47) $(am__append_52) \
 	$(am__append_90) $(am__append_95) $(am__append_100) \
-@@ -3711,19 +3697,19 @@ tangle_silent_0 = @echo "  TANGLE  " $@; $(SHELL) ./si
+@@ -3711,19 +3697,19 @@ tangleboot = $(tangle_silent)WEBINPUTS=.:$(srcdir) $(b
 tangle_silent = $(tangle_silent_@AM_V@)
 tangle_silent_ = $(tangle_silent_@AM_DEFAULT_V@)
 tangle_silent_0 = @echo "  TANGLE  " $@; $(SHELL) ./silent-sh $@ #
@ -202,7 +202,7 @@
 tie_c = $(tie) -c $@
 tie_m = $(tie) -m $@
 
-@@ -3732,7 +3718,7 @@ DIFF = diff
+@@ -3732,7 +3718,7 @@ texmf_tangle = WEBINPUTS=.:$(srcdir) AM_V_P=$(AM_V_P) 
 
 # For trip, trap, and other tests
 DIFF = diff
@ -249,7 +249,7 @@
 triptrap_diffs = $(AM_V_GEN)srcdir=$(srcdir) abs_srcdir=$(abs_srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh
 
 # The environment for making dumps.
-@@ -3773,7 +3759,7 @@ cp_silent_0 = @echo "  COPY    " $@;
+@@ -3773,7 +3759,7 @@ dumpenv = TEXMFCNF=../kpathsea
 cp_silent = $(cp_silent_@AM_V@)
 cp_silent_ = $(cp_silent_@AM_DEFAULT_V@)
 cp_silent_0 = @echo "  COPY    " $@;
@ -258,7 +258,7 @@
 nodist_tangle_SOURCES = tangle.c tangle.h
 nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h
 tangleboot_DEPENDENCIES = $(default_dependencies)
-@@ -3820,7 +3806,7 @@ nodist_initex_SOURCES = callexe.c
+@@ -3820,7 +3806,7 @@ nodist_tie_SOURCES = tie.c
 tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
 initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
 nodist_initex_SOURCES = callexe.c
@ -267,7 +267,7 @@
 tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_130)
 
 # With --enable-ipc, TeX may need to link with -lsocket.
-@@ -3848,7 +3834,7 @@ nodist_call_mf_SOURCES = callexe.c
+@@ -3848,7 +3834,7 @@ tex_ch_srcs = \
 tex_tests = triptest.test tests/write18-quote-test.pl tests/tex-closeout.test
 call_mf_CPPFLAGS = -DEXEPROG=\"mf.exe\"
 nodist_call_mf_SOURCES = callexe.c
@ -276,7 +276,7 @@
 dist_mf_SOURCES = mfextra.c
 mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
 mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs)
-@@ -3880,7 +3866,7 @@ nodist_call_mflua_SOURCES = callexe.c
+@@ -3880,7 +3866,7 @@ mf_ch_src = \
 mf_tests = mftraptest.test
 call_mflua_CPPFLAGS = -DEXEPROG=\"mflua.exe\"
 nodist_call_mflua_SOURCES = callexe.c
@ -303,7 +303,7 @@
 
 libmfluapotrace_a_CPPFLAGS = \
 	-I$(top_srcdir)/mfluadir/potrace \
-@@ -4185,7 +4171,7 @@ libmfluapotrace_a_SOURCES = \
+@@ -4185,7 +4171,7 @@ libmfluapotrace_a_CFLAGS = # $(WARNING_CFLAGS)
 #nodist_libmfluapotrace_a_SOURCES = $(libmfluapotrace_sources)
 libmfluapotrace_a_SOURCES = \
 	mfluadir/potrace/luafunc.c \
@ -312,7 +312,7 @@
 
 libmflualpeg_a_CPPFLAGS = \
 	-I$(top_srcdir)/mfluadir/luapeg \
-@@ -4194,11 +4180,11 @@ libmflualpeg_a_SOURCES = \
+@@ -4194,11 +4180,11 @@ libmflualpeg_a_CPPFLAGS = \
 libmflualpeg_a_CFLAGS = # $(WARNING_CFLAGS)
 libmflualpeg_a_SOURCES = \
 	mfluadir/luapeg/lpeg.c \
@ -326,7 +326,7 @@
 dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h
 mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES)  $(POTRACE_INCLUDES) $(LUAJIT_DEFINES)
 mfluajit_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS) $(POTRACE_LIBS)
-@@ -4234,7 +4220,7 @@ libmfluajitlpeg_a_SOURCES = \
+@@ -4234,7 +4220,7 @@ libmfluajitlpeg_a_CPPFLAGS = \
 libmfluajitlpeg_a_CFLAGS = # $(WARNING_CFLAGS)
 libmfluajitlpeg_a_SOURCES = \
 	mfluadir/luapeg/lpeg.c \
@ -335,7 +335,7 @@
 
 mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir
 mpost_LDADD = libmplibcore.a libmplibextramath.a libmplibbackends.a  $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \
-@@ -4242,7 +4228,7 @@ nodist_call_mpost_SOURCES = callexe.c
+@@ -4242,7 +4228,7 @@ mpost_LDADD = libmplibcore.a libmplibextramath.a libmp
 
 call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\"
 nodist_call_mpost_SOURCES = callexe.c
@ -344,7 +344,7 @@
 
 # Creating one file: just one rule
 mp_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/mplibdir $(ctangle)
-@@ -4254,10 +4240,10 @@ nodist_call_pmpost_SOURCES = callexe.c
+@@ -4254,10 +4240,10 @@ mpost_web = mplibdir/mpost.w mplibdir/mpxout.w
 mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest.test
 call_pmpost_CPPFLAGS = -DEXEPROG=\"pmpost.exe\"
 nodist_call_pmpost_SOURCES = callexe.c
@ -357,7 +357,7 @@
 pmpost_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \
 	$(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
 
-@@ -4311,7 +4297,7 @@ nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mp
+@@ -4311,7 +4297,7 @@ libmplibbackends_a_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_I
 	$(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
 
 nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathdecimal_c_h) \
@ -391,7 +391,7 @@
 libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_INCLUDES)
 #liblua53misc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_LUA53_INCLUDES)
 libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) \
-@@ -4892,8 +4878,8 @@ LUA_DEPEND = $(LUA53_DEPEND)
+@@ -4892,8 +4878,8 @@ libff_a_SOURCES = \
 LUA_INCLUDES = $(LUA53_INCLUDES) $(LUA53_DEFINES)
 LUA_LIBS = $(LUA53_LIBS)
 LUA_DEPEND = $(LUA53_DEPEND)
@ -402,7 +402,7 @@
 libluatex_a_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \
 	$(LIBPNG_INCLUDES) $(HARFBUZZ_INCLUDES) $(PPLIB_INCLUDES) \
 	-I$(srcdir)/libmd5 -DpdfTeX -I$(srcdir)/luatexdir \
-@@ -4914,7 +4900,7 @@ dist_libluatex_a_SOURCES = \
+@@ -4914,7 +4900,7 @@ libluajithbtexspecific_a_CPPFLAGS = -DLUATEX_HARFBUZZ_
 dist_libluatex_a_SOURCES = \
 	luatexdir/lua/lstrlibext.c \
 	luatexdir/lua/helpers.c \
@ -411,7 +411,7 @@
 
 nodist_libluatex_a_SOURCES = \
 	$(dist_libluatex_sources) \
-@@ -4932,7 +4918,7 @@ nodist_libluatexspecific_a_SOURCES = \
+@@ -4932,7 +4918,7 @@ nodist_libluajittex_a_SOURCES = \
 
 #dist_libluatexspecific_a_SOURCES =
 nodist_libluatexspecific_a_SOURCES = \
@ -420,7 +420,7 @@
 
 #dist_libluajittexspecific_a_SOURCES =
 nodist_libluajittexspecific_a_SOURCES = \
-@@ -4940,46 +4926,46 @@ nodist_libluahbtexspecific_a_SOURCES = \
+@@ -4940,46 +4926,46 @@ nodist_libluajittexspecific_a_SOURCES = \
 
 #dist_libluahbtexspecific_a_SOURCES =
 nodist_libluahbtexspecific_a_SOURCES = \
@ -496,7 +496,7 @@
 luatex_pdf_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/pdf $(ctangle)
 
 ################################################################################
-@@ -5297,16 +5283,16 @@ nodist_call_luatex_SOURCES = callexe.c
+@@ -5297,16 +5283,16 @@ luatex_sources = \
 
 call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\"
 nodist_call_luatex_SOURCES = callexe.c
@ -517,7 +517,7 @@
 
 # LuaTeX/LuaJITTeX Tests
 #
-@@ -5646,7 +5632,7 @@ w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/conf
+@@ -5646,7 +5632,7 @@ w2c/c-auto.h: w2c/stamp-h1
 w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status
 	@rm -f w2c/stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h
@ -535,7 +535,7 @@
 	$(AM_V_at)-rm -f libff.a
 	$(AM_V_AR)$(libff_a_AR) libff.a $(libff_a_OBJECTS) $(libff_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libff.a
-@@ -5949,7 +5935,7 @@ ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am_
+@@ -5949,7 +5935,7 @@ ptexdir/libkanji_a-kanji.$(OBJEXT): ptexdir/$(am__dirs
 ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am__dirstamp) \
 	ptexdir/$(DEPDIR)/$(am__dirstamp)
 
@ -637,7 +637,7 @@
 	$(AM_V_at)-rm -f libluasocket.a
 	$(AM_V_AR)$(libluasocket_a_AR) libluasocket.a $(libluasocket_a_OBJECTS) $(libluasocket_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libluasocket.a
-@@ -7058,7 +7044,7 @@ synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$
+@@ -7058,7 +7044,7 @@ luatexdir/utils/libluatex_a-unistring.$(OBJEXT):  \
 synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
 	synctexdir/$(DEPDIR)/$(am__dirstamp)
 
@ -655,7 +655,7 @@
 	$(AM_V_at)-rm -f libluatexspecific.a
 	$(AM_V_AR)$(libluatexspecific_a_AR) libluatexspecific.a $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libluatexspecific.a
-@@ -7088,12 +7074,12 @@ libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \
+@@ -7088,12 +7074,12 @@ libmd5/$(DEPDIR)/$(am__dirstamp):
 libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \
 	libmd5/$(DEPDIR)/$(am__dirstamp)
 
@ -670,7 +670,7 @@
 	$(AM_V_at)-rm -f libmf.a
 	$(AM_V_AR)$(libmf_a_AR) libmf.a $(libmf_a_OBJECTS) $(libmf_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libmf.a
-@@ -7109,7 +7095,7 @@ mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__d
+@@ -7109,7 +7095,7 @@ mfluadir/$(DEPDIR)/$(am__dirstamp):
 mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \
 	mfluadir/$(DEPDIR)/$(am__dirstamp)
 
@ -679,7 +679,7 @@
 	$(AM_V_at)-rm -f libmflua.a
 	$(AM_V_AR)$(libmflua_a_AR) libmflua.a $(libmflua_a_OBJECTS) $(libmflua_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libmflua.a
-@@ -7119,7 +7105,7 @@ mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am
+@@ -7119,7 +7105,7 @@ luatexdir/lua/libmfluajit_a-lkpselib.$(OBJEXT):  \
 mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \
 	mfluadir/$(DEPDIR)/$(am__dirstamp)
 
@ -742,7 +742,7 @@
 	$(AM_V_at)-rm -f libmplibextramath.a
 	$(AM_V_AR)$(libmplibextramath_a_AR) libmplibextramath.a $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libmplibextramath.a
-@@ -7708,7 +7694,7 @@ mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(
+@@ -7708,7 +7694,7 @@ mplibdir/libmputil_a-decNumber.$(OBJEXT): mplibdir/$(a
 mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(am__dirstamp) \
 	mplibdir/$(DEPDIR)/$(am__dirstamp)
 
@ -769,7 +769,7 @@
 	$(AM_V_at)-rm -f libsynctex.a
 	$(AM_V_AR)$(libsynctex_a_AR) libsynctex.a $(libsynctex_a_OBJECTS) $(libsynctex_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libsynctex.a
-@@ -7805,7 +7791,7 @@ uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(
+@@ -7805,7 +7791,7 @@ uptexdir/libukanji_a-kanji.$(OBJEXT): uptexdir/$(am__d
 uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(am__dirstamp) \
 	uptexdir/$(DEPDIR)/$(am__dirstamp)
 
@ -787,7 +787,7 @@
 	$(AM_V_at)-rm -f libunilib.a
 	$(AM_V_AR)$(libunilib_a_AR) libunilib.a $(libunilib_a_OBJECTS) $(libunilib_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libunilib.a
-@@ -7904,7 +7890,7 @@ xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT):  \
+@@ -7904,7 +7890,7 @@ xetexdir/libxetex_a-XeTeX_mac.$(OBJEXT): xetexdir/$(am
 xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT):  \
 	xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp)
 
@ -805,7 +805,7 @@
 	$(AM_V_CCLD)$(libsynctex_la_LINK)  $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS)
 alephdir/$(am__dirstamp):
 	@$(MKDIR_P) alephdir
-@@ -7930,87 +7916,87 @@ alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__di
+@@ -7930,87 +7916,87 @@ alephdir/aleph-alephbis.$(OBJEXT): alephdir/$(am__dirs
 alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__dirstamp) \
 	alephdir/$(DEPDIR)/$(am__dirstamp)
 
@ -914,7 +914,7 @@
 	@rm -f dvitype$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(dvitype_OBJECTS) $(dvitype_LDADD) $(LIBS)
 eptexdir/$(am__dirstamp):
-@@ -8024,7 +8010,7 @@ synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__d
+@@ -8024,7 +8010,7 @@ eptexdir/eptex-eptexextra.$(OBJEXT): eptexdir/$(am__di
 synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
 	synctexdir/$(DEPDIR)/$(am__dirstamp)
 
@ -923,7 +923,7 @@
 	@rm -f eptex$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(eptex_OBJECTS) $(eptex_LDADD) $(LIBS)
 etexdir/$(am__dirstamp):
-@@ -8038,7 +8024,7 @@ synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__di
+@@ -8038,7 +8024,7 @@ etexdir/etex-etexextra.$(OBJEXT): etexdir/$(am__dirsta
 synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
 	synctexdir/$(DEPDIR)/$(am__dirstamp)
 
@ -932,7 +932,7 @@
 	@rm -f etex$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(etex_OBJECTS) $(etex_LDADD) $(LIBS)
 euptexdir/$(am__dirstamp):
-@@ -8052,23 +8038,23 @@ synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__
+@@ -8052,23 +8038,23 @@ euptexdir/euptex-euptexextra.$(OBJEXT): euptexdir/$(am
 synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
 	synctexdir/$(DEPDIR)/$(am__dirstamp)
 
@ -961,7 +961,7 @@
 	@rm -f himktables$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(himktables_OBJECTS) $(himktables_LDADD) $(LIBS)
 hitexdir/$(am__dirstamp):
-@@ -8082,19 +8068,19 @@ hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__d
+@@ -8082,19 +8068,19 @@ hitexdir/hishrink-hilexer.$(OBJEXT): hitexdir/$(am__di
 hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__dirstamp) \
 	hitexdir/$(DEPDIR)/$(am__dirstamp)
 
@ -985,7 +985,7 @@
 	@rm -f initex$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(initex_OBJECTS) $(initex_LDADD) $(LIBS)
 luatexdir/$(am__dirstamp):
-@@ -8108,7 +8094,7 @@ mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dir
+@@ -8108,7 +8094,7 @@ luatexdir/luahbtex-luatex.$(OBJEXT): luatexdir/$(am__d
 mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
 	mplibdir/$(DEPDIR)/$(am__dirstamp)
 
@ -994,7 +994,7 @@
 	@rm -f luahbtex$(EXEEXT)
 	$(AM_V_CXXLD)$(luahbtex_LINK) $(luahbtex_OBJECTS) $(luahbtex_LDADD) $(LIBS)
 luatexdir/luajithbtex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
-@@ -8116,7 +8102,7 @@ mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__
+@@ -8116,7 +8102,7 @@ luatexdir/luajithbtex-luatex.$(OBJEXT): luatexdir/$(am
 mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
 	mplibdir/$(DEPDIR)/$(am__dirstamp)
 
@ -1003,7 +1003,7 @@
 	@rm -f luajithbtex$(EXEEXT)
 	$(AM_V_CXXLD)$(luajithbtex_LINK) $(luajithbtex_OBJECTS) $(luajithbtex_LDADD) $(LIBS)
 luatexdir/luajittex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
-@@ -8124,7 +8110,7 @@ mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__di
+@@ -8124,7 +8110,7 @@ luatexdir/luajittex-luatex.$(OBJEXT): luatexdir/$(am__
 mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
 	mplibdir/$(DEPDIR)/$(am__dirstamp)
 
@ -1012,7 +1012,7 @@
 	@rm -f luajittex$(EXEEXT)
 	$(AM_V_CCLD)$(luajittex_LINK) $(luajittex_OBJECTS) $(luajittex_LDADD) $(LIBS)
 luatexdir/luatex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
-@@ -8132,33 +8118,33 @@ mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirst
+@@ -8132,33 +8118,33 @@ luatexdir/luatex-luatex.$(OBJEXT): luatexdir/$(am__dir
 mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
 	mplibdir/$(DEPDIR)/$(am__dirstamp)
 
@ -1099,7 +1099,7 @@
 	@rm -f patgen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(patgen_OBJECTS) $(patgen_LDADD) $(LIBS)
 pdftexdir/pdftex-pdftexextra.$(OBJEXT): pdftexdir/$(am__dirstamp) \
-@@ -8210,67 +8196,67 @@ synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__
+@@ -8210,67 +8196,67 @@ pdftexdir/pdftex-pdftexextra.$(OBJEXT): pdftexdir/$(am
 synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
 	synctexdir/$(DEPDIR)/$(am__dirstamp)
 
@ -1181,7 +1181,7 @@
 	@rm -f tie$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tie_OBJECTS) $(tie_LDADD) $(LIBS)
 pdftexdir/ttf2afm-ttf2afm.$(OBJEXT): pdftexdir/$(am__dirstamp) \
-@@ -8278,65 +8264,65 @@ pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__
+@@ -8278,65 +8264,65 @@ pdftexdir/ttf2afm-ttf2afm.$(OBJEXT): pdftexdir/$(am__d
 pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__dirstamp) \
 	pdftexdir/$(DEPDIR)/$(am__dirstamp)
 
@ -1262,7 +1262,7 @@
 	@rm -f wovp2ovf$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(wovp2ovf_OBJECTS) $(wovp2ovf_LDADD) $(LIBS)
 xetexdir/xetex-xetexextra.$(OBJEXT): xetexdir/$(am__dirstamp) \
-@@ -8344,7 +8330,7 @@ synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__d
+@@ -8344,7 +8330,7 @@ xetexdir/xetex-xetexextra.$(OBJEXT): xetexdir/$(am__di
 synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
 	synctexdir/$(DEPDIR)/$(am__dirstamp)
 
@ -1289,7 +1289,7 @@
 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 	@set +e; $(am__set_TESTS_bases); \
 	bases=`for i in $$bases; do echo $$i; done \
-@@ -19546,7 +19532,7 @@ install-am: all-am
+@@ -19546,7 +19532,7 @@ install-data: install-data-recursive
 uninstall: uninstall-recursive
 
 install-am: all-am
@ -1326,7 +1326,7 @@
 	$(mp_ctangle_sh) mp
 mp-tangle: ctangle$(EXEEXT) mplibdir/mp.w tangle-sh
 	$(mp_ctangle_sh) mp
-@@ -21848,7 +21831,7 @@ $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) 
+@@ -21848,7 +21831,7 @@ svgout-tangle: ctangle$(EXEEXT) mplibdir/svgout.w tang
 
 $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) $(svgout_c_h) $(pngout_c_h)
 
@ -1335,7 +1335,7 @@
 $(libmplibextramath_a_OBJECTS): $(nodist_libmplibextramath_a_SOURCES) $(KPATHSEA_DEPEND)  $(MPFR_DEPEND)
 $(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND)
 
-@@ -22099,7 +22082,7 @@ hitables.c: himktables$(EXEEXT)
+@@ -22099,7 +22082,7 @@ hitex-tangle: ctangle$(EXEEXT) hitexdir/hitex.w tangle
 hitables.c: himktables$(EXEEXT)
 	./himktables$(EXEEXT) > $@ || { rm -f hitables.c; exit 1; }
 
@ -1344,7 +1344,7 @@
 # of the sources generated from hiformat.w.
 #
 $(hitex_OBJECTS): hiformat-tangle
-@@ -22166,36 +22149,36 @@ $(libff_a_OBJECTS): libunilib.a
+@@ -22166,36 +22149,36 @@ $(libluajitmisc_a_OBJECTS): $(libluajitmisc_a_DEPENDEN
 
 $(libff_a_OBJECTS): libunilib.a
 
--- a/print/tex-luatex/files/patch-configure
+++ b/print/tex-luatex/files/patch-configure
@ -1,666 +0,0 @@
--- configure.orig	2023-04-07 15:36:31 UTC
-+++ configure
-@@ -27203,292 +27203,6 @@ fi
- 	cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild'
- fi
- 
-##tldbg _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags.
-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=freetype2, libname=freetype, options=, tlincl=-IBLD/libs/freetype2/freetype2, tllib=BLD/libs/freetype2/libfreetype.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/freetype2/freetype2/ft2build.h.' >&5
-##tldbg _KPSE_LIB_FLAGS_TL: freetype2 (freetype) .
-
-# Check whether --with-system-freetype2 was given.
-if test ${with_system_freetype2+y}
-then :
-  withval=$with_system_freetype2;
-fi
-if test "x$with_system_freetype2" = xyes; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}freetype-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}freetype-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_FT2_CONFIG+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$FT2_CONFIG"; then
-  ac_cv_prog_FT2_CONFIG="$FT2_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
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    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_FT2_CONFIG="${ac_tool_prefix}freetype-config"
-    printf "%s\n" "$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
-FT2_CONFIG=$ac_cv_prog_FT2_CONFIG
-if test -n "$FT2_CONFIG"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FT2_CONFIG" >&5
-printf "%s\n" "$FT2_CONFIG" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_FT2_CONFIG"; then
-  ac_ct_FT2_CONFIG=$FT2_CONFIG
-  # Extract the first word of "freetype-config", so it can be a program name with args.
-set dummy freetype-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_FT2_CONFIG+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_FT2_CONFIG"; then
-  ac_cv_prog_ac_ct_FT2_CONFIG="$ac_ct_FT2_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
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    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_FT2_CONFIG="freetype-config"
-    printf "%s\n" "$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_FT2_CONFIG=$ac_cv_prog_ac_ct_FT2_CONFIG
-if test -n "$ac_ct_FT2_CONFIG"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FT2_CONFIG" >&5
-printf "%s\n" "$ac_ct_FT2_CONFIG" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_FT2_CONFIG" = x; then
-    FT2_CONFIG="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    FT2_CONFIG=$ac_ct_FT2_CONFIG
-  fi
-else
-  FT2_CONFIG="$ac_cv_prog_FT2_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
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_PKG_CONFIG+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  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
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    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"
-    printf "%s\n" "$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
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-printf "%s\n" "$PKG_CONFIG" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "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
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_PKG_CONFIG+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  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
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    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"
-    printf "%s\n" "$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
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
-printf "%s\n" "$ac_ct_PKG_CONFIG" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_PKG_CONFIG" = x; then
-    PKG_CONFIG="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$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 $FT2_CONFIG --ftversion >/dev/null 2>&1; then
-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
-  FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
-  FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
-elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
-  as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
-fi
-else
-  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2"
-  FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
-  FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
-  FREETYPE2_RULE='# Rebuild libfreetype
-$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h
-	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/freetype2/freetype2/ft2build.h:
-	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
-##tldbg _KPSE_LIB_FLAGS: Setup pixman (-lpixman) flags.
-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=pixman, libname=pixman, options=, tlincl=-IBLD/libs/pixman/include, tllib=BLD/libs/pixman/libpixman.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/pixman/include/pixman.h.' >&5
-##tldbg _KPSE_LIB_FLAGS_TL: pixman (pixman) .
-
-# Check whether --with-system-pixman was given.
-if test ${with_system_pixman+y}
-then :
-  withval=$with_system_pixman;
-fi
-if test "x$with_system_pixman" = xyes; then
-  if $PKG_CONFIG pixman-1 --atleast-version=0.18; then
-  PIXMAN_INCLUDES=`$PKG_CONFIG pixman-1 --cflags`
-  PIXMAN_LIBS=`$PKG_CONFIG pixman-1 --libs`
-elif test "x$need_pixman:$with_system_pixman" = xyes:yes; then
-  as_fn_error $? "did not find pixman-1 0.18 or better" "$LINENO" 5
-fi
-else
-  PIXMAN_INCLUDES="-I$kpse_BLD/libs/pixman/include"
-  PIXMAN_LIBS="$kpse_BLD/libs/pixman/libpixman.a"
-  PIXMAN_DEPEND='${top_builddir}/../../libs/pixman/libpixman.a'
-  PIXMAN_RULE='# Rebuild libpixman
-$(PIXMAN_DEPEND): ${top_builddir}/../../libs/pixman/include/pixman.h
-	cd ${top_builddir}/../../libs/pixman && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/pixman/include/pixman.h:
-	cd ${top_builddir}/../../libs/pixman && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
-##tldbg _KPSE_LIB_FLAGS: Setup cairo (-lcairo) flags.
-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=cairo, libname=cairo, options=, tlincl=-IBLD/libs/cairo/cairo, tllib=BLD/libs/cairo/libcairo.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/cairo/cairo/cairo.h.' >&5
-##tldbg _KPSE_LIB_FLAGS_TL: cairo (cairo) .
-
-# Check whether --with-system-cairo was given.
-if test ${with_system_cairo+y}
-then :
-  withval=$with_system_cairo;
-fi
-if test "x$with_system_cairo" = xyes; then
-  if $PKG_CONFIG cairo --atleast-version=1.12; then
-  CAIRO_INCLUDES=`$PKG_CONFIG cairo --cflags`
-  CAIRO_LIBS=`$PKG_CONFIG cairo --libs`
-elif test "x$need_cairo:$with_system_cairo" = xyes:yes; then
-  as_fn_error $? "did not find cairo 1.12 or better" "$LINENO" 5
-fi
-else
-  CAIRO_INCLUDES="-I$kpse_BLD/libs/cairo/cairo"
-  CAIRO_LIBS="$kpse_BLD/libs/cairo/libcairo.a"
-  CAIRO_DEPEND='${top_builddir}/../../libs/cairo/libcairo.a'
-  CAIRO_RULE='# Rebuild libcairo
-$(CAIRO_DEPEND): ${top_builddir}/../../libs/cairo/cairo/cairo.h
-	cd ${top_builddir}/../../libs/cairo && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/cairo/cairo/cairo.h:
-	cd ${top_builddir}/../../libs/cairo && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
- ##tldbg _KPSE_LIB_FLAGS: Setup potrace (-lpotrace) flags.
- echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=potrace, libname=potrace, options=, tlincl=-IBLD/libs/potrace/include, tllib=BLD/libs/potrace/libpotrace.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/potrace/include/potrace.h.' >&5
- ##tldbg _KPSE_LIB_FLAGS_TL: potrace (potrace) .
-@@ -27657,364 +27371,6 @@ fi
- 	cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild'
- fi
- 
-##tldbg _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags.
-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=teckit, libname=TECkit, options=, tlincl=-IBLD/libs/teckit/include, tllib=BLD/libs/teckit/libTECkit.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h.' >&5
-##tldbg _KPSE_LIB_FLAGS_TL: teckit (TECkit) .
-
-# Check whether --with-system-teckit was given.
-if test ${with_system_teckit+y}
-then :
-  withval=$with_system_teckit;
-fi
-if test "x$with_system_teckit" = xyes; then
-  if $PKG_CONFIG teckit; then
-  TECKIT_INCLUDES=`$PKG_CONFIG teckit --cflags`
-  TECKIT_LIBS=`$PKG_CONFIG teckit --libs`
-elif test "x$need_teckit:$with_system_teckit" = xyes:yes; then
-  as_fn_error $? "did not find teckit" "$LINENO" 5
-fi
-else
-  TECKIT_INCLUDES="-I$kpse_BLD/libs/teckit/include"
-  TECKIT_LIBS="$kpse_BLD/libs/teckit/libTECkit.a"
-  TECKIT_DEPEND='${top_builddir}/../../libs/teckit/libTECkit.a'
-  TECKIT_RULE='# Rebuild libTECkit
-$(TECKIT_DEPEND): ${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h
-	cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h:
-	cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
-
-# LuaTeX and XeTeX need harfbuzz.
-if test "x$enable_xetex" = xyes \
-   || test "x$enable_luatex" = xyes || test "x$enable_luatex53" = xyes; then
-  ##tldbg _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags.
-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=graphite2, libname=graphite2, options=, tlincl=-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC, tllib=BLD/libs/graphite2/libgraphite2.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/graphite2/include/graphite2/Font.h.' >&5
-##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) .
-
-# Check whether --with-system-graphite2 was given.
-if test ${with_system_graphite2+y}
-then :
-  withval=$with_system_graphite2;
-fi
-if test "x$with_system_graphite2" = xyes; then
-  if $PKG_CONFIG graphite2; then
-  GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags`
-  GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs`
-elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
-  as_fn_error $? "did not find graphite2" "$LINENO" 5
-fi
-else
-  GRAPHITE2_INCLUDES="-I$kpse_BLD/libs/graphite2/include -DGRAPHITE2_STATIC"
-  GRAPHITE2_LIBS="$kpse_BLD/libs/graphite2/libgraphite2.a"
-  GRAPHITE2_DEPEND='${top_builddir}/../../libs/graphite2/libgraphite2.a'
-  GRAPHITE2_RULE='# Rebuild libgraphite2
-$(GRAPHITE2_DEPEND): ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h
-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/graphite2/include/graphite2/Font.h:
-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
-##tldbg _KPSE_LIB_FLAGS: Setup harfbuzz (-lharfbuzz) flags.
-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=harfbuzz, libname=harfbuzz, options=, tlincl=-IBLD/libs/harfbuzz/include, tllib=BLD/libs/harfbuzz/libharfbuzz.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/harfbuzz/include/hb.h.' >&5
-##tldbg _KPSE_LIB_FLAGS_TL: harfbuzz (harfbuzz) .
-
-# Check whether --with-system-harfbuzz was given.
-if test ${with_system_harfbuzz+y}
-then :
-  withval=$with_system_harfbuzz;
-fi
-if test "x$with_system_harfbuzz" = xyes; then
-  if $PKG_CONFIG harfbuzz; then
-  HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz --cflags`
-  HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz --libs`
-elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then
-  as_fn_error $? "did not find harfbuzz" "$LINENO" 5
-fi
-else
-  HARFBUZZ_INCLUDES="-I$kpse_BLD/libs/harfbuzz/include"
-  HARFBUZZ_LIBS="$kpse_BLD/libs/harfbuzz/libharfbuzz.a"
-  HARFBUZZ_DEPEND='${top_builddir}/../../libs/harfbuzz/libharfbuzz.a'
-  HARFBUZZ_RULE='# Rebuild libharfbuzz
-$(HARFBUZZ_DEPEND): ${top_builddir}/../../libs/harfbuzz/include/hb.h
-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/harfbuzz/include/hb.h:
-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
-fi # end xetex/luatex for harfbuzz
-
-# XeTeX, but not LuaTeX, needs icu and graphite.
-if test "x$enable_xetex" = xyes; then
-  echo 'tldbg:KPSE_ICU_FLAGS called: more-icu-libs=, icu-config-args=.' >&5
-##tldbg _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags.
-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=icu, libname=icuxxx, options=, tlincl=-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include, tllib= BLD/libs/icu/icu-build/lib/libicuuc.a BLD/libs/icu/icu-build/lib/libicudata.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/icu/include/unicode/uversion.h.' >&5
-##tldbg _KPSE_LIB_FLAGS_TL: icu (icuxxx) .
-
-# Check whether --with-system-icu was given.
-if test ${with_system_icu+y}
-then :
-  withval=$with_system_icu;
-fi
-if test "x$with_system_icu" = xyes; then
-  echo 'tldbg: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
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ICU_CONFIG+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ICU_CONFIG"; then
-  ac_cv_prog_ICU_CONFIG="$ICU_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
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    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_ICU_CONFIG="${ac_tool_prefix}icu-config"
-    printf "%s\n" "$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
-ICU_CONFIG=$ac_cv_prog_ICU_CONFIG
-if test -n "$ICU_CONFIG"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ICU_CONFIG" >&5
-printf "%s\n" "$ICU_CONFIG" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_ICU_CONFIG"; then
-  ac_ct_ICU_CONFIG=$ICU_CONFIG
-  # Extract the first word of "icu-config", so it can be a program name with args.
-set dummy icu-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_ICU_CONFIG+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_ICU_CONFIG"; then
-  ac_cv_prog_ac_ct_ICU_CONFIG="$ac_ct_ICU_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
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    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_ICU_CONFIG="icu-config"
-    printf "%s\n" "$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_ICU_CONFIG=$ac_cv_prog_ac_ct_ICU_CONFIG
-if test -n "$ac_ct_ICU_CONFIG"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_ICU_CONFIG" >&5
-printf "%s\n" "$ac_ct_ICU_CONFIG" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_ICU_CONFIG" = x; then
-    ICU_CONFIG="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    ICU_CONFIG=$ac_ct_ICU_CONFIG
-  fi
-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
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_PKG_CONFIG+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  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
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    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"
-    printf "%s\n" "$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
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-printf "%s\n" "$PKG_CONFIG" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "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
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_PKG_CONFIG+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  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
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    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"
-    printf "%s\n" "$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
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
-printf "%s\n" "$ac_ct_PKG_CONFIG" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_PKG_CONFIG" = x; then
-    PKG_CONFIG="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$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 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"
-  ICU_LIBS=" $kpse_BLD/libs/icu/icu-build/lib/libicuuc.a $kpse_BLD/libs/icu/icu-build/lib/libicudata.a"
-  ICU_DEPEND=' ${top_builddir}/../../libs/icu/icu-build/lib/libicuuc.a ${top_builddir}/../../libs/icu/icu-build/lib/libicudata.a'
-  ICU_RULE='# Rebuild libicuxxx
-$(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h
-	cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/icu/include/unicode/uversion.h:
-	cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-# checking for openbsd to add -lpthread for icu.
-case $build_os in
-openbsd*)
-  eval ICUXXX_LIBS=\"$ICUXXX_LIBS -lpthread\"
-  ;;
-esac
-
-  ##tldbg _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags.
-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=graphite2, libname=graphite2, options=, tlincl=-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC, tllib=BLD/libs/graphite2/libgraphite2.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/graphite2/include/graphite2/Font.h.' >&5
-##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) .
-
-# Check whether --with-system-graphite2 was given.
-if test ${with_system_graphite2+y}
-then :
-  withval=$with_system_graphite2;
-fi
-if test "x$with_system_graphite2" = xyes; then
-  if $PKG_CONFIG graphite2; then
-  GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags`
-  GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs`
-elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
-  as_fn_error $? "did not find graphite2" "$LINENO" 5
-fi
-else
-  GRAPHITE2_INCLUDES="-I$kpse_BLD/libs/graphite2/include -DGRAPHITE2_STATIC"
-  GRAPHITE2_LIBS="$kpse_BLD/libs/graphite2/libgraphite2.a"
-  GRAPHITE2_DEPEND='${top_builddir}/../../libs/graphite2/libgraphite2.a'
-  GRAPHITE2_RULE='# Rebuild libgraphite2
-$(GRAPHITE2_DEPEND): ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h
-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/graphite2/include/graphite2/Font.h:
-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
-fi # end xetex for icu/graphite
-
- # Check size of off_t (using <kpathsea/config.h>)
- eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\"
- eval LIBS=\"$KPATHSEA_LIBS \$LIBS\"
-@@ -31534,5 +30890,3 @@ fi
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
- printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
- fi
-
-