From e8cdab59f1d33c0138e65e9c2fc327e98aa4cec7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 26 Jun 2019 16:09:52 +0000 Subject: omit icu test from harfbuzz test git-svn-id: svn://tug.org/texlive/trunk@51470 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/configure.ac | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'Build/source/texk/web2c/configure.ac') diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 8a6808c3de1..d7e5be5ac88 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -1,7 +1,7 @@ dnl $Id$ dnl Process this file with Autoconf to produce a configure script for Web2c. dnl -dnl Copyright 2018 Karl Berry +dnl Copyright 2018-2019 Karl Berry dnl Copyright 2009-2015 Peter Breitenlohner dnl dnl This file is free software; the copyright holder @@ -98,7 +98,7 @@ if test "x$enable_ipc" = xyes; then AC_DEFINE([IPC], 1, [tex: Define to enable --ipc.]) fi -# We may need additional libraries for luaTeX. +# We may need additional libraries for LuaTeX. # On Solaris -lnsl for gethostbyname(), -lrt for nanosleep(), # and maybe -lresolv for inet_aton(). lua_socketlibs=$socketlibs @@ -263,9 +263,18 @@ KPSE_POPPLER_FLAGS KPSE_XPDF_FLAGS KPSE_ZZIPLIB_FLAGS KPSE_TECKIT_FLAGS -KPSE_ICU_FLAGS -KPSE_HARFBUZZ_FLAGS -KPSE_GRAPHITE2_FLAGS + +# LuaTeX and XeTeX need harfbuzz. +if test "x$enable_xetex" = xyes \ + || test "x$enable_luatex" = xyes || test "x$enable_luatex53" = xyes; then + KPSE_HARFBUZZ_FLAGS +fi # end xetex/luatex for harfbuzz + +# XeTeX, but not LuaTeX, needs icu and graphite. +if test "x$enable_xetex" = xyes; then + KPSE_ICU_FLAGS + KPSE_GRAPHITE2_FLAGS +fi # end xetex for icu/graphite # Check size of off_t (using ) KPSE_ADD_FLAGS([kpathsea]) @@ -343,7 +352,7 @@ AH_TOP([/* w2c/c-auto.h: defines for web2c, as determined by configure. #define WEB2CVERSION "REPLACE-WITH-WEB2CVERSION"]) AH_BOTTOM([#endif /* !WEB2C_C_AUTO_H */]) -dnl Additional config header for luaTeX +dnl Additional config header for LuaTeX AC_CONFIG_HEADERS([ff-config.h:luatexdir/luafontloader/ff-config.in]) # For cross-compilation. Put at the end so there is a fair chance -- cgit v1.2.3