Browse Source

Fix FTBFS with ICU >= 58

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/1/head
Slávek Banko 4 years ago
parent
commit
a89540e549
  1. 19
      configure.in.in
  2. 1
      src/Makefile.am

19
configure.in.in

@ -17,4 +17,21 @@ PKG_CHECK_MODULES([LIBXSLT], [libxslt], [AC_DEFINE([HAVE_XSLT],1,[Define to 1 if
AC_SUBST(LIBXSLT_LIBS)
AC_SUBST(LIBXSLT_CFLAGS)
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
src/Makefile.am

@ -1,5 +1,6 @@
# set the include path for X, qt and TDE
INCLUDES = $(all_includes) $(LIBXSLT_CFLAGS) $(LIBXML_CFLAGS) $(LIBYAZ_CFLAGS) $(LIBBIBUTILS_CFLAGS)
CXXFLAGS += $(ICU_CXXFLAGS)
# these are the headers for your project
noinst_HEADERS = documentlistviewitem.h fileexportertoolchain.h \

Loading…
Cancel
Save