From d36033d619081900fbf33ff6b71783bd1577d218 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 2 Jan 2014 10:35:28 +0000 Subject: METAFONT: Use X toolkit for METAFONT only if requested explicitly tardate 2014-01-01 git-svn-id: svn://tug.org/texlive/trunk@32545 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/ChangeLog | 4 ++++ Build/source/configure | 22 +++++++++++----------- Build/source/libs/configure | 2 +- Build/source/tardate.ac | 4 ++-- Build/source/texk/configure | 2 +- Build/source/texk/kpathsea/ChangeLog | 6 +++--- Build/source/texk/web2c/ChangeLog | 5 +++++ Build/source/texk/web2c/ac/web2c.ac | 6 +++--- Build/source/texk/web2c/configure | 10 +++++----- Build/source/texk/web2c/configure.ac | 8 ++++---- Build/source/texk/web2c/lib/ChangeLog | 4 ++-- Build/source/utils/configure | 2 +- 12 files changed, 42 insertions(+), 33 deletions(-) diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog index d3086c5d2b9..0e8c8de0865 100644 --- a/Build/source/ChangeLog +++ b/Build/source/ChangeLog @@ -1,3 +1,7 @@ +2014-01-01 Peter Breitenlohner + + * tardate.ac: Switch to 2014-01-01. + 2013-12-26 Peter Breitenlohner * Makefile.am (ACLOCAL): Ensure aclocal.m4 is up to date. diff --git a/Build/source/configure b/Build/source/configure index e255bb2433a..6da4eb594d1 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for TeX Live 2013-09-01. +# Generated by GNU Autoconf 2.69 for TeX Live 2014-01-01. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='TeX Live' PACKAGE_TARNAME='tex-live' -PACKAGE_VERSION='2013-09-01' -PACKAGE_STRING='TeX Live 2013-09-01' +PACKAGE_VERSION='2014-01-01' +PACKAGE_STRING='TeX Live 2014-01-01' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1503,7 +1503,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 TeX Live 2013-09-01 to adapt to many kinds of systems. +\`configure' configures TeX Live 2014-01-01 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1577,7 +1577,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of TeX Live 2013-09-01:";; + short | recursive ) echo "Configuration of TeX Live 2014-01-01:";; esac cat <<\_ACEOF @@ -1740,7 +1740,7 @@ Optional Packages: --with-banner-add=STR add STR to version string appended to banner lines --with-editor=CMD invoke CMD from the `e' option [vi +%d '%s'] or [texworks --position=%d "%s"] - --without-mf-x-toolkit do not use X toolkit for METAFONT + --with-mf-x-toolkit use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript --without-libgs build dvisvgm without PostScript support --with-system-libgs build dvisvgm with installed gs headers and library @@ -1890,7 +1890,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -TeX Live configure 2013-09-01 +TeX Live configure 2014-01-01 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2621,7 +2621,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 TeX Live $as_me 2013-09-01, which was +It was created by TeX Live $as_me 2014-01-01, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -10370,7 +10370,7 @@ fi # Define the identity of the package. PACKAGE='tex-live' - VERSION='2013-09-01' + VERSION='2014-01-01' cat >>confdefs.h <<_ACEOF @@ -21852,7 +21852,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 TeX Live $as_me 2013-09-01, which was +This file was extended by TeX Live $as_me 2014-01-01, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21909,7 +21909,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="\\ -TeX Live config.status 2013-09-01 +TeX Live config.status 2014-01-01 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 7ffa33d1947..86a0d4bf886 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -1639,7 +1639,7 @@ Optional Packages: --with-banner-add=STR add STR to version string appended to banner lines --with-editor=CMD invoke CMD from the `e' option [vi +%d '%s'] or [texworks --position=%d "%s"] - --without-mf-x-toolkit do not use X toolkit for METAFONT + --with-mf-x-toolkit use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript --without-libgs build dvisvgm without PostScript support --with-system-libgs build dvisvgm with installed gs headers and library diff --git a/Build/source/tardate.ac b/Build/source/tardate.ac index 35c3382acc3..d1d752b37be 100644 --- a/Build/source/tardate.ac +++ b/Build/source/tardate.ac @@ -1,5 +1,5 @@ dnl -dnl Copyright (C) 2010-2013 Peter Breitenlohner +dnl Copyright (C) 2010-2014 Peter Breitenlohner dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -8,4 +8,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current TeX Live tarball version -m4_define([tex_live_tardate], [2013-09-01]) +m4_define([tex_live_tardate], [2014-01-01]) diff --git a/Build/source/texk/configure b/Build/source/texk/configure index e51f73d5f92..6b38ac7be86 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -1654,7 +1654,7 @@ Optional Packages: --with-banner-add=STR add STR to version string appended to banner lines --with-editor=CMD invoke CMD from the `e' option [vi +%d '%s'] or [texworks --position=%d "%s"] - --without-mf-x-toolkit do not use X toolkit for METAFONT + --with-mf-x-toolkit use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript --without-libgs build dvisvgm without PostScript support --with-system-libgs build dvisvgm with installed gs headers and library diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index a8972bffa8e..ba5d395ecc4 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -8,13 +8,13 @@ * knj.h: Remove #include because Visual Studio 2010 cannot compile Kpathsea. -2013-12-31 TANAKA Takuji +2013-12-31 TANAKA Takuji * knj.c, knj.h: Add new functions fsyscp_fopen() and get_command_line_args_utf8() (Windows only) * progname.c: Refine initialization for KANJI (Windows only) -2013-12-03 TANAKA Takuji +2013-12-03 TANAKA Takuji * elt-dirs.c, knj.c, knj.h, progname.c, readable.c: Support KANJI file name in (e)upTeX and XeTeX on Windows. @@ -51,7 +51,7 @@ * kpsewhich.test: also check that we can read the environment variable that we set. -2013-07-07 TANAKA Takuji +2013-07-07 TANAKA Takuji * knj.c and progname.c: Generalize the method to avoid the 0x5c problem in path names to the cases CP936 (simplified Chinese) and CP950 diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 79ab73b53a3..82ca40b6af1 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,8 @@ +2014-01-02 Peter Breitenlohner + + * ac/web2c.ac, configure.ac: Use X toolkit for METAFONT only if + requested explicitly. + 2013-12-06 Peter Breitenlohner * vptovf.ch: Use make_suffix() for implied tfm_name. diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac index 073d16026af..1411b23442a 100644 --- a/Build/source/texk/web2c/ac/web2c.ac +++ b/Build/source/texk/web2c/ac/web2c.ac @@ -1,6 +1,6 @@ ## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ dnl -dnl Copyright (C) 2009-2013 Peter Breitenlohner +dnl Copyright (C) 2009-2014 Peter Breitenlohner dnl You may freely use, modify and/or distribute this file. dnl ## configure options for TeX and MF @@ -56,8 +56,8 @@ AC_ARG_ENABLE([mf-nowin], [do not build a separate non-windows-capable METAFONT], m4_eval(kpse_indent_26+2)))[]dnl AC_ARG_WITH([mf-x-toolkit], - AS_HELP_STRING([--without-mf-x-toolkit], - [do not use X toolkit for METAFONT]))[]dnl + AS_HELP_STRING([--with-mf-x-toolkit], + [use X toolkit for METAFONT]))[]dnl m4_define([kpse_mf_win], [dnl [[epsf], [EPSF], [EPSF pseudo]], [[hp2627], [HP2627], [HP 2627]], diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 8b0505c4f01..53209b8ceb1 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -1718,7 +1718,7 @@ Optional Packages: --with-banner-add=STR add STR to version string appended to banner lines --with-editor=CMD invoke CMD from the `e' option [vi +%d '%s'] or [texworks --position=%d "%s"] - --without-mf-x-toolkit do not use X toolkit for METAFONT + --with-mf-x-toolkit use X toolkit for METAFONT --with-fontconfig-includes=DIR fontconfig headers installed in DIR --with-fontconfig-libdir=DIR @@ -19498,15 +19498,15 @@ case $with_mf_x_toolkit in #( yes|no) : ;; #( '') : - with_mf_x_toolkit=$enable_mf ;; #( + with_mf_x_toolkit=no ;; #( y|ye) : with_mf_x_toolkit=yes ;; #( n) : with_mf_x_toolkit=no ;; #( *) : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using yes." >&5 -$as_echo "$as_me: WARNING: unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using yes." >&2;} - with_mf_x_toolkit=yes ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using no." >&5 +$as_echo "$as_me: WARNING: unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using no." >&2;} + with_mf_x_toolkit=no ;; esac test "x$with_x_toolkit" = xyes && with_x=yes test "x$with_x" = xno && with_x_toolkit=no diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 0464fc66479..c4625cc6c06 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with Autoconf to produce a configure script for Web2c. dnl -dnl Copyright (C) 2009-2013 Peter Breitenlohner +dnl Copyright (C) 2009-2014 Peter Breitenlohner dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -169,11 +169,11 @@ AM_CONDITIONAL([MFN], [test "x$enable_mf_nowin" != xno]) test "x$enable_mf" = xno || enable_mf=yes AS_CASE([$with_mf_x_toolkit], [yes|no], [], - [''], [with_mf_x_toolkit=$enable_mf], + [''], [with_mf_x_toolkit=no], [y|ye], [with_mf_x_toolkit=yes], [n], [with_mf_x_toolkit=no], - [AC_MSG_WARN([unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using yes.]) - with_mf_x_toolkit=yes]) + [AC_MSG_WARN([unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using no.]) + with_mf_x_toolkit=no]) test "x$with_x_toolkit" = xyes && with_x=yes test "x$with_x" = xno && with_x_toolkit=no : ${with_x=$enable_mf} # tell PATH_XTRA to use X for Metafont, if not specified. diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog index 37271167d37..205e95d0a82 100644 --- a/Build/source/texk/web2c/lib/ChangeLog +++ b/Build/source/texk/web2c/lib/ChangeLog @@ -1,10 +1,10 @@ -2013-12-31 TANAKA Takuji +2013-12-31 TANAKA Takuji * openclose.c: bug fix about error check when fopen. Use fsyscp_fopen() instead of fsyscp_xfopen() (Windows only) * texmfmp.c: Use get_command_line_args_utf8() (Windows only) -2013-12-03 TANAKA Takuji +2013-12-03 TANAKA Takuji * openclose.c, texmfmp.c: Support KANJI file name in (e)upTeX and XeTeX on Windows. diff --git a/Build/source/utils/configure b/Build/source/utils/configure index 5c981cf046b..8fb012b860c 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -1634,7 +1634,7 @@ Optional Packages: --with-banner-add=STR add STR to version string appended to banner lines --with-editor=CMD invoke CMD from the `e' option [vi +%d '%s'] or [texworks --position=%d "%s"] - --without-mf-x-toolkit do not use X toolkit for METAFONT + --with-mf-x-toolkit use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript --without-libgs build dvisvgm without PostScript support --with-system-libgs build dvisvgm with installed gs headers and library -- cgit v1.2.3