summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-10-19 21:35:02 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-10-19 21:35:02 +0000
commite9127cfd99715a8923cf1c4236ff0add5c00d2af (patch)
treea7a5cbc1d2e91335986d6a96eca44f880d790d09 /Build
parent501acd92a2153c7e76f9b5a42fafaa2b3a8370e5 (diff)
Set HAVE_ICU_BUILTIN when building HarfBuzz (Khaled Hosny)
git-svn-id: svn://tug.org/texlive/trunk@48947 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/harfbuzz/ChangeLog4
-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
4 files changed, 11 insertions, 0 deletions
diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog
index 48421da880d..fd5a6cfd927 100644
--- a/Build/source/libs/harfbuzz/ChangeLog
+++ b/Build/source/libs/harfbuzz/ChangeLog
@@ -1,3 +1,7 @@
+2018-10-20 Khaled Hosny <khaledhosny@eglug.org>
+
+ * configure.ac: Set HAVE_ICU_BUILTIN.
+
2018-09-11 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
Import harfbuzz-1.9.0.
diff --git a/Build/source/libs/harfbuzz/config.h.in b/Build/source/libs/harfbuzz/config.h.in
index 327a113ac1f..a5ee4ba9b1c 100644
--- a/Build/source/libs/harfbuzz/config.h.in
+++ b/Build/source/libs/harfbuzz/config.h.in
@@ -40,6 +40,9 @@
/* Use ICU library */
#undef HAVE_ICU
+/* ICU support is not a seperate library */
+#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 04479097c61..75485dc763b 100755
--- a/Build/source/libs/harfbuzz/configure
+++ b/Build/source/libs/harfbuzz/configure
@@ -7545,6 +7545,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 ebb17a1d866..3ec6766731b 100644
--- a/Build/source/libs/harfbuzz/configure.ac
+++ b/Build/source/libs/harfbuzz/configure.ac
@@ -85,6 +85,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, [ICU support is not a seperate library])
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