diff options
| author | David Tardon <dtardon@redhat.com> | 2013-06-07 11:37:41 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-06-07 11:38:41 +0200 |
| commit | 49b28849e5076d5e63aab9ed50f87c61e1f43e43 (patch) | |
| tree | 24d1c43b6743b568c1585ad73465bf91c952942f /configure.ac | |
| parent | 042fbe97bb758282fe8b6df9ed9eac74b92c53d5 (diff) | |
Revert "simplify check for harfbuzz"
This reverts commit 36edf2e6fff430beeb35882b408ceb01453a9e18.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files 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]) |