summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-01-02 10:35:28 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-01-02 10:35:28 +0000
commitd36033d619081900fbf33ff6b71783bd1577d218 (patch)
tree930fbb746daa4bff59b99f902961f15cfffa88e5 /Build/source/texk/web2c
parente074e22a1834b92d6e1ab4a7587f897c9226b9cb (diff)
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
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r--Build/source/texk/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/ac/web2c.ac6
-rwxr-xr-xBuild/source/texk/web2c/configure10
-rw-r--r--Build/source/texk/web2c/configure.ac8
-rw-r--r--Build/source/texk/web2c/lib/ChangeLog4
5 files changed, 19 insertions, 14 deletions
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 <peb@mppmu.mpg.de>
+
+ * ac/web2c.ac, configure.ac: Use X toolkit for METAFONT only if
+ requested explicitly.
+
2013-12-06 Peter Breitenlohner <peb@mppmu.mpg.de>
* 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 <tex-live@tug.org>
+dnl Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
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 <tex-live@tug.org>
+dnl Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
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 <KXD02663@nifty.ne.jp>
+2013-12-31 TANAKA Takuji <KXD02663@nifty.ne.jp>
* 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 <KXD02663@nifty.ne.jp>
+2013-12-03 TANAKA Takuji <KXD02663@nifty.ne.jp>
* openclose.c, texmfmp.c: Support KANJI file name in (e)upTeX and
XeTeX on Windows.