Fix FTBFS with ICU >= 58

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/1/head
Slávek Banko 6 years ago
parent 132a483427
commit 23f1f6f932

@ -259,3 +259,23 @@ AC_SUBST(enable_editors)
AC_CHECK_PROGS(TAR, gnutar gtar tar, [AM_MISSING_PROG(tar)])
AC_CHECK_PROG(GZIP_COMMAND, gzip, gzip)
# 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)

@ -1,4 +1,5 @@
INCLUDES = $(LIBXSLT_CFLAGS) $(all_includes)
CXXFLAGS += $(ICU_CXXFLAGS)
METASOURCES = AUTO
libutils_la_LDFLAGS = $(all_libraries)
noinst_LTLIBRARIES = libutils.la

@ -51,6 +51,7 @@ xsldbg_LDFLAGS = $(all_libraries) $(XSLDBG_EXTRA_LIBS) $(LIB_QT) -lDCOP $(LIB_TD
# set the include path for X, qt and KDE
INCLUDES= $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(all_includes)
CXXFLAGS += $(ICU_CXXFLAGS)
METASOURCES = AUTO

@ -13,7 +13,7 @@ libkxsldbgpart_la_SOURCES = dummy.cpp
SUBDIRS = libqtnotfier libxsldbg
INCLUDES = $(XSLDBG_CFLAGS) -I.. $(all_includes)
CXXFLAGS += $(ICU_CXXFLAGS)
libkxsldbgpart_la_LDFLAGS = -module $(KDE_PLUGIN) -lkatepartinterfaces $(all_libraries) $(XSLDBG_EXTRA_LIBS)-ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP
libkxsldbgpart_la_LIBADD = libkxsldbgcommon.la $(LIB_TDEPARTS)

@ -6,3 +6,4 @@ libqtnotfier_la_METASOURCES = AUTO
libqtnotfier_la_SOURCES = xsldbgthread.cpp xsldbgnotifier.cpp xsldbgevent.cpp xsldbgdebuggerbase.cpp qtnotifier2.cpp
INCLUDES = $(XSLDBG_CFLAGS) $(all_includes)
CXXFLAGS += $(ICU_CXXFLAGS)

@ -8,5 +8,6 @@ libxsldbg_la_LIBADD = $(LIBXSLT_LIBS)
libxsldbg_la_LDFLAGS = $(all_libraries)
AM_CPPFLAGS = -DDOCS_PATH=\"$(DOCS_PATH)\" -I.. $(LIBXSLT_CFLAGS) $(all_includes)
CXXFLAGS += $(ICU_CXXFLAGS)
KDE_OPTIONS= nofinal

@ -9,3 +9,4 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/parsers \
-I$(top_builddir)/quanta/dialogs \
-I$(top_srcdir)/lib \
$(LIBXML_CFLAGS) $(all_includes)
CXXFLAGS += $(ICU_CXXFLAGS)

@ -22,3 +22,4 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/utility \
-I$(top_builddir)/quanta/components/csseditor \
-I$(top_srcdir)/quanta/plugins \
$(KMDI_INCLUDES) $(CVSSERVICE_INCLUDE) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(all_includes)
CXXFLAGS += $(ICU_CXXFLAGS)

Loading…
Cancel
Save