From 29b44d560dd3aa776071261b6461db9653c901c7 Mon Sep 17 00:00:00 2001
From: "Gabriel M. Beddingfield" <beddingfield@google.com>
Date: Fri, 22 Mar 2019 09:07:38 -0700
Subject: [PATCH 3/4] Add autoconf support for --with-charset-data

---
 Makefile.am  |  2 +-
 configure.ac | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 4c10174..43b3548 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,7 @@ libCoreFoundation_la_data_DATA	= CFCharacterSetBitmaps.bitmap		\
 CF_COMMON_CPPFLAGS		= $(AM_CPPFLAGS)			\
 				  -DU_SHOW_DRAFT_API=1			\
 				  -DCF_BUILDING_CF=1			\
-				  -D__kCFDataDir=\"${datadir}\" \
+				  -D__kCFDataDir=\"${charset_data_dir}\" \
 				  -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_5	\
 				  -I$(top_srcdir)/include		\
 				  -I$(top_srcdir)/include/mach_support
diff --git a/configure.ac b/configure.ac
index 788a39c..7cfd7d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -540,6 +540,15 @@ AC_ARG_WITH(tz-data,
 AC_MSG_RESULT(${tz_data_dir})
 AC_DEFINE_UNQUOTED([TZDIR],["${tz_data_dir}"],[Define this to the location of the time zone data files (e.g. /usr/share/zoneinfo) on the target system.])
 
+AC_MSG_CHECKING([override the run-time search path for charset data])
+AC_ARG_WITH(charset-data,
+	AS_HELP_STRING([--with-charset-data=DIR],
+	               [Specify a string used in place of 'datadir' to be used at runtime to find the charset data @<:@default=${datadir}@:>@.]),
+	[charset_data_dir=${withval}],
+	[charset_data_dir=${datadir}])
+AC_MSG_RESULT(${charset_data_dir})
+AC_SUBST(charset_data_dir)
+
 #
 # Check for tzcode header support.
 #
@@ -742,6 +751,7 @@ AC_MSG_NOTICE([
   Time Zone compile options   : ${TZ_CPPFLAGS}
   Time Zone default file      : ${tz_default_file}
   Time Zone data directory    : ${tz_data_dir}
+  Charset data directory      : ${charset_data_dir}
   Compiler                    : ${CC}
   Preprocessor flags          : ${CPPFLAGS}
   Compile flags               : ${CFLAGS}
-- 
2.21.0.392.gf8f6787159e-goog