ttfdump: Show TL version number and bug report address in usage

git-svn-id: svn://tug.org/texlive/trunk@57637 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 19 insertions, 0 deletions

diff --git a/Build/source/texk/ttfdump/ChangeLog b/Build/source/texk/ttfdump/ChangeLog
index b82e45c40c9..3ef6b802617 100644
--- a/Build/source/texk/ttfdump/ChangeLog
+++ b/Build/source/texk/ttfdump/ChangeLog
@@ -1,3 +1,8 @@
+2021-02-06  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* src/ttfdump.c, configure.ac:
+	Show TeX Live version number and bug report address in usage.
+
 2019-02-26  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
 
 	* src/ttfdump.c: Forbid too long file name.
diff --git a/Build/source/texk/ttfdump/config.h.in b/Build/source/texk/ttfdump/config.h.in
index 879867940db..c653c054778 100644
--- a/Build/source/texk/ttfdump/config.h.in
+++ b/Build/source/texk/ttfdump/config.h.in
@@ -130,6 +130,9 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* Define to the current TeX Live version string. */
+#undef TL_VERSION
+
 /* Version number of package */
 #undef VERSION
 
diff --git a/Build/source/texk/ttfdump/configure b/Build/source/texk/ttfdump/configure
index a5b8091b324..27894bdaf56 100755
--- a/Build/source/texk/ttfdump/configure
+++ b/Build/source/texk/ttfdump/configure
@@ -13679,6 +13679,11 @@ _ACEOF
 ac_config_headers="$ac_config_headers config.h"
 
 
+
+
+$as_echo "#define TL_VERSION \"TeX Live 2021/dev\"" >>confdefs.h
+
+
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
diff --git a/Build/source/texk/ttfdump/configure.ac b/Build/source/texk/ttfdump/configure.ac
index da95a40d52b..bf985e9d729 100644
--- a/Build/source/texk/ttfdump/configure.ac
+++ b/Build/source/texk/ttfdump/configure.ac
@@ -20,6 +20,10 @@ AC_CHECK_SIZEOF([int])
 
 AC_CONFIG_HEADERS([config.h])
 
+m4_include([../../version.ac])[] dnl define tex_live_version
+AC_DEFINE([TL_VERSION], ["TeX Live tex_live_version()"],
+          [Define to the current TeX Live version string.])
+
 KPSE_KPATHSEA_FLAGS
 
 AC_CONFIG_FILES([Makefile])
diff --git a/Build/source/texk/ttfdump/src/ttfdump.c b/Build/source/texk/ttfdump/src/ttfdump.c
index 0e8722b4941..4c1faf9c468 100644
--- a/Build/source/texk/ttfdump/src/ttfdump.c
+++ b/Build/source/texk/ttfdump/src/ttfdump.c
@@ -583,7 +583,9 @@ print_gsub(FILE *out)
 static void
 usage(void)
 {
+  fprintf(stderr, "ttfdump %s (%s)\n", VERSION, TL_VERSION);
   fprintf(stderr, "Usage: ttfdump ttfname dumpname [options]\n");
+  fprintf(stderr, "\nEmail bug reports to %s.\n", PACKAGE_BUGREPORT);
 }