mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2025-06-18 09:47:07 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge pull request #2423 from jbarlow83/fix-cppflags

Browse Source 
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
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -426,6 +426,7 @@ PKG_CHECK_MODULES([libarchive], [libarchive], [have_libarchive=true], [have_liba
AM_CONDITIONAL([HAVE_LIBARCHIVE], [$have_libarchive]) AM_CONDITIONAL([HAVE_LIBARCHIVE], [$have_libarchive])
if $have_libarchive; then if $have_libarchive; then
AC_DEFINE([HAVE_LIBARCHIVE], [], [Enable libarchive]) AC_DEFINE([HAVE_LIBARCHIVE], [], [Enable libarchive])
CPPFLAGS="$CPPFLAGS $libarchive_CFLAGS"
fi fi
AM_CONDITIONAL([ENABLE_TRAINING], true) 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.]) AC_MSG_WARN([Try to install libicu-devel package.])
AM_CONDITIONAL([ENABLE_TRAINING], false) AM_CONDITIONAL([ENABLE_TRAINING], false)
fi fi
else
CPPFLAGS="$CPPFLAGS $ICU_UC_CFLAGS $ICU_I18N_CFLAGS"
fi fi
# Check location of pango headers # Check location of pango headers