[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - configure.ac

[Rene Engelhard]

 configure.ac |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 1b39b2059c0b073e21da40d2426262747cea54a9
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Jun 2 13:05:07 2013 +0200

    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 at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/configure.ac b/configure.ac
index c31a287..23dcbad 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