[Libreoffice-commits] core.git: configure.ac

[David Tardon]

 configure.ac |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 08a6da99415c6b9f6f7e705e2d276ce2febf4e8b
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Jun 7 11:44:43 2013 +0200

    Revert "Revert "simplify check for harfbuzz""
    
    This reverts commit 49b28849e5076d5e63aab9ed50f87c61e1f43e43.

diff --git a/configure.ac b/configure.ac
index ec2aa7d..0be2012 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8388,12 +8388,8 @@ AC_MSG_CHECKING([whether to enable HarfBuzz support])
 if test "$_os" != "WINNT" -a "$_os" != "Darwin"; then
     AC_MSG_RESULT([yes])
     ENABLE_HARFBUZZ="TRUE"
-    if test "$with_system_harfbuzz" = "yes" -o "$with_system_libs" = "yes"; then
-        if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
-            libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.18])
-        else
-            libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10])
-        fi
+    if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
+        libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.18])
     else
         libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10])
     fi