Snap for 9550733 from d25449ff09cdbac4a5797c767af18cd584a20bc9 to mainline-tzdata5-release

Change-Id: I728316b4ee0943d1da2e936d335381fa1451e986
diff --git a/codepages.c b/codepages.c
index ecb99ee..944131c 100644
--- a/codepages.c
+++ b/codepages.c
@@ -20,6 +20,13 @@
 #ifndef HAVE_ICONV_H
 #include "codepage.h"
 
+#ifdef USE_MOCK_CODEPAGES
+Codepage_t codepages[]= {
+        { 850,
+          ""
+        },
+};
+#else
 Codepage_t codepages[]= {
 	{ 437,
 	  "ÇüéâäàåçêëèïîìÄÅ"
@@ -113,6 +120,8 @@
 
 	{ 0 }
 };
+#endif
+
 #else
 /* Should down  ISO C forbids an empty translation unit warning [-Wpedantic]: */
 typedef int make_iso_compilers_happy;
diff --git a/config.h b/config.h
index 582e419..b9223b9 100644
--- a/config.h
+++ b/config.h
@@ -53,7 +53,10 @@
 #define HAVE_HTONS 1
 
 /* Define to 1 if you have the <iconv.h> header file. */
-#define HAVE_ICONV_H 1
+/* #undef HAVE_ICONV_H */
+
+/* Define to 1 if you want to use mock code pages. */
+#define USE_MOCK_CODEPAGES 1
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1