diff options
| -rw-r--r-- | Build/source/texk/seetexk/ChangeLog | 7 | ||||
| -rw-r--r-- | Build/source/texk/seetexk/Makefile.am | 3 | ||||
| -rw-r--r-- | Build/source/texk/seetexk/Makefile.in | 3 | ||||
| -rw-r--r-- | Build/source/texk/seetexk/common.h | 9 | ||||
| -rw-r--r-- | Build/source/texk/seetexk/config.h.in | 3 | ||||
| -rwxr-xr-x | Build/source/texk/seetexk/configure | 51 | ||||
| -rw-r--r-- | Build/source/texk/seetexk/configure.ac | 6 | ||||
| -rw-r--r-- | Build/source/texk/seetexk/dvibook.c | 10 | ||||
| -rw-r--r-- | Build/source/texk/seetexk/dviconcat.c | 10 | ||||
| -rw-r--r-- | Build/source/texk/seetexk/dviselect.c | 10 | ||||
| -rw-r--r-- | Build/source/texk/seetexk/dvitodvi.c | 10 | ||||
| -rw-r--r-- | Build/source/texk/seetexk/error.h | 5 |
12 files changed, 82 insertions, 45 deletions
diff --git a/Build/source/texk/seetexk/ChangeLog b/Build/source/texk/seetexk/ChangeLog index 1538a05de2c..e1aa288e695 100644 --- a/Build/source/texk/seetexk/ChangeLog +++ b/Build/source/texk/seetexk/ChangeLog @@ -1,3 +1,10 @@ +2020-05-01 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * configure.ac: SeeTeX Ver.20200501 + * dvibook.c, dviconcat.c, dviselect.c, dvitodvi.c, common.h, + Makefile.{in,am}, config.h.in, error.h: + Show version number and bug report address in usage. + 2019-02-22 Hironobu Yamashita <h.y.acetaminophen@gmail.com> * dviconcat.c: Set DVI ID to 3 if at least one input DVI file diff --git a/Build/source/texk/seetexk/Makefile.am b/Build/source/texk/seetexk/Makefile.am index a0099579fe3..5ebe847377e 100644 --- a/Build/source/texk/seetexk/Makefile.am +++ b/Build/source/texk/seetexk/Makefile.am @@ -25,7 +25,8 @@ libtex_a_SOURCES = \ seek.c \ tempfile.c \ tempfile.h \ - types.h + types.h \ + common.h $(libtex_a_OBJECTS): $(KPATHSEA_DEPEND) diff --git a/Build/source/texk/seetexk/Makefile.in b/Build/source/texk/seetexk/Makefile.in index ae2b5dc001b..15bc8b6a944 100644 --- a/Build/source/texk/seetexk/Makefile.in +++ b/Build/source/texk/seetexk/Makefile.in @@ -598,7 +598,8 @@ libtex_a_SOURCES = \ seek.c \ tempfile.c \ tempfile.h \ - types.h + types.h \ + common.h LDADD = libtex.a $(KPATHSEA_LIBS) noinst_HEADERS = \ diff --git a/Build/source/texk/seetexk/common.h b/Build/source/texk/seetexk/common.h new file mode 100644 index 00000000000..07bd9b05948 --- /dev/null +++ b/Build/source/texk/seetexk/common.h @@ -0,0 +1,9 @@ +#define BUG_ADDRESS "tex-k@tug.org" + +#if defined(WIN32) && defined(KPATHSEA) +#undef fopen +#undef vfprintf +#define fopen fsyscp_fopen +#define vfprintf win32_vfprintf +#endif + diff --git a/Build/source/texk/seetexk/config.h.in b/Build/source/texk/seetexk/config.h.in index 91eb3f4343f..0a8209bcdc3 100644 --- a/Build/source/texk/seetexk/config.h.in +++ b/Build/source/texk/seetexk/config.h.in @@ -133,6 +133,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/seetexk/configure b/Build/source/texk/seetexk/configure index 93849084a51..242dc767c3b 100755 --- a/Build/source/texk/seetexk/configure +++ b/Build/source/texk/seetexk/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for SeeTeX (TeX Live) 1.1. +# Generated by GNU Autoconf 2.69 for SeeTeX (TeX Live) 20200501. # # Report bugs to <tex-k@tug.org>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='SeeTeX (TeX Live)' PACKAGE_TARNAME='seetex--tex-live-' -PACKAGE_VERSION='1.1' -PACKAGE_STRING='SeeTeX (TeX Live) 1.1' +PACKAGE_VERSION='20200501' +PACKAGE_STRING='SeeTeX (TeX Live) 20200501' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -739,6 +739,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -825,6 +826,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}' @@ -1077,6 +1079,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=* \ @@ -1214,7 +1225,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. @@ -1327,7 +1338,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures SeeTeX (TeX Live) 1.1 to adapt to many kinds of systems. +\`configure' configures SeeTeX (TeX Live) 20200501 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1367,6 +1378,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] @@ -1398,7 +1410,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of SeeTeX (TeX Live) 1.1:";; + short | recursive ) echo "Configuration of SeeTeX (TeX Live) 20200501:";; esac cat <<\_ACEOF @@ -1517,7 +1529,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -SeeTeX (TeX Live) configure 1.1 +SeeTeX (TeX Live) configure 20200501 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2173,7 +2185,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by SeeTeX (TeX Live) $as_me 1.1, which was +It was created by SeeTeX (TeX Live) $as_me 20200501, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -7860,7 +7872,7 @@ fi # Define the identity of the package. PACKAGE='seetex--tex-live-' - VERSION='1.1' + VERSION='20200501' cat >>confdefs.h <<_ACEOF @@ -12684,7 +12696,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]; @@ -12730,7 +12742,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]; @@ -12754,7 +12766,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]; @@ -12799,7 +12811,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]; @@ -12823,7 +12835,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]; @@ -13467,6 +13479,11 @@ fi ac_config_headers="$ac_config_headers config.h" + + +$as_echo "#define TL_VERSION \"TeX Live 2021/dev\"" >>confdefs.h + + for ac_func in strerror do : ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror" @@ -13942,7 +13959,7 @@ Usage: $0 [OPTIONS] Report bugs to <bug-libtool@gnu.org>." lt_cl_version="\ -SeeTeX (TeX Live) config.lt 1.1 +SeeTeX (TeX Live) config.lt 20200501 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -15527,7 +15544,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by SeeTeX (TeX Live) $as_me 1.1, which was +This file was extended by SeeTeX (TeX Live) $as_me 20200501, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15593,7 +15610,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -SeeTeX (TeX Live) config.status 1.1 +SeeTeX (TeX Live) config.status 20200501 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/texk/seetexk/configure.ac b/Build/source/texk/seetexk/configure.ac index 2e4175f5179..4d9bd7e65ce 100644 --- a/Build/source/texk/seetexk/configure.ac +++ b/Build/source/texk/seetexk/configure.ac @@ -6,7 +6,7 @@ dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -AC_INIT([SeeTeX (TeX Live)], [1.1], [tex-k@tug.org]) +AC_INIT([SeeTeX (TeX Live)], [20200501], [tex-k@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([dviselect.c]) AC_CONFIG_AUX_DIR([../../build-aux]) @@ -17,6 +17,10 @@ KPSE_COMMON([seetexk]) 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_CHECK_FUNCS([strerror]) AC_CHECK_HEADERS([errno.h]) diff --git a/Build/source/texk/seetexk/dvibook.c b/Build/source/texk/seetexk/dvibook.c index b57f50cfce1..39bf291b78c 100644 --- a/Build/source/texk/seetexk/dvibook.c +++ b/Build/source/texk/seetexk/dvibook.c @@ -56,11 +56,7 @@ extern int optind; #include <stdio.h> #include <ctype.h> #include "seek.h" - -#if defined(WIN32) && defined(KPATHSEA) -#undef fopen -#define fopen fsyscp_fopen -#endif +#include "common.h" #define white(x) ((x) == ' ' || (x) == '\t' || (x) == ',') @@ -466,6 +462,8 @@ main(int argc, char **argv) case '?': usage: + (void) fprintf(stderr, + "dvibook in SeeTeX Ver.%s (%s)\n", VERSION, TL_VERSION); #ifdef ASCIIPTEX (void) fprintf(stderr, "\ Usage: %s [-s signature] [-q] [-i infile] [-o outfile] [-r] [infile [outfile]]\n", @@ -475,6 +473,8 @@ Usage: %s [-s signature] [-q] [-i infile] [-o outfile] [-r] [infile [outfile]]\n Usage: %s [-s signature] [-q] [-i infile] [-o outfile] [infile [outfile]]\n", ProgName); #endif + (void) fprintf(stderr, + "\nEmail bug reports to %s.\n", BUG_ADDRESS); (void) fflush(stderr); exit(1); } diff --git a/Build/source/texk/seetexk/dviconcat.c b/Build/source/texk/seetexk/dviconcat.c index 447c1228302..0184829e609 100644 --- a/Build/source/texk/seetexk/dviconcat.c +++ b/Build/source/texk/seetexk/dviconcat.c @@ -52,11 +52,7 @@ extern int optind; #include "search.h" #include <stdio.h> #include <ctype.h> - -#if defined(WIN32) && defined(KPATHSEA) -#undef fopen -#define fopen fsyscp_fopen -#endif +#include "common.h" char *ProgName; @@ -440,8 +436,12 @@ main(int argc, char **argv) case '?': usage: (void) fprintf(stderr, + "dviconcat in SeeTeX Ver.%s (%s)\n", VERSION, TL_VERSION); + (void) fprintf(stderr, "Usage: %s [-m mag] [-o outfile] [files]\n", ProgName); + (void) fprintf(stderr, + "\nEmail bug reports to %s.\n", BUG_ADDRESS); (void) fflush(stderr); exit(1); } diff --git a/Build/source/texk/seetexk/dviselect.c b/Build/source/texk/seetexk/dviselect.c index 580db149faa..10caa2f820f 100644 --- a/Build/source/texk/seetexk/dviselect.c +++ b/Build/source/texk/seetexk/dviselect.c @@ -58,11 +58,7 @@ extern int optind; #include "search.h" #include <stdio.h> #include <ctype.h> - -#if defined(WIN32) && defined(KPATHSEA) -#undef fopen -#define fopen fsyscp_fopen -#endif +#include "common.h" #define white(x) ((x) == ' ' || (x) == '\t' || (x) == ',') @@ -571,9 +567,13 @@ main(int argc, char **argv) case '?': usage: + (void) fprintf(stderr, + "dviselect in SeeTeX Ver.%s (%s)\n", VERSION, TL_VERSION); (void) fprintf(stderr, "\ Usage: %s [-s] [-i infile] [-o outfile] pages [...] [infile [outfile]]\n", ProgName); + (void) fprintf(stderr, + "\nEmail bug reports to %s.\n", BUG_ADDRESS); (void) fflush(stderr); exit(1); } diff --git a/Build/source/texk/seetexk/dvitodvi.c b/Build/source/texk/seetexk/dvitodvi.c index c643ac95178..50a36ebda82 100644 --- a/Build/source/texk/seetexk/dvitodvi.c +++ b/Build/source/texk/seetexk/dvitodvi.c @@ -56,11 +56,7 @@ extern int optind; #include <stdio.h> #include <ctype.h> #include "seek.h" - -#if defined(WIN32) && defined(KPATHSEA) -#undef fopen -#define fopen fsyscp_fopen -#endif +#include "common.h" #define white(x) ((x) == ' ' || (x) == '\t' || (x) == ',') @@ -686,9 +682,13 @@ main(int argc, char **argv) case '?': usage: + (void) fprintf(stderr, + "dvitodvi in SeeTeX Ver.%s (%s)\n", VERSION, TL_VERSION); (void) fprintf(stderr, "\ Usage: %s [-q] [-i infile] [-o outfile] [-w width] [-h height] <pagespecs> [infile [outfile]]\n", ProgName); + (void) fprintf(stderr, + "\nEmail bug reports to %s.\n", BUG_ADDRESS); (void) fflush(stderr); exit(1); } diff --git a/Build/source/texk/seetexk/error.h b/Build/source/texk/seetexk/error.h index e23be057ea6..a9b8f8cb865 100644 --- a/Build/source/texk/seetexk/error.h +++ b/Build/source/texk/seetexk/error.h @@ -30,8 +30,3 @@ void error(int quit, int e, const char *fmt, ...); void panic(const char *fmt, ...); void SetErrorTrap(void (*fn)(int quit, const char *text)); - -#if defined(WIN32) && defined(KPATHSEA) -#undef vfprintf -#define vfprintf win32_vfprintf -#endif |