From baa4715ac76b6a419c6e92becaaf98e18d6886c3 Mon Sep 17 00:00:00 2001
From: "Gabriel M. Beddingfield" <beddingfield@google.com>
Date: Fri, 22 Mar 2019 09:09:20 -0700
Subject: [PATCH 4/4] autoreconf -ivf with autoconf 2.69 and automake 1.14.1 on
 ubuntu 14.04.5 (--with-charset-data)

---
 Makefile.in                                |  3 ++-
 compat/Makefile.in                         |  5 +++--
 configure                                  | 21 +++++++++++++++++++++
 examples/Allocator/Makefile.in             |  1 +
 examples/CFLocalServer/Makefile.in         |  1 +
 examples/CFMessagePort/Makefile.in         |  1 +
 examples/CFRunLoopTimerExample/Makefile.in |  1 +
 examples/CFTest/Makefile.in                |  1 +
 examples/DNSServiceMetaQuery/Makefile.in   |  1 +
 examples/DisplayURL/Makefile.in            |  1 +
 examples/Makefile.in                       |  1 +
 examples/ReadPListExample/Makefile.in      |  1 +
 examples/SimpleWebServer/Makefile.in       |  1 +
 examples/StringExample/Makefile.in         |  1 +
 examples/WritePListExample/Makefile.in     |  1 +
 include/Makefile.in                        |  1 +
 tests/Makefile.in                          |  1 +
 17 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 548209c..c4b3580 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -652,6 +652,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+charset_data_dir = @charset_data_dir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -706,7 +707,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/compat/Makefile.in b/compat/Makefile.in
index 90574ca..b0d962b 100644
--- a/compat/Makefile.in
+++ b/compat/Makefile.in
@@ -80,8 +80,8 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = compat
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/mkinstalldirs strlcat.c gettimeofday.c \
-	strlcpy.c flsl.c $(top_srcdir)/config/depcomp
+	$(top_srcdir)/config/mkinstalldirs strlcat.c flsl.c \
+	gettimeofday.c strlcpy.c $(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -248,6 +248,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+charset_data_dir = @charset_data_dir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
diff --git a/configure b/configure
index d817f3b..39fb95a 100755
--- a/configure
+++ b/configure
@@ -639,6 +639,7 @@ am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
 ALLOCA
+charset_data_dir
 PTHREAD_CFLAGS
 PTHREAD_LIBS
 PTHREAD_CC
@@ -807,6 +808,7 @@ with_uuid_includes
 with_uuid_libs
 with_tz_default
 with_tz_data
+with_charset_data
 with_tz_includes
 '
       ac_precious_vars='build_alias
@@ -1486,6 +1488,9 @@ Optional Packages:
                           [default=/etc/localtime].
   --with-tz-data=DIR      Specify the location of the time zone data files on
                           the target system [default=/usr/share/zoneinfo].
+  --with-charset-data=DIR Specify a string used in place of 'datadir' to be
+                          used at runtime to find the charset data
+                          [default=${datadir}].
   --with-tz-includes=DIR  Specify location of Time Zone (tzcode) headers
                           [default=/usr/include].
 
@@ -17889,6 +17894,20 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking override the run-time search path for charset data" >&5
+$as_echo_n "checking override the run-time search path for charset data... " >&6; }
+
+# Check whether --with-charset-data was given.
+if test "${with_charset_data+set}" = set; then :
+  withval=$with_charset_data; charset_data_dir=${withval}
+else
+  charset_data_dir=${datadir}
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${charset_data_dir}" >&5
+$as_echo "${charset_data_dir}" >&6; }
+
+
 #
 # Check for tzcode header support.
 #
@@ -22950,6 +22969,7 @@ fi
   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}
@@ -22981,6 +23001,7 @@ $as_echo "$as_me:
   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}
diff --git a/examples/Allocator/Makefile.in b/examples/Allocator/Makefile.in
index 3e5a2c8..84d0b4f 100644
--- a/examples/Allocator/Makefile.in
+++ b/examples/Allocator/Makefile.in
@@ -265,6 +265,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+charset_data_dir = @charset_data_dir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
diff --git a/examples/CFLocalServer/Makefile.in b/examples/CFLocalServer/Makefile.in
index 560b391..3ff7308 100644
--- a/examples/CFLocalServer/Makefile.in
+++ b/examples/CFLocalServer/Makefile.in
@@ -277,6 +277,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+charset_data_dir = @charset_data_dir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
diff --git a/examples/CFMessagePort/Makefile.in b/examples/CFMessagePort/Makefile.in
index 8449788..493de4d 100644
--- a/examples/CFMessagePort/Makefile.in
+++ b/examples/CFMessagePort/Makefile.in
@@ -268,6 +268,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+charset_data_dir = @charset_data_dir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
diff --git a/examples/CFRunLoopTimerExample/Makefile.in b/examples/CFRunLoopTimerExample/Makefile.in
index c009808..05d4ec2 100644
--- a/examples/CFRunLoopTimerExample/Makefile.in
+++ b/examples/CFRunLoopTimerExample/Makefile.in
@@ -266,6 +266,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+charset_data_dir = @charset_data_dir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
diff --git a/examples/CFTest/Makefile.in b/examples/CFTest/Makefile.in
index 555f30e..de110fc 100644
--- a/examples/CFTest/Makefile.in
+++ b/examples/CFTest/Makefile.in
@@ -268,6 +268,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+charset_data_dir = @charset_data_dir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
diff --git a/examples/DNSServiceMetaQuery/Makefile.in b/examples/DNSServiceMetaQuery/Makefile.in
index 2d297fa..7c77a2b 100644
--- a/examples/DNSServiceMetaQuery/Makefile.in
+++ b/examples/DNSServiceMetaQuery/Makefile.in
@@ -266,6 +266,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+charset_data_dir = @charset_data_dir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
diff --git a/examples/DisplayURL/Makefile.in b/examples/DisplayURL/Makefile.in
index 3f89c1c..f151147 100644
--- a/examples/DisplayURL/Makefile.in
+++ b/examples/DisplayURL/Makefile.in
@@ -265,6 +265,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+charset_data_dir = @charset_data_dir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 515da4e..9e4bca3 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -276,6 +276,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+charset_data_dir = @charset_data_dir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
diff --git a/examples/ReadPListExample/Makefile.in b/examples/ReadPListExample/Makefile.in
index bd9448f..f7b2026 100644
--- a/examples/ReadPListExample/Makefile.in
+++ b/examples/ReadPListExample/Makefile.in
@@ -265,6 +265,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+charset_data_dir = @charset_data_dir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
diff --git a/examples/SimpleWebServer/Makefile.in b/examples/SimpleWebServer/Makefile.in
index 082a82b..a98a871 100644
--- a/examples/SimpleWebServer/Makefile.in
+++ b/examples/SimpleWebServer/Makefile.in
@@ -265,6 +265,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+charset_data_dir = @charset_data_dir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
diff --git a/examples/StringExample/Makefile.in b/examples/StringExample/Makefile.in
index 3599747..725c31a 100644
--- a/examples/StringExample/Makefile.in
+++ b/examples/StringExample/Makefile.in
@@ -265,6 +265,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+charset_data_dir = @charset_data_dir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
diff --git a/examples/WritePListExample/Makefile.in b/examples/WritePListExample/Makefile.in
index b3788c4..2a9dce1 100644
--- a/examples/WritePListExample/Makefile.in
+++ b/examples/WritePListExample/Makefile.in
@@ -265,6 +265,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+charset_data_dir = @charset_data_dir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
diff --git a/include/Makefile.in b/include/Makefile.in
index 89bc299..6da6d34 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -266,6 +266,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+charset_data_dir = @charset_data_dir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 06ef1b4..579b238 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -265,6 +265,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+charset_data_dir = @charset_data_dir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
-- 
2.21.0.392.gf8f6787159e-goog