diff options
| author | Slávek Banko <[email protected]> | 2018-03-18 12:51:02 +0100 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2018-03-18 12:51:13 +0100 |
| commit | 2366f9aeea6dc476ed94a9554208cafa317a7d57 (patch) | |
| tree | 9f893b0d056f473dac2bc18f8e85104907f5a08e | |
| parent | 2902213501d5b3d67eba7b8c32085d7957a18601 (diff) | |
| download | koffice-2366f9aeea6dc476ed94a9554208cafa317a7d57.tar.gz koffice-2366f9aeea6dc476ed94a9554208cafa317a7d57.zip | |
Fix FTBFS with ICU >= 58
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 9885feae0fd35ec018aadad7b9f3cd7d45e42ca2)
| -rw-r--r-- | filters/kword/msword/Makefile.am | 1 | ||||
| -rw-r--r-- | filters/xsltfilter/configure.in.in | 20 | ||||
| -rw-r--r-- | filters/xsltfilter/export/Makefile.am | 1 | ||||
| -rw-r--r-- | filters/xsltfilter/import/Makefile.am | 1 |
4 files changed, 23 insertions, 0 deletions
diff --git a/filters/kword/msword/Makefile.am b/filters/kword/msword/Makefile.am index 13da17c2..25531fa6 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 af357a3c..5480adc0 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 bbcf7dc9..fc45037a 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 a49ceafe..965911f2 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 |