Kaydet (Commit) 9364a49a authored tarafından Akash Jain's avatar Akash Jain Kaydeden (comit) Khaled Hosny

Add option to enable HarfBuzz support independent of platform

Make HarfBuzz compile on any platform using the --with-harfbuzz
option. Support is experimental only.

Change-Id: I84fb80f3f8abed8ac877a294cf7ef39cf4cb2e9e
Reviewed-on: https://gerrit.libreoffice.org/25369Reviewed-by: 's avatarKhaled Hosny <khaledhosny@eglug.org>
Tested-by: 's avatarKhaled Hosny <khaledhosny@eglug.org>
üst d5397bf1
...@@ -2131,6 +2131,12 @@ AC_ARG_WITH(iwyu, ...@@ -2131,6 +2131,12 @@ AC_ARG_WITH(iwyu,
Use only if you are hacking on it.]), Use only if you are hacking on it.]),
,) ,)
AC_ARG_WITH(harfbuzz,
AS_HELP_STRING([--with-harfbuzz],
[Enable HarfBuzz support regardless of the platform.
Experimental only. Use only if working on it.]),
,)
dnl =================================================================== dnl ===================================================================
dnl Branding dnl Branding
dnl =================================================================== dnl ===================================================================
...@@ -9205,7 +9211,7 @@ dnl =================================================================== ...@@ -9205,7 +9211,7 @@ dnl ===================================================================
dnl HarfBuzz dnl HarfBuzz
dnl =================================================================== dnl ===================================================================
AC_MSG_CHECKING([whether to enable HarfBuzz support]) AC_MSG_CHECKING([whether to enable HarfBuzz support])
if test $_os != WINNT -a $_os != Darwin -a $_os != iOS; then if test "$with_harfbuzz" = "yes" -o \( $_os != WINNT -a $_os != Darwin -a $_os != iOS \); then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
ENABLE_HARFBUZZ="TRUE" ENABLE_HARFBUZZ="TRUE"
if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
......
...@@ -21,7 +21,8 @@ $(eval $(call gb_ExternalProject_use_externals,harfbuzz,\ ...@@ -21,7 +21,8 @@ $(eval $(call gb_ExternalProject_use_externals,harfbuzz,\
$(call gb_ExternalProject_get_state_target,harfbuzz,build) : $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(if $(CROSS_COMPILING),PATH=$(SRCDIR)/external/icu/cross-bin:$$PATH) \ $(if $(CROSS_COMPILING),ICU_CONFIG=$(SRCDIR)/external/icu/cross-bin/icu-config) \
$(if $(SYSTEM_ICU),,ICU_CONFIG=$(SRCDIR)/external/icu/cross-bin/icu-config) \
./configure \ ./configure \
--enable-static \ --enable-static \
--disable-shared \ --disable-shared \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment