Integrate the last change.
* src/Makefile.in (SOURCE_FILES): Add zos-tag.h.
* tests/Makefile.in (SOURCE_FILES): Add check-tag.
* NEWS: Mention the new functionality.
diff --git a/ChangeLog b/ChangeLog
index 389f771..20f0396 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-05-12 Bruno Haible <bruno@clisp.org>
+
+ Integrate the last change.
+ * src/Makefile.in (SOURCE_FILES): Add zos-tag.h.
+ * tests/Makefile.in (SOURCE_FILES): Add check-tag.
+ * NEWS: Mention the new functionality.
+
2023-05-12 Mike Fulton <mikefultonpersonal@gmail.com>
On z/OS, set a charset tag on iconv's output file.
diff --git a/NEWS b/NEWS
index 7959cc9..a20916b 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@
or ICONV_SET_TO_SURFACE, or
- from the iconv program, by setting the environment variable
ICONV_EBCDIC_ZOS_UNIX to a non-empty value.
+* Special support for z/OS: The iconv program adds a charset metadata tag to
+ its output file. (Contributed by Mike Fulton.)
New in 1.17:
* The libiconv library is now licensed under the LGPL version 2.1, instead of
diff --git a/src/Makefile.in b/src/Makefile.in
index 21d3e6d..e8fff47 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -147,7 +147,8 @@
# List of source files.
SOURCE_FILES = \
Makefile.in \
- iconv.c iconv_no_i18n.c
+ iconv.c iconv_no_i18n.c \
+ zos-tag.h
# List of distributed files imported from other packages.
IMPORTED_FILES =
# List of distributed files generated by autotools or Makefile.devel.
diff --git a/tests/Makefile.in b/tests/Makefile.in
index b94c92e..f30a54d 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -430,6 +430,7 @@
is-native.c \
check-subst \
check-ebcdic \
+ check-tag \
test-shiftseq.c \
test-to-wchar.c \
CP856.TXT \
