From 9885feae0fd35ec018aadad7b9f3cd7d45e42ca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sun, 18 Mar 2018 12:51:02 +0100
Subject: [PATCH] Fix FTBFS with ICU >= 58
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 filters/kword/msword/Makefile.am      |  1 +
 filters/xsltfilter/configure.in.in    | 20 ++++++++++++++++++++
 filters/xsltfilter/export/Makefile.am |  1 +
 filters/xsltfilter/import/Makefile.am |  1 +
 4 files changed, 23 insertions(+)

diff --git a/filters/kword/msword/Makefile.am b/filters/kword/msword/Makefile.am
index 13da17c20..25531fa6c 100644
--- a/filters/kword/msword/Makefile.am
+++ b/filters/kword/msword/Makefile.am
@@ -1,6 +1,7 @@
 ####### General stuff
 
 INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(LIBWV2_CFLAGS) $(LIBXML_CFLAGS) $(all_includes) -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include
+CXXFLAGS += $(ICU_CXXFLAGS)
 
 ####### Files
 
diff --git a/filters/xsltfilter/configure.in.in b/filters/xsltfilter/configure.in.in
index af357a3cf..5480adc0f 100644
--- a/filters/xsltfilter/configure.in.in
+++ b/filters/xsltfilter/configure.in.in
@@ -68,3 +68,23 @@ AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_RPATH)
 
 AM_CONDITIONAL(include_XSLTFILTERS, test -n "$LIBXML_LIBS" -a -n "$LIBXSLT_LIBS")
+
+
+KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
+  AC_MSG_WARN([Could not find pkg-config])
+])
+if test -n "$PKGCONFIG"; then
+  ICU_VERSION=`$PKGCONFIG icu-uc --modversion 2>/dev/null`
+  if test -n "$ICU_VERSION"; then
+    ICU_CXXFLAGS=`$PKGCONFIG icu-uc --variable=CXXFLAGS`
+  fi
+fi
+if test -z "$ICU_VERSION"; then
+  KDE_FIND_PATH(icu-config, ICU_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
+    AC_MSG_WARN([Could not find icu-config])
+  ])
+  if test -n "$ICU_CONFIG"; then
+    ICU_CXXFLAGS=`$ICU_CONFIG --cxxflags`
+  fi
+fi
+AC_SUBST(ICU_CXXFLAGS)
diff --git a/filters/xsltfilter/export/Makefile.am b/filters/xsltfilter/export/Makefile.am
index bbcf7dc93..fc45037a3 100644
--- a/filters/xsltfilter/export/Makefile.am
+++ b/filters/xsltfilter/export/Makefile.am
@@ -2,6 +2,7 @@
 SUBDIRS = xsl
 
 INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
+CXXFLAGS += $(ICU_CXXFLAGS)
 
 ####### Files
 
diff --git a/filters/xsltfilter/import/Makefile.am b/filters/xsltfilter/import/Makefile.am
index a49ceafe7..965911f25 100644
--- a/filters/xsltfilter/import/Makefile.am
+++ b/filters/xsltfilter/import/Makefile.am
@@ -1,6 +1,7 @@
 ####### General stuff
 
 INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES)  $(all_includes) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
+CXXFLAGS += $(ICU_CXXFLAGS)
 
 ####### Files