summaryrefslogtreecommitdiff
path: root/Build/source/texk/bibtex-x
diff options
context:
space:
mode:
authorTakuji Tanaka <ttk@t-lab.opal.ne.jp>2021-02-06 04:44:15 +0000
committerTakuji Tanaka <ttk@t-lab.opal.ne.jp>2021-02-06 04:44:15 +0000
commitf9f122183ddc88522d9022c5ac66c432572b5226 (patch)
tree94ab2e436951f7d601a110261fce4f3b2a936a74 /Build/source/texk/bibtex-x
parentd6f342dc662893a00603c2079e1e262f007ad075 (diff)
bibtex-x: Add TL version number and bug report address in online help
git-svn-id: svn://tug.org/texlive/trunk@57634 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/bibtex-x')
-rw-r--r--Build/source/texk/bibtex-x/ChangeLog6
-rw-r--r--Build/source/texk/bibtex-x/config.h.in3
-rwxr-xr-xBuild/source/texk/bibtex-x/configure5
-rw-r--r--Build/source/texk/bibtex-x/configure.ac4
-rw-r--r--Build/source/texk/bibtex-x/utils.c3
5 files changed, 20 insertions, 1 deletions
diff --git a/Build/source/texk/bibtex-x/ChangeLog b/Build/source/texk/bibtex-x/ChangeLog
index 2f33776fe14..717b4a58ce4 100644
--- a/Build/source/texk/bibtex-x/ChangeLog
+++ b/Build/source/texk/bibtex-x/ChangeLog
@@ -1,3 +1,9 @@
+2021-02-06 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * utils.c, configure.ac:
+ Show TeX Live version by version option.
+ Show bug report address in usage.
+
2019-05-22 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
* bibtex-2.c, bibtex-3.c: Better error messages for debug.
diff --git a/Build/source/texk/bibtex-x/config.h.in b/Build/source/texk/bibtex-x/config.h.in
index 18a324fab15..ae95557acc6 100644
--- a/Build/source/texk/bibtex-x/config.h.in
+++ b/Build/source/texk/bibtex-x/config.h.in
@@ -127,6 +127,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
+
/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
# define _DARWIN_USE_64_BIT_INODE 1
diff --git a/Build/source/texk/bibtex-x/configure b/Build/source/texk/bibtex-x/configure
index 3d52a62b23a..25afffdd7ec 100755
--- a/Build/source/texk/bibtex-x/configure
+++ b/Build/source/texk/bibtex-x/configure
@@ -13727,6 +13727,11 @@ test "x$enable_bibtex_x:$enable_bibtexu" = xyes:yes && need_icu=yes
ac_config_headers="$ac_config_headers config.h"
+
+
+$as_echo "#define TL_VERSION \"TeX Live 2021/dev\"" >>confdefs.h
+
+
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/Build/source/texk/bibtex-x/configure.ac b/Build/source/texk/bibtex-x/configure.ac
index 66864247018..0143f200842 100644
--- a/Build/source/texk/bibtex-x/configure.ac
+++ b/Build/source/texk/bibtex-x/configure.ac
@@ -19,6 +19,10 @@ m4_include([ac/bibtex-x.ac])
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.])
+
AC_PROG_CXX
KPSE_CXX_HACK
diff --git a/Build/source/texk/bibtex-x/utils.c b/Build/source/texk/bibtex-x/utils.c
index 0f8d2adf572..02cef72ddb7 100644
--- a/Build/source/texk/bibtex-x/utils.c
+++ b/Build/source/texk/bibtex-x/utils.c
@@ -1083,7 +1083,7 @@ void parse_cmd_line (int argc, char **argv)
case 'v': /**************** -v, --version ************/
FPRINTF (TERM_OUT, "%s\n", BANNER);
FPRINTF (TERM_OUT, "Implementation: %s\n", IMPLEMENTATION);
- FPRINTF (TERM_OUT, "Release version: %s\n", VERSION);
+ FPRINTF (TERM_OUT, "Release version: %s (%s)\n", VERSION, TL_VERSION);
#ifdef UTF_8
{
UVersionInfo icuVersion;
@@ -1565,6 +1565,7 @@ void usage (const char *printf_fmt, ...)
FSO (" -W --wolfgang same as --mstrings 30000\n");
FSO (" -M --min_crossrefs ## set min_crossrefs to ##\n");
FSO (" --mstrings ## allow ## unique strings\n");
+ FSO ("\nEmail bug reports to " PACKAGE_BUGREPORT ".\n");
debug_msg (DBG_MISC, "calling longjmp (Exit_Program_Flag) ... ");
longjmp (Exit_Program_Flag, 1);