summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/m4/ChangeLog6
-rw-r--r--Build/source/m4/kpse-harfbuzz-flags.m434
-rw-r--r--Build/source/texk/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/configure.ac21
4 files changed, 51 insertions, 15 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index f4345adb408..f2b05276630 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,9 @@
+2019-06-26 Karl Berry <karl@freefriends.org>
+
+ * kpse-harfbuzz-flags.m4 (KPSE_HARFBUZZ_FLAGS): omit KPSE_ICU_FLAGS.
+ (KPSE_HARFBUZZ_SYSTEM_FLAGS): call pkg-config harfbuzz,
+ not harfbuzz-icu.
+
2019-03-25 Karl Berry <karl@freefriends.org>
* kpse-freetype2-flags.m4 (KPSE_FREETYPE2_SYSTEM_FLAGS): try
diff --git a/Build/source/m4/kpse-harfbuzz-flags.m4 b/Build/source/m4/kpse-harfbuzz-flags.m4
index 51bc12d60b9..650b65c1e7a 100644
--- a/Build/source/m4/kpse-harfbuzz-flags.m4
+++ b/Build/source/m4/kpse-harfbuzz-flags.m4
@@ -1,5 +1,7 @@
+# $Id$
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2012-2015 Peter Breitenlohner <tex-live@tug.org>
+# Copyright 2015-2019 Karl Berry <tex-live@tug.org>
+# Copyright 2012-2015 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -8,22 +10,36 @@
# KPSE_HARFBUZZ_FLAGS
# -------------------
# Provide the configure options '--with-system-harfbuzz' (if in the TL tree).
-#
-# Set the make variables HARFBUZZ_INCLUDES and HARFBUZZ_LIBS to the CPPFLAGS and
-# LIBS required for the `-lharfbuzz' library in libs/harfbuzz/ of the TL tree.
+#
+# Set the make variables HARFBUZZ_INCLUDES and HARFBUZZ_LIBS to the
+# CPPFLAGS and LIBS required for the `-lharfbuzz' library in
+# libs/harfbuzz/ of the TL tree.
+#
+# We used to require icu here, but LuaTeX (2019) wants only harfbuzz,
+# not icu, and everything in our tree that wants icu requires it
+# explicitly. So no need.
+#
AC_DEFUN([KPSE_HARFBUZZ_FLAGS], [dnl
AC_REQUIRE([KPSE_GRAPHITE2_FLAGS])[]dnl
-AC_REQUIRE([KPSE_ICU_FLAGS])[]dnl
_KPSE_LIB_FLAGS([harfbuzz], [harfbuzz], [],
- [-IBLD/libs/harfbuzz/include], [BLD/libs/harfbuzz/libharfbuzz.a], [],
- [], [${top_builddir}/../../libs/harfbuzz/include/hb.h])[]dnl
+ [-IBLD/libs/harfbuzz/include],
+ [BLD/libs/harfbuzz/libharfbuzz.a], [], [],
+ [${top_builddir}/../../libs/harfbuzz/include/hb.h])[]dnl
]) # KPSE_HARFBUZZ_FLAGS
# KPSE_HARFBUZZ_OPTIONS([WITH-SYSTEM])
# ------------------------------------
-AC_DEFUN([KPSE_HARFBUZZ_OPTIONS], [_KPSE_LIB_OPTIONS([harfbuzz], [$1], [pkg-config])])
+AC_DEFUN([KPSE_HARFBUZZ_OPTIONS], [dnl
+_KPSE_LIB_OPTIONS([harfbuzz], [$1], [pkg-config])])
# KPSE_HARFBUZZ_SYSTEM_FLAGS
# --------------------------
+# We used to ask for harfbuzz-icu here, that is, we called
+# pkg-config harfbuzz-icu instead of just harfbuzz. But we never
+# actually used the ICU support builtin to harfbuzz; Jonathan Kew had a
+# theory many years ago (private email, 21 October 2009) to switch xetex
+# to using that, and thus eliminate the need for xetex to link with icu,
+# but it never came to fruition. So, since LuaTeX (2019) wants harfbuzz
+# without icu, back to just harfbuzz
AC_DEFUN([KPSE_HARFBUZZ_SYSTEM_FLAGS], [dnl
-_KPSE_PKG_CONFIG_FLAGS([harfbuzz], [harfbuzz-icu])])
+_KPSE_PKG_CONFIG_FLAGS([harfbuzz], [harfbuzz])])
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 222f8d07456..647845d18c0 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2019-06-26 Karl Berry <karl@freefriends.org>
+
+ * configure.ac (KPSE_ICU_FLAGS, KPSE_GRAPHITE2_FLAGS) [xetex],
+ (KPSE_HARFBUZZ_FLAGS) [xetex || luatex[53]]: make test conditional.
+
2019-05-29 Andreas Scherer <https://ascherer.github.io>
* cwebboot.cin: Rebuild after recent changes.
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 <tex-live@tug.org>
+dnl Copyright 2018-2019 Karl Berry <tex-live@tug.org>
dnl Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
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 <kpathsea/config.h>)
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