configure.ac | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
New commits: commit 1f49550a98823daa9ebf0d8471824fd84a9b4e65 Author: David Tardon <dtar...@redhat.com> Date: Fri Jun 7 11:39:48 2013 +0200 whitespace: \t -> spaces Change-Id: Iae5ef71a284407cd2d6f0f604b1ae621d0bceba9 diff --git a/configure.ac b/configure.ac index ff19a0d..ec2aa7d 100644 --- a/configure.ac +++ b/configure.ac @@ -8389,13 +8389,13 @@ if test "$_os" != "WINNT" -a "$_os" != "Darwin"; then AC_MSG_RESULT([yes]) 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 - libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.18]) - else - libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10]) + 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]) commit 49b28849e5076d5e63aab9ed50f87c61e1f43e43 Author: David Tardon <dtar...@redhat.com> Date: Fri Jun 7 11:37:41 2013 +0200 Revert "simplify check for harfbuzz" This reverts commit 36edf2e6fff430beeb35882b408ceb01453a9e18. diff --git a/configure.ac b/configure.ac index 0be2012..ff19a0d 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]) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits