mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-11-24 02:59:07 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge pull request #2821 from amitdo/autotools

Browse Source 
Autotools: Pango, Cairo and ICU only required by training tools
This commit is contained in:
Egor Pugin 2019-12-16 19:06:01 +03:00 committed by GitHub
commit 13e5dc8753
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -471,8 +471,6 @@ if !($have_icu_uc && $have_icu_i18n); then
AC_MSG_WARN([Training tools WILL NOT be built.]) AC_MSG_WARN([Training tools WILL NOT be built.])
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)
else
CPPFLAGS="$CPPFLAGS $ICU_UC_CFLAGS $ICU_I18N_CFLAGS"
fi fi
# Check location of pango headers # Check location of pango headers
@ -482,8 +480,6 @@ if !($have_pango); then
AC_MSG_WARN([Training tools WILL NOT be built.]) AC_MSG_WARN([Training tools WILL NOT be built.])
AC_MSG_WARN([Try to install libpango1.0-dev package.]) AC_MSG_WARN([Try to install libpango1.0-dev package.])
AM_CONDITIONAL([ENABLE_TRAINING], false) AM_CONDITIONAL([ENABLE_TRAINING], false)
else
CPPFLAGS="$CPPFLAGS $pango_CFLAGS"
fi fi
# Check location of cairo headers # Check location of cairo headers
@ -492,8 +488,6 @@ if !($have_cairo); then
AC_MSG_WARN([Training tools WILL NOT be built because of missing cairo library.]) AC_MSG_WARN([Training tools WILL NOT be built because of missing cairo library.])
AC_MSG_WARN([Try to install libcairo-dev?? package.]) AC_MSG_WARN([Try to install libcairo-dev?? package.])
AM_CONDITIONAL([ENABLE_TRAINING], false) AM_CONDITIONAL([ENABLE_TRAINING], false)
else
CPPFLAGS="$CPPFLAGS $cairo_CFLAGS"
fi fi

4
src/training/Makefile.am
View File

@ -15,6 +15,10 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/src/wordrec \ -I$(top_srcdir)/src/wordrec \
-I$(top_srcdir)/src/cutil -I$(top_srcdir)/src/cutil
AM_CPPFLAGS += $(ICU_UC_CFLAGS) $(ICU_I18N_CFLAGS)
AM_CPPFLAGS += $(pango_CFLAGS)
AM_CPPFLAGS += $(cairo_CFLAGS)
bin_SCRIPTS = language-specific.sh tesstrain.sh bin_SCRIPTS = language-specific.sh tesstrain.sh
scripts_DATA = tesstrain_utils.sh scripts_DATA = tesstrain_utils.sh
scriptsdir = $(bindir) scriptsdir = $(bindir)