summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-03-18 07:33:38 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-03-18 07:33:38 +0000
commit339c9f447c0e43f83957979e391a0acb0fc02400 (patch)
tree05120783056e05a109444fee772bc7ccbddcaaaf /Build
parentc840c77749a483bd31fa799243bb88fb39310642 (diff)
harfbuzz 1.2.4
git-svn-id: svn://tug.org/texlive/trunk@40062 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/harfbuzz/config.h.in3
-rwxr-xr-xBuild/source/libs/harfbuzz/configure3
-rw-r--r--Build/source/libs/harfbuzz/configure.ac1
3 files changed, 7 insertions, 0 deletions
diff --git a/Build/source/libs/harfbuzz/config.h.in b/Build/source/libs/harfbuzz/config.h.in
index 345759d3cd1..971fd89efd3 100644
--- a/Build/source/libs/harfbuzz/config.h.in
+++ b/Build/source/libs/harfbuzz/config.h.in
@@ -33,6 +33,9 @@
/* Use ICU library */
#undef HAVE_ICU
+/* Use hb-icu Unicode callbacks */
+#undef HAVE_ICU_BUILTIN
+
/* Use Intel __sync_* atomic primitives */
#undef HAVE_INTEL_ATOMIC_PRIMITIVES
diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure
index b1178310eb9..454e9ac10ac 100755
--- a/Build/source/libs/harfbuzz/configure
+++ b/Build/source/libs/harfbuzz/configure
@@ -6275,6 +6275,9 @@ $as_echo "#define HAVE_OT 1" >>confdefs.h
$as_echo "#define HAVE_ICU 1" >>confdefs.h
+$as_echo "#define HAVE_ICU_BUILTIN 1" >>confdefs.h
+
+
$as_echo "#define HAVE_GRAPHITE2 1" >>confdefs.h
else
diff --git a/Build/source/libs/harfbuzz/configure.ac b/Build/source/libs/harfbuzz/configure.ac
index 75e3ae77176..7e67c2d1074 100644
--- a/Build/source/libs/harfbuzz/configure.ac
+++ b/Build/source/libs/harfbuzz/configure.ac
@@ -60,6 +60,7 @@ fi
if :; then
AC_DEFINE([HAVE_OT], 1, [Use native OpenType Layout backend])
AC_DEFINE([HAVE_ICU], 1, [Use ICU library])
+ AC_DEFINE(HAVE_ICU_BUILTIN, 1, [Use hb-icu Unicode callbacks])
AC_DEFINE([HAVE_GRAPHITE2], 1, [Use Graphite library])
else
dnl add all these to config.h.in but do not define them in config.h