diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-05-06 11:08:29 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2013-05-06 17:22:31 +0200 |
| commit | bff8fa97e16f0f06fddc5545ea36c8bd2b18a580 (patch) | |
| tree | 68f92f1622770a178a770f802ec8f6b4db3e1a3b /configure.ac | |
| parent | f0393d7ff69011a16b100541ef18e5090544e4a1 (diff) | |
Enable HarfBuzz by default
HarfBuzz integration should be functional now, so to give it more wider
testing it is made now a required dependency on non-Windows non-Mac OSs.
By default text layout is now done by HarfBuzz but ICU LayoutEngine is
kept as a fallback and can be enabled with SAL_USE_ICULE env variable.
After 4.1.x is branched, ICU LayoutEngine should be removed completely.
Change-Id: I4fe3beeaf6092f33dd436906c11b83aeafdfbd5d
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 75e26bd74fee..cda53d4c9ca3 100644 --- a/configure.ac +++ b/configure.ac @@ -720,11 +720,6 @@ AC_ARG_ENABLE(graphite, [Enables the compilation of Graphite smart font rendering.]) ) -AC_ARG_ENABLE(harfbuzz, - AS_HELP_STRING([--enable-harfbuzz], - [Determines whether to use HarfBuzz text layout engine.]) -) - AC_ARG_ENABLE(fetch-external, AS_HELP_STRING([--disable-fetch-external], [Disables fetching external tarballs from web sources.]) @@ -8482,10 +8477,9 @@ dnl =================================================================== dnl HarfBuzz dnl =================================================================== AC_MSG_CHECKING([whether to enable HarfBuzz support]) -if test "$_os" != "WINNT" -a "$_os" != "Darwin" && test "$enable_harfbuzz" = "" -o "$enable_harfbuzz" != "no"; then +if test "$_os" != "WINNT" -a "$_os" != "Darwin"; then AC_MSG_RESULT([yes]) ENABLE_HARFBUZZ="TRUE" - AC_DEFINE(ENABLE_HARFBUZZ) libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10]) else AC_MSG_RESULT([no]) @@ -11978,7 +11972,6 @@ AC_CONFIG_HEADERS([config_host/config_clang.h]) AC_CONFIG_HEADERS([config_host/config_features.h]) AC_CONFIG_HEADERS([config_host/config_global.h]) AC_CONFIG_HEADERS([config_host/config_graphite.h]) -AC_CONFIG_HEADERS([config_host/config_harfbuzz.h]) AC_CONFIG_HEADERS([config_host/config_lgpl.h]) AC_CONFIG_HEADERS([config_host/config_kde4.h]) AC_CONFIG_HEADERS([config_host/config_mingw.h]) |