From 0cc0b29fbcaa9d24db9f4711fd5ab18155621c38 Mon Sep 17 00:00:00 2001
From: James David Berry <jberry@apache.org>
Date: Mon, 5 Nov 2007 23:53:11 +0000
Subject: [PATCH] Set ICU_CXXFLAGS for all files, not just the ICU transcoder,
so that special cased code for ICU such as that in RangeToken.cpp, will not
break for lack of these flags.
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@592193 13f79535-47bb-0310-9956-ffa450edef68
---
m4/xerces_transcoder_selection.m4 | 1 +
src/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/m4/xerces_transcoder_selection.m4 b/m4/xerces_transcoder_selection.m4
index c4cbe7e0c..7db05e33c 100644
--- a/m4/xerces_transcoder_selection.m4
+++ b/m4/xerces_transcoder_selection.m4
@@ -132,6 +132,7 @@ AC_DEFUN([XERCES_TRANSCODER_SELECTION],
*-icu-*)
transcoder=icu
AC_DEFINE([XERCES_USE_TRANSCODER_ICU], 1, [Define to use the ICU-based transcoder])
+ AC_SUBST([ICU_CXXFLAGS], [-I$xerces_cv_icu_prefix/include])
LIBS="${LIBS} -L${xerces_cv_icu_prefix}/lib -licuuc -licudata"
break
;;
diff --git a/src/Makefile.am b/src/Makefile.am
index 5a0355b34..de74a12fd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@ SUBDIRS =
# the -I${top_srcdir} is needed to pick the lib/stricmp.h
# header file when doing out-of-tree builds
-AM_CPPFLAGS = -I${top_srcdir}
+AM_CXXFLAGS = -I${top_srcdir} $(ICU_CXXFLAGS)
--
GitLab