summaryrefslogtreecommitdiff
path: root/dviware/dvidvi
diff options
context:
space:
mode:
Diffstat (limited to 'dviware/dvidvi')
-rw-r--r--dviware/dvidvi/ChangeLog8
-rw-r--r--dviware/dvidvi/config.h.in3
-rw-r--r--dviware/dvidvi/configure.ac4
-rwxr-xr-xdviware/dvidvi/configure.texk29
-rw-r--r--dviware/dvidvi/dvidvi.c5
-rw-r--r--dviware/dvidvi/tests/playout.22
-rw-r--r--dviware/dvidvi/tests/playout.32
7 files changed, 43 insertions, 10 deletions
diff --git a/dviware/dvidvi/ChangeLog b/dviware/dvidvi/ChangeLog
index 4ed58dad48..44c29fbb83 100644
--- a/dviware/dvidvi/ChangeLog
+++ b/dviware/dvidvi/ChangeLog
@@ -1,6 +1,12 @@
+2020-05-02 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * configure.ac, config.h.in, dvidvi.c:
+ Add TL version to banner and bug report address to usage.
+ * tests/playout.2, tests/playout.3: Adapt.
+
2018-05-16 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
- * tests/palyout.2, tests/palyout.3: Adapt.
+ * tests/playout.2, tests/playout.3: Adapt.
2018-05-15 Karl Berry <karl@freefriends.org>
diff --git a/dviware/dvidvi/config.h.in b/dviware/dvidvi/config.h.in
index 60c484e6ee..4bacecd3cf 100644
--- a/dviware/dvidvi/config.h.in
+++ b/dviware/dvidvi/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
+
/* Version number of package */
#undef VERSION
diff --git a/dviware/dvidvi/configure.ac b/dviware/dvidvi/configure.ac
index 5524d5cd0a..82b2064b6a 100644
--- a/dviware/dvidvi/configure.ac
+++ b/dviware/dvidvi/configure.ac
@@ -17,6 +17,10 @@ KPSE_COMMON([dvidvi])
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.])
+
# We don't use libpathsea, so add '-DNO_DEBUG' not to overload fopen.
KPSE_KPATHSEA_FLAGS([no-debug])
KPSE_COND_WIN32
diff --git a/dviware/dvidvi/configure.texk b/dviware/dvidvi/configure.texk
index 1b1a8c8015..e01e71e79a 100755
--- a/dviware/dvidvi/configure.texk
+++ b/dviware/dvidvi/configure.texk
@@ -741,6 +741,7 @@ infodir
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -827,6 +828,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1079,6 +1081,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1216,7 +1227,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1369,6 +1380,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -12686,7 +12698,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -12732,7 +12744,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -12756,7 +12768,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -12801,7 +12813,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -12825,7 +12837,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -13469,6 +13481,11 @@ fi
ac_config_headers="$ac_config_headers config.h"
+
+
+$as_echo "#define TL_VERSION \"TeX Live 2021/dev\"" >>confdefs.h
+
+
# We don't use libpathsea, so add '-DNO_DEBUG' not to overload fopen.
kpse_save_CPPFLAGS=$CPPFLAGS
kpse_save_LIBS=$LIBS
diff --git a/dviware/dvidvi/dvidvi.c b/dviware/dvidvi/dvidvi.c
index a48890338f..86988cce8e 100644
--- a/dviware/dvidvi/dvidvi.c
+++ b/dviware/dvidvi/dvidvi.c
@@ -34,8 +34,10 @@
#define SEEK_CUR 1
#define SEEK_END 2
-#define BANNER "\nThis is dvidvi 1.1, Copyright 1988-1991 Radical Eye Software\n" \
+#define BANNER "\nThis is dvidvi " VERSION " (" TL_VERSION ")," \
+ " Copyright 1988-1991 Radical Eye Software\n" \
"Improved from 1.0 to 1.1, 1994, Markus Kohm\n"
+#define BUG_ADDRESS PACKAGE_BUGREPORT
#define STRINGSIZE (500L) /* maximum number of strings in program */
#ifdef HAVE_CONFIG_H
@@ -359,6 +361,7 @@ static void usage(void) {
(void)fprintf(stderr," [-q] quiet mode [-r] reverse pages\n");
(void)fprintf(stderr," [-m modulo:pagespecs] [-j] jumping pages\n");
(void)fprintf(stderr," [-p pagemodulo]\n");
+ (void)fprintf(stderr,"\nEmail bug reports to %s.\n", BUG_ADDRESS);
#ifndef VMS
exit(1) ;
#else /* VMS */
diff --git a/dviware/dvidvi/tests/playout.2 b/dviware/dvidvi/tests/playout.2
index 891e526906..5d014b465d 100644
--- a/dviware/dvidvi/tests/playout.2
+++ b/dviware/dvidvi/tests/playout.2
@@ -1,5 +1,5 @@
-This is dvidvi 1.1, Copyright 1988-1991 Radical Eye Software
+This is dvidvi 1.1 (TeX Live 2021/dev), Copyright 1988-1991 Radical Eye Software
Improved from 1.0 to 1.1, 1994, Markus Kohm
play.dvi -> playout.dvi
[5] [12] [9] [8] [13]
diff --git a/dviware/dvidvi/tests/playout.3 b/dviware/dvidvi/tests/playout.3
index ec694bb5c0..37c9ab793d 100644
--- a/dviware/dvidvi/tests/playout.3
+++ b/dviware/dvidvi/tests/playout.3
@@ -1,5 +1,5 @@
-This is dvidvi 1.1, Copyright 1988-1991 Radical Eye Software
+This is dvidvi 1.1 (TeX Live 2021/dev), Copyright 1988-1991 Radical Eye Software
Improved from 1.0 to 1.1, 1994, Markus Kohm
playtate.dvi -> playout.dvi
[5] [12] [9] [8] [13]