Merge branch 'icu_refactor' into yaz4

diff --combined src/Makefile.am
index 9f8c018,f8126ac..032da2e
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1,7 -1,7 +1,7 @@@
  ## This file is part of the YAZ toolkit.
  ## Copyright (C) 1995-2009 Index Data
  
 -YAZ_VERSION_INFO=3:0:0
 +YAZ_VERSION_INFO=4:0:0
  
  lib_LTLIBRARIES = libyaz.la libyaz_server.la libyaz_icu.la
  
@@@ -111,7 -111,8 +111,8 @@@ libyaz_server_la_SOURCES = statserv.c s
  
  libyaz_server_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
  
- libyaz_icu_la_SOURCES = icu_I18N.c
+ libyaz_icu_la_SOURCES = icu_chain.c icu_utf16.c icu_utf8.c \
+       icu_transform.c icu_casemap.c icu_tokenizer.c icu_sortkey.c
  libyaz_icu_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
  
  # Rules for Z39.50 V3