configure.ac | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 90a2c73f903b8d07b52dc7774fd7296b2bf0c125
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Tue Aug 20 11:46:02 2013 +0200
Don't unnecessarily require too new harfbuzz
Change-Id: I1fc9b29255c9822406dfc6ddb05b3a7f63fcd216
diff --git a/configure.ac b/configure.ac
index d593de8..c9eaaa1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8910,7 +8910,11 @@ AC_MSG_CHECKING([whether to enable HarfBuzz support])
if test $_os != WINNT -a $_os != Darwin -a $_os != iOS; then
AC_MSG_RESULT([yes])
ENABLE_HARFBUZZ="TRUE"
- libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.18])
+ 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
AC_MSG_RESULT([no])
fi
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
