From 49b28849e5076d5e63aab9ed50f87c61e1f43e43 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Fri, 7 Jun 2013 11:37:41 +0200
Subject: [PATCH] Revert "simplify check for harfbuzz"

This reverts commit 36edf2e6fff430beeb35882b408ceb01453a9e18.
---
 configure.ac | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0be2012923ac..ff19a0d7cbec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8388,10 +8388,14 @@ AC_MSG_CHECKING([whether to enable HarfBuzz support])
 if test "$_os" != "WINNT" -a "$_os" != "Darwin"; then
     AC_MSG_RESULT([yes])
     ENABLE_HARFBUZZ="TRUE"
-    if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
-        libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.18])
+    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
     else
-        libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10])
+    	libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10])
     fi
 else
     AC_MSG_RESULT([no])