diff options
| author | Slávek Banko <[email protected]> | 2018-05-01 12:52:20 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2018-05-01 12:52:31 +0200 |
| commit | ac4f5a4e66e3ef18fb91c3b4a6e50e93003e816e (patch) | |
| tree | 12f5834f0882f043db2037606e6df78e9a9b3828 /configure.in.in | |
| parent | ba774e8780103d81dd9d976d7507bfe27abaa4c6 (diff) | |
| download | tdewebdev-ac4f5a4e66e3ef18fb91c3b4a6e50e93003e816e.tar.gz tdewebdev-ac4f5a4e66e3ef18fb91c3b4a6e50e93003e816e.zip | |
Fix FTBFS with ICU >= 58
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 23f1f6f93256304eab76cd199408b71a649d82a8)
Diffstat (limited to 'configure.in.in')
| -rw-r--r-- | configure.in.in | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/configure.in.in b/configure.in.in index ca68d7c4..2354329b 100644 --- a/configure.in.in +++ b/configure.in.in @@ -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) |