[Libreoffice-commits] core.git: 2 commits - configure.ac harfbuzz/Module_harfbuzz.mk

[Tor Lillqvist]

 configure.ac                |    2 +-
 harfbuzz/Module_harfbuzz.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 86b9f81c80ebfa1da77982232ee00572249b4803
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Aug 19 21:59:21 2013 +0300

    Test ENABLE_HARFBUZZ, too
    
    Change-Id: I3e2ce690fcfd84d91979e737a1977f61319e2a55

diff --git a/harfbuzz/Module_harfbuzz.mk b/harfbuzz/Module_harfbuzz.mk
index 8eb9c17..7efb5d4 100644
--- a/harfbuzz/Module_harfbuzz.mk
+++ b/harfbuzz/Module_harfbuzz.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Module_Module,harfbuzz))
 
-ifeq ($(SYSTEM_HARFBUZZ),NO)
+ifeq ($(ENABLE_HARFBUZZ)-$(SYSTEM_HARFBUZZ),YES-NO)
 
 $(eval $(call gb_Module_add_targets,harfbuzz,\
 	ExternalPackage_harfbuzz \
commit 3640aa3ac516aa66019950ea3771df82248dd557
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Aug 19 21:58:56 2013 +0300

    We hardly want harfbuzz on iOS if we don't want it on Darwin
    
    Change-Id: I38ce976e55e9800971dcd300902578e06540f358

diff --git a/configure.ac b/configure.ac
index 46fd086..d593de8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8907,7 +8907,7 @@ dnl ===================================================================
 dnl HarfBuzz
 dnl ===================================================================
 AC_MSG_CHECKING([whether to enable HarfBuzz support])
-if test "$_os" != "WINNT" -a "$_os" != "Darwin"; then
+if test $_os != WINNT -a $_os != Darwin -a $_os != iOS; then
     AC_MSG_RESULT([yes])
     ENABLE_HARFBUZZ="TRUE"
     libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.18])