Fix FTBFS with ICU >= 58

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

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

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