From 502ebe8ca9524a6e9254371567b15e3ab1d76378 Mon Sep 17 00:00:00 2001
From: amitdo <amitdev2222@gmail.com>
Date: Mon, 16 Dec 2019 17:23:06 +0200
Subject: [PATCH] Autotools: Pango, Cairo and ICU only required by training
 tools

---
 configure.ac             | 6 ------
 src/training/Makefile.am | 4 ++++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index a7491911..12722756 100644
--- a/configure.ac
+++ b/configure.ac
@@ -471,8 +471,6 @@ if !($have_icu_uc && $have_icu_i18n); then
   AC_MSG_WARN([Training tools WILL NOT be built.])
   AC_MSG_WARN([Try to install libicu-devel package.])
   AM_CONDITIONAL([ENABLE_TRAINING], false)
-else
-  CPPFLAGS="$CPPFLAGS $ICU_UC_CFLAGS $ICU_I18N_CFLAGS"
 fi
 
 # 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([Try to install libpango1.0-dev package.])
         AM_CONDITIONAL([ENABLE_TRAINING], false)
-else
-      CPPFLAGS="$CPPFLAGS $pango_CFLAGS"
 fi
 
 # 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([Try to install libcairo-dev?? package.])
         AM_CONDITIONAL([ENABLE_TRAINING], false)
-else
-      CPPFLAGS="$CPPFLAGS $cairo_CFLAGS"
 fi
 
 
diff --git a/src/training/Makefile.am b/src/training/Makefile.am
index bcdf0a2d..9b0b9836 100644
--- a/src/training/Makefile.am
+++ b/src/training/Makefile.am
@@ -15,6 +15,10 @@ AM_CPPFLAGS += \
     -I$(top_srcdir)/src/wordrec \
     -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
 scripts_DATA = tesstrain_utils.sh
 scriptsdir = $(bindir)