mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "simplify check for harfbuzz""

Browse Source 
This reverts commit 49b28849e5.
This commit is contained in:
David Tardon
2013-06-07 11:44:43 +02:00
parent 2e5800269d
commit 08a6da9941
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@@ -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