Skip to content

C
core
Kaydet (Commit) 08a6da99 authored tarafından David Tardon's avatar David Tardon
Dosyalara gözat
Seçenekler

Revert "Revert "simplify check for harfbuzz"" 

This reverts commit 49b28849.
üst 2e580026
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
configure.ac
Dosyayı görüntüle @ 08a6da99
...@@ -8388,12 +8388,8 @@ AC_MSG_CHECKING([whether to enable HarfBuzz support]) ...@@ -8388,12 +8388,8 @@ AC_MSG_CHECKING([whether to enable HarfBuzz support])
if test "$_os" != "WINNT" -a "$_os" != "Darwin"; then if test "$_os" != "WINNT" -a "$_os" != "Darwin"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
ENABLE_HARFBUZZ="TRUE" 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
if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.18])
libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.18])
else
libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10])
fi
else else
libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10]) libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10])
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment