[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/Makefile.am |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit b68b86daf1a8478b86aeae44a8c39a606ed873cb
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Dec 18 20:39:40 2012 -0500

    Use C++ linker if ICU is disabled
    
    Bug 54948 - Undefined symbols: "operator delete(void*)" "operator
    new(unsigned long)" "___cxa_pure_virtual"

diff --git a/src/Makefile.am b/src/Makefile.am
index b7896bf..558ce08 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -195,9 +195,13 @@ export_symbols = -export-symbols harfbuzz.def
 harfbuzz_def_dependency = harfbuzz.def
 libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS)
 else
+if HAVE_ICU
+libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS)
+else
 # Use a C linker, not C++; Don't link to libstdc++
 libharfbuzz_la_LINK = $(LINK) $(libharfbuzz_la_LDFLAGS)
 endif
+endif
 
 libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS)
 nodist_libharfbuzz_la_SOURCES = $(nodist_HBSOURCES)