diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8d12c163..4ffabad10 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,6 @@ endif ()
## HarfBuzz build configurations
option(HB_HAVE_FREETYPE "Enable freetype interop helpers" OFF)
option(HB_HAVE_GRAPHITE2 "Enable Graphite2 complementary shaper" OFF)
-option(HB_BUILTIN_UCDN "Use HarfBuzz provided UCDN" ON)
option(HB_HAVE_GLIB "Enable glib unicode functions" OFF)
option(HB_HAVE_ICU "Enable icu unicode functions" OFF)
if (APPLE)
@@ -70,7 +69,6 @@ option(HB_CHECK OFF "Do a configuration suitable for testing (shared library and
if (HB_CHECK)
set (BUILD_SHARED_LIBS ON)
set (HB_BUILD_UTILS ON)
- set (HB_BUILTIN_UCDN ON)
set (HB_HAVE_ICU)
set (HB_HAVE_GLIB ON)
#set (HB_HAVE_GOBJECT ON)
@@ -160,7 +158,6 @@ endfunction ()
file(READ ${PROJECT_SOURCE_DIR}/src/Makefile.sources SRCSOURCES)
file(READ ${PROJECT_SOURCE_DIR}/util/Makefile.sources UTILSOURCES)
-file(READ ${PROJECT_SOURCE_DIR}/src/hb-ucdn/Makefile.sources UCDNSOURCES)
extract_make_variable(HB_BASE_sources ${SRCSOURCES})
add_prefix_to_list(HB_BASE_sources "${PROJECT_SOURCE_DIR}/src/")
@@ -191,9 +188,6 @@ add_prefix_to_list(HB_SUBSET_CLI_sources "${PROJECT_SOURCE_DIR}/util/")
extract_make_variable(HB_OT_SHAPE_CLOSURE_sources ${UTILSOURCES})
add_prefix_to_list(HB_OT_SHAPE_CLOSURE_sources "${PROJECT_SOURCE_DIR}/util/")
-extract_make_variable(LIBHB_UCDN_sources ${UCDNSOURCES})
-add_prefix_to_list(LIBHB_UCDN_sources "${PROJECT_SOURCE_DIR}/src/hb-ucdn/")
-
file(READ configure.ac CONFIGUREAC)
string(REGEX MATCH "\\[(([0-9]+)\\.([0-9]+)\\.([0-9]+))\\]" HB_VERSION_MATCH ${CONFIGUREAC})
@@ -295,14 +289,6 @@ if (HB_HAVE_GRAPHITE2)
mark_as_advanced(GRAPHITE2_INCLUDE_DIR GRAPHITE2_LIBRARY)
endif ()
-if (HB_BUILTIN_UCDN)
- include_directories(src/hb-ucdn)
- add_definitions(-DHAVE_UCDN)
-
- list(APPEND project_sources ${PROJECT_SOURCE_DIR}/src/hb-ucdn.cc)
- list(APPEND project_extra_sources ${LIBHB_UCDN_sources})
-endif ()
-
if (HB_HAVE_GLIB)
add_definitions(-DHAVE_GLIB)
diff --git a/configure.ac b/configure.ac
index 8444e3bf2..e835f498c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -300,21 +300,6 @@ AM_CONDITIONAL(HAVE_ICU_BUILTIN, $have_icu && test "x$with_icu" = "xbuiltin")
dnl ===========================================================================
-AC_ARG_WITH(ucdn,
- [AS_HELP_STRING([--with-ucdn=@<:@yes/no@:>@],
- [Use builtin UCDN library @<:@default=yes@:>@])],,
- [with_ucdn=yes])
-have_ucdn=false
-if test "x$with_ucdn" = "xyes"; then
- have_ucdn=true
-fi
-if $have_ucdn; then
- AC_DEFINE(HAVE_UCDN, 1, [Have UCDN Unicode functions])
-fi
-AM_CONDITIONAL(HAVE_UCDN, $have_ucdn)
-
-dnl ==========================================================================
-
AC_ARG_WITH(graphite2,
[AS_HELP_STRING([--with-graphite2=@<:@yes/no/auto@:>@],
[Use the graphite2 library @<:@default=no@:>@])],,
@@ -497,7 +482,6 @@ AC_CONFIG_FILES([
Makefile
src/Makefile
src/harfbuzz-config.cmake
-src/hb-ucdn/Makefile
util/Makefile
test/Makefile
test/api/Makefile
@@ -525,7 +509,7 @@ AC_MSG_NOTICE([
Build configuration:
Unicode callbacks (you want at least one):
- Builtin (UCDN): ${have_ucdn}
+ Builtin true
Glib: ${have_glib}
ICU: ${have_icu}
diff --git a/docs/usermanual-install-harfbuzz.xml b/docs/usermanual-install-harfbuzz.xml
index a1e7ab012..2b61ce81d 100644
--- a/docs/usermanual-install-harfbuzz.xml
+++ b/docs/usermanual-install-harfbuzz.xml
@@ -246,7 +246,7 @@
Use GLib. (Default = auto)
-
+
This option enables or disables usage of the GLib
library. The default setting is to check for the
@@ -297,7 +297,7 @@
Use Fontconfig. (Default = auto)
-
+
This option enables or disables usage of the Fontconfig
library, which provides font-matching functions and
@@ -317,7 +317,7 @@
Use the ICU library. (Default = auto)
-
+
This option enables or disables usage of the
International Components for
@@ -330,30 +330,12 @@
-
- --with-ucdn
-
-
- Use HarfBuzz's built-in UCDN library. (Default = auto)
-
-
- The HarfBuzz source tree includes a Unicode
- Database and Normalization (UCDN) library
- that provides access to basic character properties in
- the Unicode Character Database (UCD) as well as low-level
- normalization functions. HarfBuzz can be built without
- this UCDN support if the usage of a different UCDN
- library is desired.
-
-
-
-
--with-graphite2
Use the Graphite2 library. (Default = no)
-
+
This option enables or disables usage of the Graphite2
library, which provides support for the Graphite shaping
@@ -367,7 +349,7 @@
Use the FreeType library. (Default = auto)
-
+
This option enables or disables usage of the FreeType
font-rendering library. The default setting is to check for the
@@ -384,7 +366,7 @@
Use the Uniscribe
library (experimental). (Default = no)
-
+
This option enables or disables usage of the Uniscribe
font-rendering library. Uniscribe is available on
@@ -400,7 +382,7 @@
Use the DirectWrite library (experimental). (Default = no)
-
+
This option enables or disables usage of the DirectWrite
font-rendering library. DirectWrite is available on
@@ -416,7 +398,7 @@
Use the CoreText library. (Default = no)
-
+
This option enables or disables usage of the CoreText
library. CoreText is available on macOS and iOS systems.