Require ICU.

Note that Boost::regex and Boost::locale must also be built with ICU
support.

CMakeLists.txt

@@ -345,6 +345,8 @@ IF(APPLE)
   ENDIF()
 ENDIF(APPLE)
 
+# FIND_PACKAGE(LibXslt) eats PKG_CONFIG_EXECUTABLE, so preserve it.
+SET(GNC_PKG_CONFIG_EXE ${PKG_CONFIG_EXECUTABLE})
 # ############################################################
 
 # xsltproc
@@ -354,6 +356,7 @@ IF (NOT LIBXSLT_FOUND)
    MESSAGE(SEND_ERROR "libxslt library not found.")
 ENDIF(NOT LIBXSLT_FOUND)
 # ############################################################
+SET(PKG_CONFIG_EXECUTABLE ${GNC_PKG_CONFIG_EXE})
 
 # libdbi
 FIND_PATH (LIBDBI_INCLUDE_PATH dbi/dbi.h HINTS ${CMAKE_PREFIX_PATH}/libdbi/include)
@@ -399,6 +402,10 @@ GET_FILENAME_COMPONENT(PERL_DIR ${PERL_EXECUTABLE} DIRECTORY)
 
 FIND_PROGRAM(POD2MAN_EXECUTABLE pod2man HINTS ${PERL_DIR})
 
+#ICU
+GNC_PKG_CHECK_MODULES (ICU4C REQUIRED icu-uc)
+GNC_PKG_CHECK_MODULES (ICU4C_I18N REQUIRED icu-i18n)
+
 #BOOST
 IF (APPLE)
   # I suppose I would rather use the shared Boost libraries here, but the Boost install procedure

README.dependencies

@@ -69,7 +69,10 @@ libgnomecanvas		2.0
 [lib]goffice		0.7.0
 libxml2			2.5.10
 libxslt
-boost			1.50.0
+ICU                                             International Compnents for
+                                                Unicode
+boost			1.50.0                  locale and regex libs must be
+                                                built with ICU support.
 swig			2.0.10			Only required to build from git
 						or SVN.
 webkit			1.0

configure.ac

@@ -140,6 +140,10 @@ AM_CONDITIONAL([CLANG], [test "x$ac_cv_CLANG" = "xyes"])
 ###--------------------------------------------------------
 ### Begin C++ dependencies
 ###--------------------------------------------------------
+PKG_CHECK_MODULES(ICU4C, icu-uc, [ac_cv_ICU4C=yes], [ac_cv_ICU4C=no])
+PKG_CHECK_MODULES(ICU4C_I18N, icu-i18n, [ac_cv_ICU4C=yes], [ac_cv_ICU4C=no])
+if test x$ac_cv_ICU4C != xyes; then
+    AC_MSG_ERROR([ICU4C was not found and is required to build GnuCash.])
 AX_BOOST_BASE([1.53.0], [ac_cv_BOOST=yes], [ac_cv_BOOST=no])
 if test x$ac_cv_BOOST != xyes; then
     AC_MSG_ERROR([Boost 1.53.0 or later was not found and is required to build GnuCash])

src/import-export/csv-imp/CMakeLists.txt

@@ -48,18 +48,19 @@ ADD_LIBRARY(gncmod-csv-import ${csv_import_noinst_HEADERS} ${csv_import_SOURCES}
 TARGET_LINK_LIBRARIES(
   gncmod-csv-import
   ${Boost_LIBRARIES}
+  ${ICU4C_I18N_LDFLAGS}
   gncmod-generic-import
   gncmod-gnome-utils
   gncmod-app-utils
   gncmod-engine
   gnc-core-utils
-  gnc-module
-  icuuc icui18n icudata)
+  gnc-module)
 
 
 TARGET_COMPILE_DEFINITIONS(gncmod-csv-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import.csv\")
 
 TARGET_INCLUDE_DIRECTORIES(gncmod-csv-import PRIVATE
+     ${ICU4C_I18N_INCLUDE_DIRS}
      ${CMAKE_SOURCE_DIR}/lib
      ${CMAKE_SOURCE_DIR}/lib/goffice
 )

src/import-export/csv-imp/Makefile.am

@@ -47,6 +47,7 @@ libgncmod_csv_import_la_LIBADD = \
   ${top_builddir}/src/libqof/qof/libgnc-qof.la \
   ${GLIB_LIBS} \
   ${GTK_LIBS} \
+  ${ICU4C_I18N_LIBS} \
   ${BOOST_LDFLAGS} \
   -lboost_regex \
   -lboost_locale
@@ -67,6 +68,7 @@ AM_CPPFLAGS = \
   ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${GTK_CFLAGS} \
+  ${ICU4C_I18N_CFLAGS} \
   ${BOOST_CPPFLAGS}
 
 uidir = $(GNC_UI_DIR)