[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 test/api/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 02d6439f420d959183dd446abd0b0118ee1ee061
Merge: 9002c27 160f635
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Aug 3 22:47:18 2015 +0300

    Merge pull request #122 from RomainNaour/static-fix
    
    fix static linking with icu-uc

commit 160f635523d596f61e292776f638d4eb09673463
Author: Romain Naour <romain.naour at openwide.fr>
Date:   Wed Jul 22 23:26:23 2015 +0200

    fix static linking with icu-uc
    
    When linking test-unicode statically it needs $(ICU_LIBS)
    which contains all required flags.
    Especially -lstdc++.
    
    Fixes:
    http://autobuild.buildroot.net/results/210/2107f9dfb39eeb6559fb4271c7af8b39aef521ca/
    
    Signed-off-by: Romain Naour <romain.naour at openwide.fr>

diff --git a/test/api/Makefile.am b/test/api/Makefile.am
index 4ff14fa..314a09f 100644
--- a/test/api/Makefile.am
+++ b/test/api/Makefile.am
@@ -34,7 +34,7 @@ test_unicode_CPPFLAGS += $(GLIB_CFLAGS)
 endif
 if HAVE_ICU
 test_unicode_CPPFLAGS += $(ICU_CFLAGS)
-test_unicode_LDADD += $(top_builddir)/src/libharfbuzz-icu.la
+test_unicode_LDADD += $(top_builddir)/src/libharfbuzz-icu.la $(ICU_LIBS)
 endif