configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 504638e73f2a6d5bfcba9eb83db4fcdebe4f37f8 Author: Tor Lillqvist <t...@iki.fi> Date: Thu Jun 13 12:22:49 2013 +0300
Disable Graphite for Android and iOS It definitely does not make sense for iOS, I assume. For Android the situation is unclear, but let's disable it for now. It causes linking errors currently anyway as the graphite_serverfont.cxx is not compiled for Android. (Whether it could and should be compiled then instead of disabling Graphite, I don't know.) Change-Id: I1a874d304af508d2217da08e49dc158664f2e9d2 diff --git a/configure.ac b/configure.ac index 7c7575e..a2f82db 100644 --- a/configure.ac +++ b/configure.ac @@ -8373,7 +8373,7 @@ dnl Graphite dnl =================================================================== AC_MSG_CHECKING([whether to enable graphite support]) -if test "$_os" != "Darwin" && test "$enable_graphite" = "" -o "$enable_graphite" != "no"; then +if test $_os != Darwin -a $_os != Android -a $_os != iOS -a \( -z "$enable_graphite" -o "$enable_graphite" != no \); then AC_MSG_RESULT([yes]) ENABLE_GRAPHITE="TRUE" AC_DEFINE(ENABLE_GRAPHITE) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits