[Libreoffice-commits] .: configure.ac .gitignore src/lib

[Libreoffice Gerrit user]

 .gitignore          |    1 +
 configure.ac        |   18 ++++++++++++++++--
 src/lib/Makefile.am |    4 ++--
 3 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit 1f8d38e91ea3d7a90ba152560ae5c863d3cee72a
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Jan 16 10:37:01 2013 +0100

    Check for icu and set ICU_CFLAGS and ICU_LDFLAGS

diff --git a/.gitignore b/.gitignore
index b708b99..612cbb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 Makefile
 Makefile.in
+ar-lib
 aclocal.m4
 autom4te.cache
 config.guess
diff --git a/configure.ac b/configure.ac
index 914aaf5..9ae19b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,11 +55,9 @@ PKG_CHECK_MODULES([ZLIB],[zlib],[],[
 AC_SUBST(ZLIB_CFLAGS)
 AC_SUBST(ZLIB_LIBS)
 
-
 # ===========================
 # Find required boost headers
 # ===========================
-
 AC_CHECK_HEADER(
 	boost/ptr_container/ptr_map.hpp,
 	[],
@@ -67,6 +65,22 @@ AC_CHECK_HEADER(
 	[]
 )
 
+# ========
+# Find icu
+# ========
+AC_PATH_PROG([ICU_CONFIG],[icu-config])
+AC_MSG_CHECKING([ICU installation])
+if ${ICU_CONFIG} --cflags >/dev/null 2>&1; then
+	ICU_CFLAGS=`${ICU_CONFIG} --cppflags-searchpath`
+	ICU_LIBS=`${ICU_CONFIG} --ldflags`
+	AC_MSG_RESULT([found])
+else
+	AC_MSG_ERROR([libicu config program icu-config not found])
+fi
+AC_SUBST(ICU_CFLAGS)
+AC_SUBST(ICU_LIBS)
+
+
 # =================================
 # Libtool/Version Makefile settings
 # =================================
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index f990384..463116d 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -11,9 +11,9 @@ libmspub_ at MSPUB_MAJOR_VERSION@_ at MSPUB_MINOR_VERSION@_include_HEADERS = \
 	MSPUBDocument.h \
 	MSPUBStringVector.h
 
-AM_CXXFLAGS = $(LIBMSPUB_CXXFLAGS) $(ZLIB_CFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = $(LIBMSPUB_CXXFLAGS) $(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS)
 
-libmspub_ at MSPUB_MAJOR_VERSION@_ at MSPUB_MINOR_VERSION@_la_LIBADD  = $(LIBMSPUB_LIBS) $(ZLIB_LIBS) @LIBMSPUB_WIN32_RESOURCE@
+libmspub_ at MSPUB_MAJOR_VERSION@_ at MSPUB_MINOR_VERSION@_la_LIBADD  = $(LIBMSPUB_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBMSPUB_WIN32_RESOURCE@
 libmspub_ at MSPUB_MAJOR_VERSION@_ at MSPUB_MINOR_VERSION@_la_DEPENDENCIES = @LIBMSPUB_WIN32_RESOURCE@
 libmspub_ at MSPUB_MAJOR_VERSION@_ at MSPUB_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no_undefined
 libmspub_ at MSPUB_MAJOR_VERSION@_ at MSPUB_MINOR_VERSION@_la_SOURCES = \