From 403361701a7e1ba39f11e6da18685dcae767a680 Mon Sep 17 00:00:00 2001
From: "James R. Barlow" <jim@purplerock.ca>
Date: Tue, 7 May 2019 01:54:47 -0700
Subject: [PATCH] Fix CPPFLAGS configuration for icu4c and libarchive  missing
 from configure.ac

---
 configure.ac | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configure.ac b/configure.ac
index 20af62aa2b..d94ebeb648 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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