From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 30 Nov 2009 13:21:24 +0000 (+0100)
Subject: Merge branch 'icu_refactor' into yaz4
X-Git-Tag: v4.0.0~104
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=4adcf3fecf9b8d2880ee0b671c9f9d20da18ca49;hp=-c;ds=sidebyside

Merge branch 'icu_refactor' into yaz4
---

4adcf3fecf9b8d2880ee0b671c9f9d20da18ca49
diff --combined src/Makefile.am
index 9f8c018,f8126ac..032da2e
--- a/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