summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-30 10:42:45 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-30 10:42:45 +0000
commitcdae43322cc315a65b9bee9f62b2e28934fefa6a (patch)
tree18a8ae660cb1dc7d1136962b4e8dcbccad5b873d /Build/source/texk/web2c
parent156b1ea47fd003feee19afbb34c0e85e596b54dc (diff)
libs/harfbuzz: Added for future XeTeX
git-svn-id: svn://tug.org/texlive/trunk@28390 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r--Build/source/texk/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/Makefile.am10
-rw-r--r--Build/source/texk/web2c/Makefile.in18
-rw-r--r--Build/source/texk/web2c/aclocal.m43
-rwxr-xr-xBuild/source/texk/web2c/configure416
-rw-r--r--Build/source/texk/web2c/configure.ac7
-rw-r--r--Build/source/texk/web2c/doc/Makefile.in13
-rw-r--r--Build/source/texk/web2c/lib/Makefile.in13
-rw-r--r--Build/source/texk/web2c/man/Makefile.in13
-rw-r--r--Build/source/texk/web2c/omegafonts/Makefile.in13
-rw-r--r--Build/source/texk/web2c/otps/Makefile.in13
-rw-r--r--Build/source/texk/web2c/otps/win32/Makefile.in13
-rw-r--r--Build/source/texk/web2c/window/Makefile.in13
13 files changed, 458 insertions, 92 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 5a4918a70b7..35a5c3360da 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-30 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am, configure.ac: Add pixman, cairo, and harfbuzz
+ for future MetaPost and XeTeX.
+
2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: No need to check for Annot::decRefCnt with
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index 5da453d391d..40d20ef7d75 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -85,6 +85,12 @@ $(proglib): ${srcdir}/lib/*.c
@ZLIB_RULE@
## Rebuild libpng
@LIBPNG_RULE@
+## Rebuild libfreetype
+@FREETYPE2_RULE@
+## Rebuild libpixman
+@PIXMAN_RULE@
+## Rebuild libcairo
+@CAIRO_RULE@
## Rebuild libxpdf & Co
@XPDF_RULE@
## Rebuild poppler
@@ -93,12 +99,12 @@ $(proglib): ${srcdir}/lib/*.c
@ZZIPLIB_RULE@
## Rebuild libgraphite
@GRAPHITE_RULE@
-## Rebuild libfreetype
-@FREETYPE2_RULE@
## Rebuild libTEXkit
@TECKIT_RULE@
## Rebuild libsicuxxx
@ICU_RULE@
+## Rebuild libharfbuzz
+@HARFBUZZ_RULE@
# The environment for building.
buildenv = TEXMFCNF=$(srcdir)/../kpathsea
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 8868d4a9aeb..d8f0cfb5d22 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -317,18 +317,21 @@ subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-asm.m4 \
+ $(top_srcdir)/../../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-cross.m4 \
$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../../m4/kpse-graphite-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-lex.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
$(top_srcdir)/../../m4/kpse-lt-hack.m4 \
$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
+ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
$(top_srcdir)/../../m4/kpse-poppler-flags.m4 \
$(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
@@ -1196,6 +1199,9 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+CAIRO_DEPEND = @CAIRO_DEPEND@
+CAIRO_INCLUDES = @CAIRO_INCLUDES@
+CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -1230,6 +1236,10 @@ GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
GRAPHITE_LIBS = @GRAPHITE_LIBS@
GREP = @GREP@
+HARFBUZZ_DEPEND = @HARFBUZZ_DEPEND@
+HARFBUZZ_INCLUDES = @HARFBUZZ_INCLUDES@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+ICU_CONFIG = @ICU_CONFIG@
ICU_DEPEND = @ICU_DEPEND@
ICU_INCLUDES = @ICU_INCLUDES@
ICU_LIBS = @ICU_LIBS@
@@ -1279,6 +1289,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PIXMAN_DEPEND = @PIXMAN_DEPEND@
+PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
POPPLER_DEPEND = @POPPLER_DEPEND@
POPPLER_INCLUDES = @POPPLER_INCLUDES@
@@ -9470,13 +9483,16 @@ $(proglib): ${srcdir}/lib/*.c
@KPATHSEA_RULE@
@ZLIB_RULE@
@LIBPNG_RULE@
+@FREETYPE2_RULE@
+@PIXMAN_RULE@
+@CAIRO_RULE@
@XPDF_RULE@
@POPPLER_RULE@
@ZZIPLIB_RULE@
@GRAPHITE_RULE@
-@FREETYPE2_RULE@
@TECKIT_RULE@
@ICU_RULE@
+@HARFBUZZ_RULE@
.PHONY: triptrap
triptrap:
diff --git a/Build/source/texk/web2c/aclocal.m4 b/Build/source/texk/web2c/aclocal.m4
index e1256bb2264..0c6042bd976 100644
--- a/Build/source/texk/web2c/aclocal.m4
+++ b/Build/source/texk/web2c/aclocal.m4
@@ -1089,18 +1089,21 @@ AC_SUBST([am__untar])
m4_include([m4/web2c-disable.m4])
m4_include([../../m4/kpse-asm.m4])
+m4_include([../../m4/kpse-cairo-flags.m4])
m4_include([../../m4/kpse-common.m4])
m4_include([../../m4/kpse-cross.m4])
m4_include([../../m4/kpse-cxx-hack.m4])
m4_include([../../m4/kpse-fontconfig-flags.m4])
m4_include([../../m4/kpse-freetype2-flags.m4])
m4_include([../../m4/kpse-graphite-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-lex.m4])
m4_include([../../m4/kpse-libpng-flags.m4])
m4_include([../../m4/kpse-lt-hack.m4])
m4_include([../../m4/kpse-macos-framework.m4])
+m4_include([../../m4/kpse-pixman-flags.m4])
m4_include([../../m4/kpse-poppler-flags.m4])
m4_include([../../m4/kpse-ptexenc-flags.m4])
m4_include([../../m4/kpse-socket-libs.m4])
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index f927d1cab8b..e8939cc912c 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -644,19 +644,19 @@ CTANGLE
CTANGLEBOOT
TANGLE
TANGLEBOOT
+HARFBUZZ_RULE
+HARFBUZZ_DEPEND
+HARFBUZZ_LIBS
+HARFBUZZ_INCLUDES
ICU_RULE
ICU_DEPEND
ICU_LIBS
ICU_INCLUDES
+ICU_CONFIG
TECKIT_RULE
TECKIT_DEPEND
TECKIT_LIBS
TECKIT_INCLUDES
-FREETYPE2_RULE
-FREETYPE2_DEPEND
-FREETYPE2_LIBS
-FREETYPE2_INCLUDES
-FT2_CONFIG
GRAPHITE_RULE
GRAPHITE_DEPEND
GRAPHITE_LIBS
@@ -673,6 +673,19 @@ XPDF_RULE
XPDF_DEPEND
XPDF_LIBS
XPDF_INCLUDES
+CAIRO_RULE
+CAIRO_DEPEND
+CAIRO_LIBS
+CAIRO_INCLUDES
+PIXMAN_RULE
+PIXMAN_DEPEND
+PIXMAN_LIBS
+PIXMAN_INCLUDES
+FREETYPE2_RULE
+FREETYPE2_DEPEND
+FREETYPE2_LIBS
+FREETYPE2_INCLUDES
+FT2_CONFIG
LIBPNG_RULE
LIBPNG_DEPEND
LIBPNG_LIBS
@@ -970,14 +983,18 @@ with_system_zlib
with_zlib_includes
with_zlib_libdir
with_system_libpng
+with_system_freetype2
+with_system_pixman
+with_system_cairo
with_system_xpdf
with_system_poppler
with_system_zziplib
with_system_graphite
-with_system_freetype2
with_system_teckit
with_teckit_includes
with_teckit_libdir
+with_system_icu
+with_system_harfbuzz
'
ac_precious_vars='build_alias
host_alias
@@ -1709,6 +1726,12 @@ Optional Packages:
--with-zlib-libdir=DIR zlib library installed in DIR
--with-system-libpng use installed libpng headers and library (requires
pkg-config)
+ --with-system-freetype2 use installed freetype2 headers and library
+ (requires freetype-config)
+ --with-system-pixman use installed pixman headers and library (requires
+ pkg-config)
+ --with-system-cairo use installed cairo 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
@@ -1717,13 +1740,15 @@ Optional Packages:
pkg-config)
--with-system-graphite use installed silgraphite headers and library
(requires pkg-config)
- --with-system-freetype2 use installed freetype2 headers and library
- (requires freetype-config)
--with-system-teckit use installed teckit headers and library
--with-teckit-includes=DIR
teckit headers installed in DIR
--with-teckit-libdir=DIR
teckit library installed in DIR
+ --with-system-icu use installed ICU headers and libraries (requires
+ icu-config, not for XeTeX)
+ --with-system-harfbuzz use installed harfbuzz headers and library (requires
+ pkg-config)
Some influential environment variables:
CC C compiler command
@@ -22655,6 +22680,170 @@ ${top_builddir}/../../libs/libpng/include/png.h:
cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_FT2_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ 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
+ 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_FT2_CONFIG="${ac_tool_prefix}freetype-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
+FT2_CONFIG=$ac_cv_prog_FT2_CONFIG
+if test -n "$FT2_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FT2_CONFIG" >&5
+$as_echo "$FT2_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_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
+{ $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_FT2_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ 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
+ 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_FT2_CONFIG="freetype-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_FT2_CONFIG=$ac_cv_prog_ac_ct_FT2_CONFIG
+if test -n "$ac_ct_FT2_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FT2_CONFIG" >&5
+$as_echo "$ac_ct_FT2_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_FT2_CONFIG" = x; then
+ FT2_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
+ FT2_CONFIG=$ac_ct_FT2_CONFIG
+ fi
+else
+ FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
+fi
+
+## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags
+
+# 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" = xyes; then
+ if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+ FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+ FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+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 -I$kpse_BLD/libs/freetype2"
+ FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la"
+ FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la'
+ FREETYPE2_RULE='# Rebuild libfreetype
+$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
+ cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
+${top_builddir}/../../libs/freetype2/ft2build.h:
+ cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+fi
+
+## _KPSE_LIB_FLAGS: Setup pixman (-lpixman) flags
+
+# 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" = 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-0.18 or better" "$LINENO" 5
+fi
+else
+ PIXMAN_INCLUDES="-I$kpse_BLD/libs/pixman/include"
+ PIXMAN_LIBS="$kpse_BLD/libs/pixman/libpixman.la"
+ PIXMAN_DEPEND='${top_builddir}/../../libs/pixman/libpixman.la'
+ 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
+
+## _KPSE_LIB_FLAGS: Setup cairo (-lcairo) flags
+
+# 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" = xyes; then
+ if $PKG_CONFIG cairo --atleast-version=1.10; 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.10 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
+
## _KPSE_LIB_FLAGS: Setup xpdf (-lxpdf) flags
# Check whether --with-system-xpdf was given.
@@ -22707,6 +22896,32 @@ ${top_builddir}/../../libs/poppler/poppler/Stream.h:
fi
test "x$kpse_cv_have_win32" = xno || POPPLER_LIBS="$POPPLER_LIBS -lgdi32"
+## _KPSE_LIB_FLAGS: Setup xpdf (-lxpdf) flags
+
+# Check whether --with-system-xpdf was given.
+if test "${with_system_xpdf+set}" = set; then :
+ withval=$with_system_xpdf;
+fi
+if test "x$with_system_xpdf" = xyes; then
+ if $PKG_CONFIG poppler --atleast-version=0.12; then
+ POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
+ XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
+ XPDF_LIBS=`$PKG_CONFIG poppler --libs`
+elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then
+ as_fn_error $? "did not find poppler-0.12 or better" "$LINENO" 5
+fi
+else
+ XPDF_INCLUDES="-DPDF_PARSER_ONLY -I$kpse_BLD/libs/xpdf -I$kpse_BLD/libs/xpdf/goo -I$kpse_BLD/libs/xpdf/xpdf"
+ XPDF_LIBS="$kpse_BLD/libs/xpdf/libxpdf.a"
+ XPDF_DEPEND='${top_builddir}/../../libs/xpdf/libxpdf.a'
+ XPDF_RULE='# Rebuild libxpdf
+$(XPDF_DEPEND): ${top_builddir}/../../libs/xpdf/xpdf/Stream.h
+ cd ${top_builddir}/../../libs/xpdf && $(MAKE) $(AM_MAKEFLAGS) rebuild
+${top_builddir}/../../libs/xpdf/xpdf/Stream.h:
+ cd ${top_builddir}/../../libs/xpdf && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+fi
+test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_LIBS -lgdi32"
+
## _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags
# Check whether --with-system-zziplib was given.
@@ -22755,16 +22970,51 @@ ${top_builddir}/../../libs/graphite/include/graphite/GrClient.h:
cd ${top_builddir}/../../libs/graphite && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi
+## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
+
+# Check whether --with-system-teckit was given.
+if test "${with_system_teckit+set}" = set; then :
+ withval=$with_system_teckit;
+fi
+
+# Check whether --with-teckit-includes was given.
+if test "${with_teckit_includes+set}" = set; then :
+ withval=$with_teckit_includes;
+fi
+
+# Check whether --with-teckit-libdir was given.
+if test "${with_teckit_libdir+set}" = set; then :
+ withval=$with_teckit_libdir;
+fi
+if test "x$with_system_teckit" = xyes; then
+ if test "x$with_teckit_includes" != x && test "x$with_teckit_includes" != xyes; then
+ TECKIT_INCLUDES="-I$with_teckit_includes"
+fi
+TECKIT_LIBS="-lTECkit"
+if test "x$with_teckit_libdir" != x && test "x$with_teckit_libdir" != xyes; then
+ TECKIT_LIBS="-L$with_teckit_libdir $TECKIT_LIBS"
+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
+
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
+ # 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
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_FT2_CONFIG+:} false; then :
+if ${ac_cv_prog_ICU_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$FT2_CONFIG"; then
- ac_cv_prog_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test.
+ 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
@@ -22773,7 +23023,7 @@ do
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_FT2_CONFIG="${ac_tool_prefix}freetype-config"
+ ac_cv_prog_ICU_CONFIG="${ac_tool_prefix}icu-config"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -22783,10 +23033,10 @@ IFS=$as_save_IFS
fi
fi
-FT2_CONFIG=$ac_cv_prog_FT2_CONFIG
-if test -n "$FT2_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FT2_CONFIG" >&5
-$as_echo "$FT2_CONFIG" >&6; }
+ICU_CONFIG=$ac_cv_prog_ICU_CONFIG
+if test -n "$ICU_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ICU_CONFIG" >&5
+$as_echo "$ICU_CONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -22794,17 +23044,17 @@ 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
+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
{ $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_FT2_CONFIG+:} false; then :
+if ${ac_cv_prog_ac_ct_ICU_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
- 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.
+ 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
@@ -22813,7 +23063,7 @@ do
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_FT2_CONFIG="freetype-config"
+ ac_cv_prog_ac_ct_ICU_CONFIG="icu-config"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -22823,17 +23073,17 @@ 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
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FT2_CONFIG" >&5
-$as_echo "$ac_ct_FT2_CONFIG" >&6; }
+ac_ct_ICU_CONFIG=$ac_cv_prog_ac_ct_ICU_CONFIG
+if test -n "$ac_ct_ICU_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_ICU_CONFIG" >&5
+$as_echo "$ac_ct_ICU_CONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- if test "x$ac_ct_FT2_CONFIG" = x; then
- FT2_CONFIG="false"
+ if test "x$ac_ct_ICU_CONFIG" = x; then
+ ICU_CONFIG="false"
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -22841,71 +23091,37 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- FT2_CONFIG=$ac_ct_FT2_CONFIG
+ ICU_CONFIG=$ac_ct_ICU_CONFIG
fi
else
- FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
+ ICU_CONFIG="$ac_cv_prog_ICU_CONFIG"
fi
-## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags
+## _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags
-# Check whether --with-system-freetype2 was given.
-if test "${with_system_freetype2+set}" = set; then :
- withval=$with_system_freetype2;
+# 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_freetype2" = xyes; then
- if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
- FREETYPE2_LIBS=`$FT2_CONFIG --libs`
-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
+if test "x$with_system_icu" = xyes; then
+ if $ICU_CONFIG --version >/dev/null 2>&1; then
+ ICU_INCLUDES=`$ICU_CONFIG --cppflags`
+ # Work around bug in icu-config version 4.4
+ ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath `
+ ICU_LIBS="$ICU_LIBS `$ICU_CONFIG --ldflags-libsonly --ldflags-system`"
+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
fi
else
- FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2"
- FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la"
- FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la'
- FREETYPE2_RULE='# Rebuild libfreetype
-$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
- cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/freetype2/ft2build.h:
- cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
-## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
-
-# Check whether --with-system-teckit was given.
-if test "${with_system_teckit+set}" = set; then :
- withval=$with_system_teckit;
-fi
-
-# Check whether --with-teckit-includes was given.
-if test "${with_teckit_includes+set}" = set; then :
- withval=$with_teckit_includes;
-fi
-
-# Check whether --with-teckit-libdir was given.
-if test "${with_teckit_libdir+set}" = set; then :
- withval=$with_teckit_libdir;
-fi
-if test "x$with_system_teckit" = xyes; then
- if test "x$with_teckit_includes" != x && test "x$with_teckit_includes" != xyes; then
- TECKIT_INCLUDES="-I$with_teckit_includes"
-fi
-TECKIT_LIBS="-lTECkit"
-if test "x$with_teckit_libdir" != x && test "x$with_teckit_libdir" != xyes; then
- TECKIT_LIBS="-L$with_teckit_libdir $TECKIT_LIBS"
-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'
+ ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include"
+ ICU_LIBS="$kpse_BLD/libs/icu/icu-build/lib/libicule.a $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/libicule.a ${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
-
## _KPSE_LIB_FLAGS: Setup icu (-lsicuxxx) flags
ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include"
ICU_LIBS="$kpse_BLD/libs/icu/icu-build/lib/libicule.a $kpse_BLD/libs/icu/icu-build/lib/libicuuc.a $kpse_BLD/libs/icu/icu-build/lib/libicudata.a"
@@ -22916,6 +23132,30 @@ $(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h
${top_builddir}/../../libs/icu/include/unicode/uversion.h:
cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+## _KPSE_LIB_FLAGS: Setup harfbuzz (-lharfbuzz) flags
+
+# 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" = 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
+
# Check size of off_t (using <kpathsea/config.h>)
eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\"
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index 7e900972dde..a1989b78bdd 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -265,13 +265,18 @@ KPSE_KPATHSEA_FLAGS
KPSE_PTEXENC_FLAGS
KPSE_ZLIB_FLAGS
KPSE_LIBPNG_FLAGS
+KPSE_FREETYPE2_FLAGS
+KPSE_PIXMAN_FLAGS
+KPSE_CAIRO_FLAGS
KPSE_XPDF_FLAGS
KPSE_POPPLER_FLAGS
+KPSE_XPDF_FLAGS
KPSE_ZZIPLIB_FLAGS
KPSE_GRAPHITE_FLAGS
-KPSE_FREETYPE2_FLAGS
KPSE_TECKIT_FLAGS
+KPSE_ICU_FLAGS([icule])[]dnl required by KPSE_HARFBUZZ_FLAGS
KPSE_ICU_XETEX_FLAGS([icule])
+KPSE_HARFBUZZ_FLAGS
# Check size of off_t (using <kpathsea/config.h>)
KPSE_ADD_FLAGS([kpathsea])
diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in
index 5b9b384dfcc..e209f7e0b08 100644
--- a/Build/source/texk/web2c/doc/Makefile.in
+++ b/Build/source/texk/web2c/doc/Makefile.in
@@ -55,18 +55,21 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-asm.m4 \
+ $(top_srcdir)/../../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-cross.m4 \
$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../../m4/kpse-graphite-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-lex.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
$(top_srcdir)/../../m4/kpse-lt-hack.m4 \
$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
+ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
$(top_srcdir)/../../m4/kpse-poppler-flags.m4 \
$(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
@@ -148,6 +151,9 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+CAIRO_DEPEND = @CAIRO_DEPEND@
+CAIRO_INCLUDES = @CAIRO_INCLUDES@
+CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -182,6 +188,10 @@ GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
GRAPHITE_LIBS = @GRAPHITE_LIBS@
GREP = @GREP@
+HARFBUZZ_DEPEND = @HARFBUZZ_DEPEND@
+HARFBUZZ_INCLUDES = @HARFBUZZ_INCLUDES@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+ICU_CONFIG = @ICU_CONFIG@
ICU_DEPEND = @ICU_DEPEND@
ICU_INCLUDES = @ICU_INCLUDES@
ICU_LIBS = @ICU_LIBS@
@@ -231,6 +241,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PIXMAN_DEPEND = @PIXMAN_DEPEND@
+PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
POPPLER_DEPEND = @POPPLER_DEPEND@
POPPLER_INCLUDES = @POPPLER_INCLUDES@
diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in
index 36dea545984..3fe857499a5 100644
--- a/Build/source/texk/web2c/lib/Makefile.in
+++ b/Build/source/texk/web2c/lib/Makefile.in
@@ -57,18 +57,21 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-asm.m4 \
+ $(top_srcdir)/../../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-cross.m4 \
$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../../m4/kpse-graphite-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-lex.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
$(top_srcdir)/../../m4/kpse-lt-hack.m4 \
$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
+ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
$(top_srcdir)/../../m4/kpse-poppler-flags.m4 \
$(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
@@ -140,6 +143,9 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+CAIRO_DEPEND = @CAIRO_DEPEND@
+CAIRO_INCLUDES = @CAIRO_INCLUDES@
+CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -174,6 +180,10 @@ GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
GRAPHITE_LIBS = @GRAPHITE_LIBS@
GREP = @GREP@
+HARFBUZZ_DEPEND = @HARFBUZZ_DEPEND@
+HARFBUZZ_INCLUDES = @HARFBUZZ_INCLUDES@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+ICU_CONFIG = @ICU_CONFIG@
ICU_DEPEND = @ICU_DEPEND@
ICU_INCLUDES = @ICU_INCLUDES@
ICU_LIBS = @ICU_LIBS@
@@ -223,6 +233,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PIXMAN_DEPEND = @PIXMAN_DEPEND@
+PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
POPPLER_DEPEND = @POPPLER_DEPEND@
POPPLER_INCLUDES = @POPPLER_INCLUDES@
diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in
index 243dc0b1129..a68954b7b08 100644
--- a/Build/source/texk/web2c/man/Makefile.in
+++ b/Build/source/texk/web2c/man/Makefile.in
@@ -71,18 +71,21 @@ subdir = man
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-asm.m4 \
+ $(top_srcdir)/../../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-cross.m4 \
$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../../m4/kpse-graphite-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-lex.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
$(top_srcdir)/../../m4/kpse-lt-hack.m4 \
$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
+ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
$(top_srcdir)/../../m4/kpse-poppler-flags.m4 \
$(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
@@ -154,6 +157,9 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+CAIRO_DEPEND = @CAIRO_DEPEND@
+CAIRO_INCLUDES = @CAIRO_INCLUDES@
+CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -188,6 +194,10 @@ GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
GRAPHITE_LIBS = @GRAPHITE_LIBS@
GREP = @GREP@
+HARFBUZZ_DEPEND = @HARFBUZZ_DEPEND@
+HARFBUZZ_INCLUDES = @HARFBUZZ_INCLUDES@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+ICU_CONFIG = @ICU_CONFIG@
ICU_DEPEND = @ICU_DEPEND@
ICU_INCLUDES = @ICU_INCLUDES@
ICU_LIBS = @ICU_LIBS@
@@ -237,6 +247,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PIXMAN_DEPEND = @PIXMAN_DEPEND@
+PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
POPPLER_DEPEND = @POPPLER_DEPEND@
POPPLER_INCLUDES = @POPPLER_INCLUDES@
diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in
index 298233df957..b940e055655 100644
--- a/Build/source/texk/web2c/omegafonts/Makefile.in
+++ b/Build/source/texk/web2c/omegafonts/Makefile.in
@@ -64,18 +64,21 @@ subdir = omegafonts
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-asm.m4 \
+ $(top_srcdir)/../../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-cross.m4 \
$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../../m4/kpse-graphite-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-lex.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
$(top_srcdir)/../../m4/kpse-lt-hack.m4 \
$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
+ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
$(top_srcdir)/../../m4/kpse-poppler-flags.m4 \
$(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
@@ -163,6 +166,9 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+CAIRO_DEPEND = @CAIRO_DEPEND@
+CAIRO_INCLUDES = @CAIRO_INCLUDES@
+CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -197,6 +203,10 @@ GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
GRAPHITE_LIBS = @GRAPHITE_LIBS@
GREP = @GREP@
+HARFBUZZ_DEPEND = @HARFBUZZ_DEPEND@
+HARFBUZZ_INCLUDES = @HARFBUZZ_INCLUDES@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+ICU_CONFIG = @ICU_CONFIG@
ICU_DEPEND = @ICU_DEPEND@
ICU_INCLUDES = @ICU_INCLUDES@
ICU_LIBS = @ICU_LIBS@
@@ -246,6 +256,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PIXMAN_DEPEND = @PIXMAN_DEPEND@
+PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
POPPLER_DEPEND = @POPPLER_DEPEND@
POPPLER_INCLUDES = @POPPLER_INCLUDES@
diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in
index 53596ca3b59..5f1a54fbb1e 100644
--- a/Build/source/texk/web2c/otps/Makefile.in
+++ b/Build/source/texk/web2c/otps/Makefile.in
@@ -63,18 +63,21 @@ DIST_COMMON = $(dist_man1_MANS) $(noinst_HEADERS) \
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-asm.m4 \
+ $(top_srcdir)/../../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-cross.m4 \
$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../../m4/kpse-graphite-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-lex.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
$(top_srcdir)/../../m4/kpse-lt-hack.m4 \
$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
+ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
$(top_srcdir)/../../m4/kpse-poppler-flags.m4 \
$(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
@@ -227,6 +230,9 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+CAIRO_DEPEND = @CAIRO_DEPEND@
+CAIRO_INCLUDES = @CAIRO_INCLUDES@
+CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -261,6 +267,10 @@ GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
GRAPHITE_LIBS = @GRAPHITE_LIBS@
GREP = @GREP@
+HARFBUZZ_DEPEND = @HARFBUZZ_DEPEND@
+HARFBUZZ_INCLUDES = @HARFBUZZ_INCLUDES@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+ICU_CONFIG = @ICU_CONFIG@
ICU_DEPEND = @ICU_DEPEND@
ICU_INCLUDES = @ICU_INCLUDES@
ICU_LIBS = @ICU_LIBS@
@@ -310,6 +320,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PIXMAN_DEPEND = @PIXMAN_DEPEND@
+PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
POPPLER_DEPEND = @POPPLER_DEPEND@
POPPLER_INCLUDES = @POPPLER_INCLUDES@
diff --git a/Build/source/texk/web2c/otps/win32/Makefile.in b/Build/source/texk/web2c/otps/win32/Makefile.in
index d0641fb9401..fc799955936 100644
--- a/Build/source/texk/web2c/otps/win32/Makefile.in
+++ b/Build/source/texk/web2c/otps/win32/Makefile.in
@@ -57,18 +57,21 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-asm.m4 \
+ $(top_srcdir)/../../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-cross.m4 \
$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../../m4/kpse-graphite-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-lex.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
$(top_srcdir)/../../m4/kpse-lt-hack.m4 \
$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
+ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
$(top_srcdir)/../../m4/kpse-poppler-flags.m4 \
$(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
@@ -132,6 +135,9 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+CAIRO_DEPEND = @CAIRO_DEPEND@
+CAIRO_INCLUDES = @CAIRO_INCLUDES@
+CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -166,6 +172,10 @@ GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
GRAPHITE_LIBS = @GRAPHITE_LIBS@
GREP = @GREP@
+HARFBUZZ_DEPEND = @HARFBUZZ_DEPEND@
+HARFBUZZ_INCLUDES = @HARFBUZZ_INCLUDES@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+ICU_CONFIG = @ICU_CONFIG@
ICU_DEPEND = @ICU_DEPEND@
ICU_INCLUDES = @ICU_INCLUDES@
ICU_LIBS = @ICU_LIBS@
@@ -215,6 +225,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PIXMAN_DEPEND = @PIXMAN_DEPEND@
+PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
POPPLER_DEPEND = @POPPLER_DEPEND@
POPPLER_INCLUDES = @POPPLER_INCLUDES@
diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in
index c12f4f57b58..172b3a22414 100644
--- a/Build/source/texk/web2c/window/Makefile.in
+++ b/Build/source/texk/web2c/window/Makefile.in
@@ -57,18 +57,21 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-asm.m4 \
+ $(top_srcdir)/../../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-cross.m4 \
$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../../m4/kpse-graphite-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-lex.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
$(top_srcdir)/../../m4/kpse-lt-hack.m4 \
$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
+ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
$(top_srcdir)/../../m4/kpse-poppler-flags.m4 \
$(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
@@ -138,6 +141,9 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+CAIRO_DEPEND = @CAIRO_DEPEND@
+CAIRO_INCLUDES = @CAIRO_INCLUDES@
+CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -172,6 +178,10 @@ GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
GRAPHITE_LIBS = @GRAPHITE_LIBS@
GREP = @GREP@
+HARFBUZZ_DEPEND = @HARFBUZZ_DEPEND@
+HARFBUZZ_INCLUDES = @HARFBUZZ_INCLUDES@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+ICU_CONFIG = @ICU_CONFIG@
ICU_DEPEND = @ICU_DEPEND@
ICU_INCLUDES = @ICU_INCLUDES@
ICU_LIBS = @ICU_LIBS@
@@ -221,6 +231,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PIXMAN_DEPEND = @PIXMAN_DEPEND@
+PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
+PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
POPPLER_DEPEND = @POPPLER_DEPEND@
POPPLER_INCLUDES = @POPPLER_INCLUDES@