diff options
| author | Karl Berry <karl@freefriends.org> | 2019-06-26 16:09:52 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2019-06-26 16:09:52 +0000 |
| commit | e8cdab59f1d33c0138e65e9c2fc327e98aa4cec7 (patch) | |
| tree | 6f9f7168b90d31ac0df13d6692ca5e0e36090224 /Build/source/m4 | |
| parent | 231b1783253e75f1196dd7b0402879e5ada1692d (diff) | |
omit icu test from harfbuzz test
git-svn-id: svn://tug.org/texlive/trunk@51470 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
| -rw-r--r-- | Build/source/m4/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/m4/kpse-harfbuzz-flags.m4 | 34 |
2 files changed, 31 insertions, 9 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])]) |