Merge pull request #2423 from jbarlow83/fix-cppflags

Fix CPPFLAGS configuration for icu4c and libarchive
This commit is contained in:
zdenop 2019-05-07 11:28:59 +02:00 committed by GitHub
commit 28cfaaae43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -426,6 +426,7 @@ PKG_CHECK_MODULES([libarchive], [libarchive], [have_libarchive=true], [have_liba
AM_CONDITIONAL([HAVE_LIBARCHIVE], [$have_libarchive])
if $have_libarchive; then
AC_DEFINE([HAVE_LIBARCHIVE], [], [Enable libarchive])
CPPFLAGS="$CPPFLAGS $libarchive_CFLAGS"
fi
AM_CONDITIONAL([ENABLE_TRAINING], true)
@ -440,6 +441,8 @@ if !($have_icu_uc && $have_icu_i18n); then
AC_MSG_WARN([Try to install libicu-devel package.])
AM_CONDITIONAL([ENABLE_TRAINING], false)
fi
else
CPPFLAGS="$CPPFLAGS $ICU_UC_CFLAGS $ICU_I18N_CFLAGS"
fi
# Check location of pango headers