summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk')
-rwxr-xr-xBuild/source/texk/configure7
-rw-r--r--Build/source/texk/web2c/ChangeLog9
-rw-r--r--Build/source/texk/web2c/ac/web2c.ac3
-rwxr-xr-xBuild/source/texk/web2c/configure90
-rw-r--r--Build/source/texk/web2c/configure.ac9
5 files changed, 80 insertions, 38 deletions
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 7f8741bf04a..53ed22ddf99 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -697,6 +697,7 @@ enable_xindy_rules
enable_xindy_docs
with_xindy_recode
enable_web2c
+with_tex_banner
with_editor
enable_auto_core
enable_dump_share
@@ -1567,6 +1568,7 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-xindy-recode For `xindy': use `recode' instead of `iconv'
(default is NO)
+ --with-tex-banner=STR version string appended to banner lines [Web2C YEAR]
--with-editor=CMD invoke CMD from the `e' option [vi +%d %s]
--without-mf-x-toolkit do not use X toolkit for METAFONT
--with-gs=/PATH/TO/gs Hard-wire the location of GhostScript
@@ -2418,6 +2420,11 @@ test "x$enable_web2c" = xno || {
## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
## configure options for TeX and MF
+# Check whether --with-tex-banner was given.
+if test "${with_tex_banner+set}" = set; then
+ withval=$with_tex_banner;
+fi
+
# Check whether --with-editor was given.
if test "${with_editor+set}" = set; then
withval=$with_editor;
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index e41bdfea405..1429d5fce8b 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,12 @@
+2009-06-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Update version number to 2009.
+
+ * configure.ac, ac/web2c.ac (--with-tex-banner):
+ allow to specify the string appended to banner lines instead of
+ the current default 'Web2C 2009'.
+ This string must contain the current Web2C version number.
+
2009-05-29 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac, ac/web2c.ac (enable_omfonts): allow to choose
diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac
index 9e99a22e63e..e7d13dae9ff 100644
--- a/Build/source/texk/web2c/ac/web2c.ac
+++ b/Build/source/texk/web2c/ac/web2c.ac
@@ -5,6 +5,9 @@ dnl You may freely use, modify and/or distribute this file.
dnl
## configure options for TeX and MF
m4_define_default([kpse_indent_26], [26])[]dnl
+AC_ARG_WITH([tex-banner],
+ AS_HELP_STRING([--with-tex-banner=STR],
+ [version string appended to banner lines @<:@Web2C YEAR@:>@]))[]dnl
AC_ARG_WITH([editor],
AS_HELP_STRING([--with-editor=CMD],
[invoke CMD from the `e' option @<:@vi +%d %s@:>@]))[]dnl
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index a269ffb959a..36bc3c4167e 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for Web2C 7.5.7.
+# Generated by GNU Autoconf 2.63 for Web2C 2009.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='Web2C'
PACKAGE_TARNAME='web2c'
-PACKAGE_VERSION='7.5.7'
-PACKAGE_STRING='Web2C 7.5.7'
+PACKAGE_VERSION='2009'
+PACKAGE_STRING='Web2C 2009'
PACKAGE_BUGREPORT='tex-k@tug.org'
ac_unique_file="cpascal.h"
@@ -1033,6 +1033,7 @@ with_gnu_ld
enable_libtool_lock
enable_largefile
enable_cxx_runtime_hack
+with_tex_banner
with_editor
enable_auto_core
enable_dump_share
@@ -1646,7 +1647,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 Web2C 7.5.7 to adapt to many kinds of systems.
+\`configure' configures Web2C 2009 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1720,7 +1721,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Web2C 7.5.7:";;
+ short | recursive ) echo "Configuration of Web2C 2009:";;
esac
cat <<\_ACEOF
@@ -1769,6 +1770,7 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-tex-banner=STR version string appended to banner lines [Web2C YEAR]
--with-editor=CMD invoke CMD from the `e' option [vi +%d %s]
--without-mf-x-toolkit do not use X toolkit for METAFONT
--with-fontconfig-includes=DIR
@@ -1890,7 +1892,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Web2C configure 7.5.7
+Web2C configure 2009
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1904,7 +1906,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 Web2C $as_me 7.5.7, which was
+It was created by Web2C $as_me 2009, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2307,11 +2309,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-WEB2CVERSION=7.5.7
-
-cat >>confdefs.h <<_ACEOF
-#define WEB2CVERSION " (Web2C $WEB2CVERSION)"
-_ACEOF
+WEB2CVERSION=2009
am__api_version='1.11'
@@ -4564,13 +4562,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4567: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4565: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4570: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4568: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4573: output\"" >&5)
+ (eval echo "\"\$as_me:4571: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5776,7 +5774,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5779 "configure"' > conftest.$ac_ext
+ echo '#line 5777 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7156,7 +7154,7 @@ fi
# Define the identity of the package.
PACKAGE='web2c'
- VERSION='7.5.7'
+ VERSION='2009'
cat >>confdefs.h <<_ACEOF
@@ -7722,11 +7720,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7725: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7723: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7729: \$? = $ac_status" >&5
+ echo "$as_me:7727: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8061,11 +8059,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8064: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8062: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8068: \$? = $ac_status" >&5
+ echo "$as_me:8066: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8166,11 +8164,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8169: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8167: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8173: \$? = $ac_status" >&5
+ echo "$as_me:8171: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8221,11 +8219,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8224: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8222: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8228: \$? = $ac_status" >&5
+ echo "$as_me:8226: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11021,7 +11019,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11024 "configure"
+#line 11022 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11117,7 +11115,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11120 "configure"
+#line 11118 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16171,11 +16169,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16174: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16172: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16178: \$? = $ac_status" >&5
+ echo "$as_me:16176: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16270,11 +16268,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16273: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16271: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16277: \$? = $ac_status" >&5
+ echo "$as_me:16275: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16322,11 +16320,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16325: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16323: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16329: \$? = $ac_status" >&5
+ echo "$as_me:16327: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17574,6 +17572,11 @@ fi
## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
## configure options for TeX and MF
+# Check whether --with-tex-banner was given.
+if test "${with_tex_banner+set}" = set; then
+ withval=$with_tex_banner;
+fi
+
# Check whether --with-editor was given.
if test "${with_editor+set}" = set; then
withval=$with_editor;
@@ -17722,6 +17725,21 @@ if test "${enable_web_progs+set}" = set; then
fi
+case $with_tex_banner in
+ ''|yes|no) with_tex_banner="Web2C $WEB2CVERSION" ;;
+ *) if test -z `echo "$with_tex_banner" | sed -n "/ $WEB2CVERSION/p"`; then
+ { { $as_echo "$as_me:$LINENO: error: Bad \`--with-tex-banner=$with_tex_banner' version string (must contain \` $WEB2CVERSION')" >&5
+$as_echo "$as_me: error: Bad \`--with-tex-banner=$with_tex_banner' version string (must contain \` $WEB2CVERSION')" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+ ;;
+esac
+
+cat >>confdefs.h <<_ACEOF
+#define WEB2CVERSION " ($with_tex_banner)"
+_ACEOF
+
+
for ac_prog in kpsewhich
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -22657,7 +22675,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-Web2C config.lt 7.5.7
+Web2C config.lt 2009
configured by $0, generated by GNU Autoconf 2.63.
Copyright (C) 2008 Free Software Foundation, Inc.
@@ -25340,7 +25358,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Web2C $as_me 7.5.7, which was
+This file was extended by Web2C $as_me 2009, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25403,7 +25421,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-Web2C config.status 7.5.7
+Web2C config.status 2009
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index fe23be2bb2b..1bb30f4d901 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -19,7 +19,7 @@ dnl get these features if you are willing to hack the sources. If not,
dnl it'll take a good argument to convince me to invest the time to make
dnl them configurable.
dnl
-m4_define([web2_version], [7.5.7])
+m4_define([web2_version], [2009])
AC_INIT([Web2C], web2_version(), [tex-k@tug.org])
AC_PREREQ([2.63])
dnl
@@ -32,7 +32,6 @@ AC_CONFIG_MACRO_DIR([../../m4])
WEB2CVERSION=web2_version()
AC_SUBST([WEB2CVERSION])
-AC_DEFINE_UNQUOTED([WEB2CVERSION], [" (Web2C $WEB2CVERSION)"])
dnl Common code for all programs using libkpathsea.
KPSE_COMMON([web2c programs])
@@ -44,6 +43,12 @@ dnl Include additional code for web2c.
KPSE_WEB2C_PREPARE
m4_include([ac/web2c.ac])
+AS_CASE([$with_tex_banner],
+ [''|yes|no], [with_tex_banner="Web2C $WEB2CVERSION"],
+ [AS_IF([test -z `echo "$with_tex_banner" | sed -n "/ $WEB2CVERSION/p"`],
+ [AC_MSG_ERROR([Bad `--with-tex-banner=$with_tex_banner' version string (must contain ` $WEB2CVERSION')])])])
+AC_DEFINE_UNQUOTED([WEB2CVERSION], [" ($with_tex_banner)"])
+
dnl For tests
AC_CHECK_PROGS([KPSEWHICH], [kpsewhich], [false])