summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-05-01 09:55:22 (GMT)
committer Slávek Banko <slavek.banko@axis.cz>2018-05-01 09:55:22 (GMT)
commit395bf69ad4588f4e5be43f027703476433e61502 (patch)
treebf256701b56c12483e3b47819f1cca87f8fa6b75
parent76136dae7806dc8b1bffa18b3fc82b2a0672bde6 (diff)
downloadkipi-plugins-395bf69a.zip
kipi-plugins-395bf69a.tar.gz
Fix FTBFS with ICU >= 58
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--kipi-plugins/configure.in.in24
-rw-r--r--kipi-plugins/htmlexport/Makefile.am1
2 files changed, 25 insertions, 0 deletions
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
@@ -103,6 +103,30 @@ 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