summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-06-07 11:44:43 +0200
committerDavid Tardon <dtardon@redhat.com>2013-06-07 11:46:55 +0200
commit08a6da99415c6b9f6f7e705e2d276ce2febf4e8b (patch)
tree6094cf15c7844d64b83b081ff0f0aa398f30a055
parent2e5800269d88b00f311746e8173c90779f5b888d (diff)
Revert "Revert "simplify check for harfbuzz""
-rw-r--r--configure.ac8
1 files changed, 2 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index ec2aa7d0ca17..0be2012923ac 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