From 395bf69ad4588f4e5be43f027703476433e61502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Tue, 1 May 2018 11:55:22 +0200
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>
---
 kipi-plugins/configure.in.in        | 24 ++++++++++++++++++++++++
 kipi-plugins/htmlexport/Makefile.am |  1 +
 2 files changed, 25 insertions(+)

diff --git a/kipi-plugins/configure.in.in b/kipi-plugins/configure.in.in
index 7dc03ec..ec887b7 100644
--- a/kipi-plugins/configure.in.in
+++ b/kipi-plugins/configure.in.in
@@ -101,6 +101,30 @@ if test "x$have_libkipi" != "xyes"; then
      DO_NOT_COMPILE="$DO_NOT_COMPILE kipi-plugins"
 fi
 
+# --------------------------------------------------------------------
+#
+# Check for ICU CXXFLAGS
+#
+# --------------------------------------------------------------------
+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)
+
 # --------------------------------------------------------------------
 #
 # Check for libkexiv2
diff --git a/kipi-plugins/htmlexport/Makefile.am b/kipi-plugins/htmlexport/Makefile.am
index 65dc6e3..6221e1e 100644
--- a/kipi-plugins/htmlexport/Makefile.am
+++ b/kipi-plugins/htmlexport/Makefile.am
@@ -1,5 +1,6 @@
 SUBDIRS     = themes
 INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes) $(LIBXSLT_CFLAGS)
+CXXFLAGS += $(ICU_CXXFLAGS)
 
 METASOURCES = AUTO