summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-05-01 09:31:42 (GMT)
committer Slávek Banko <slavek.banko@axis.cz>2018-05-01 09:31:42 (GMT)
commita89540e549ac80be7509f0e04c6e128289e262b8 (patch)
tree33bff286a3516fd76f4cbc5a3d769020f656c017
parent4109a4424ebe531b000a52233b69c78218c33f24 (diff)
downloadkbibtex-a89540e5.zip
kbibtex-a89540e5.tar.gz
Fix FTBFS with ICU >= 58
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--configure.in.in19
-rw-r--r--src/Makefile.am1
2 files changed, 19 insertions, 1 deletions
diff --git a/configure.in.in b/configure.in.in
index 8468170..ef40914 100644
--- a/configure.in.in
+++ b/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)
diff --git a/src/Makefile.am b/src/Makefile.am
index 5609974..daf168f 100644
--- a/src/Makefile.am
+++ b/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 \