Build hb-icu into libharfbuzz-icu.so

src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 342a3fb..f7e7e9d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -137,13 +137,6 @@
 	mv "$@.tmp" "$@" || ( $(RM) "@.tmp" && false )
 endif
 
-if HAVE_ICU
-HBCFLAGS += $(ICU_CFLAGS)
-HBLIBS   += $(ICU_LIBS)
-HBSOURCES += hb-icu.cc
-HBHEADERS += hb-icu.h
-endif
-
 if HAVE_FREETYPE
 HBCFLAGS += $(FREETYPE_CFLAGS)
 HBLIBS   += $(FREETYPE_LIBS)
@@ -204,7 +197,7 @@
 harfbuzz_def_dependency = harfbuzz.def
 libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS)
 else
-if HAVE_ICU
+if HAVE_ICU_LE
 libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS)
 else
 # Use a C linker for GCC, not C++; Don't link to libstdc++
@@ -225,6 +218,16 @@
 pkginclude_HEADERS = $(HBHEADERS)
 nodist_pkginclude_HEADERS = $(HBNODISTHEADERS)
 
+if HAVE_ICU
+lib_LTLIBRARIES += libharfbuzz-icu.la
+libharfbuzz_icu_la_SOURCES = hb-icu.cc
+libharfbuzz_icu_la_CPPFLAGS = $(ICU_CFLAGS)
+libharfbuzz_icu_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HB_LIBTOOL_VERSION_INFO) -no-undefined
+libharfbuzz_icu_la_LIBADD = $(ICU_LIBS) libharfbuzz.la
+pkginclude_HEADERS += hb-icu.h
+endif
+
+
 CLEANFILES += harfbuzz.def
 harfbuzz.def: $(HBHEADERS) $(HBNODISTHEADERS)
 	$(AM_V_GEN) (echo EXPORTS; \
@@ -313,14 +316,12 @@
 	check-symbols.sh \
 	$(NULL)
 
-if HAVE_ICU
-else
-dist_check_SCRIPTS += check-libstdc++.sh
-endif
-
 if HAVE_ICU_LE
 else
-dist_check_SCRIPTS += check-static-inits.sh
+dist_check_SCRIPTS += \
+	check-libstdc++.sh \
+	check-static-inits.sh \
+	$(NULL)
 endif
 
 TESTS = $(dist_check_SCRIPTS)

src/hb-unicode.cc

diff --git a/src/hb-unicode.cc b/src/hb-unicode.cc
index 0a3907e..b7e0987 100644
--- a/src/hb-unicode.cc
+++ b/src/hb-unicode.cc
@@ -133,7 +133,7 @@
 
 #ifdef HAVE_GLIB
   HB_UNICODE_FUNCS_IMPLEMENT(glib)
-#elif defined(HAVE_ICU)
+#elif 0 && defined(HAVE_ICU)
   HB_UNICODE_FUNCS_IMPLEMENT(icu)
 #elif defined(HAVE_UCDN)
   HB_UNICODE_FUNCS_IMPLEMENT(ucdn)