diff options
| author | Rene Engelhard <rene@debian.org> | 2013-06-02 13:05:07 +0200 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2013-06-02 18:16:46 +0000 |
| commit | 1b39b2059c0b073e21da40d2426262747cea54a9 (patch) | |
| tree | dcf3b4ff7a3837a55889d9729fd3eeed7ac90596 | |
| parent | d2c26bafc7675080c9cd65ac9844ae39497bd37f (diff) | |
fix build with system-harfbuzz >= 0.9.18
.. as it split out the icu libs and thus we need to use harfbuzz-icu
for pkg-config to get the needed -lharfbuzz-icu
Change-Id: I6b3721ab37934881fbb876c0f4cb229b578b4121
Reviewed-on: https://gerrit.libreoffice.org/4131
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c31a2872194b..23dcbadb16a0 100644 --- a/configure.ac +++ b/configure.ac @@ -8399,7 +8399,15 @@ AC_MSG_CHECKING([whether to enable HarfBuzz support]) if test "$_os" != "WINNT" -a "$_os" != "Darwin"; then AC_MSG_RESULT([yes]) ENABLE_HARFBUZZ="TRUE" - libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10]) + if test "$with_system_harfbuzz" = "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]) + fi else AC_MSG_RESULT([no]) fi |