summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-03-02 13:00:44 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-03-02 13:00:44 +0000
commita221d478c0af19226e1086b2d5381f6d3abdf2c9 (patch)
tree6594d448dfaf8456be4c484c72050a98557422a7 /Build/source/texk/web2c
parente353515c04a63f182389b1989d8aa0bcec79a6bd (diff)
build system: adapt to GNU M4 1.4.14
git-svn-id: svn://tug.org/texlive/trunk@17287 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r--Build/source/texk/web2c/ac/web2c.ac4
-rwxr-xr-xBuild/source/texk/web2c/configure71
2 files changed, 38 insertions, 37 deletions
diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac
index 4bcb9cefebb..c25b056050d 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 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
dnl You may freely use, modify and/or distribute this file.
dnl
## configure options for TeX and MF
@@ -47,7 +47,7 @@ AC_ARG_ENABLE([mf],
AC_ARG_ENABLE([mf-nowin],
AS_HELP_STRING([--disable-mf-nowin],
[do not build a separate non-windows-capable METAFONT],
- kpse_indent_26+2))[]dnl
+ 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
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 8da471bb500..8217cde183c 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -1710,22 +1710,23 @@ Optional Features:
--disable-ipc disable TeX's --ipc option, i.e., pipe to a program
--disable-omfonts do not compile and install omfonts (use Web2C
versions)
- --disable-tex do not compile and install TeX
- --enable-etex compile and install e-TeX
- --disable-aleph do not compile and install Aleph
- --disable-pdftex do not compile and install pdfTeX
- --disable-luatex do not compile and install luaTeX
- --disable-xetex do not compile and install XeTeX
+ --disable-tex do not compile and install TeX
+ --enable-etex compile and install e-TeX
+ --disable-aleph do not compile and install Aleph
+ --disable-pdftex do not compile and install pdfTeX
+ --disable-luatex do not compile and install luaTeX
+ --disable-xetex do not compile and install XeTeX
--disable-mf do not build METAFONT
- --disable-mf-nowin do not build a separate non-windows-capable METAFONT
- --enable-epsfwin include EPSF pseudo window support
- --enable-hp2627win include HP 2627 window support
- --enable-mftalkwin include mftalk (generic server) window support
- --enable-nextwin include NeXT window support
- --enable-regiswin include Regis window support
- --enable-suntoolswin include old Suntools (not X) window support
- --enable-tektronixwin include Tektronix window support
- --enable-unitermwin include Uniterm window support
+ --disable-mf-nowin do not build a separate non-windows-capable
+ METAFONT
+ --enable-epsfwin include EPSF pseudo window support
+ --enable-hp2627win include HP 2627 window support
+ --enable-mftalkwin include mftalk (generic server) window support
+ --enable-nextwin include NeXT window support
+ --enable-regiswin include Regis window support
+ --enable-suntoolswin include old Suntools (not X) window support
+ --enable-tektronixwin include Tektronix window support
+ --enable-unitermwin include Uniterm window support
--disable-mp do not build METAPOST
--disable-web-progs do not build WEB programs bibtex ... weave
--disable-missing terminate if a requested program or feature must be
@@ -5171,13 +5172,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:5174: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5175: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5177: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5178: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5180: output\"" >&5)
+ (eval echo "\"\$as_me:5181: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6380,7 +6381,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6383 "configure"' > conftest.$ac_ext
+ echo '#line 6384 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8310,11 +8311,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:8313: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8314: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8317: \$? = $ac_status" >&5
+ echo "$as_me:8318: \$? = $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.
@@ -8649,11 +8650,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:8652: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8653: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8656: \$? = $ac_status" >&5
+ echo "$as_me:8657: \$? = $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.
@@ -8754,11 +8755,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:8757: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8758: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8761: \$? = $ac_status" >&5
+ echo "$as_me:8762: \$? = $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
@@ -8809,11 +8810,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:8812: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8813: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8816: \$? = $ac_status" >&5
+ echo "$as_me:8817: \$? = $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
@@ -11176,7 +11177,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11179 "configure"
+#line 11180 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11272,7 +11273,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11275 "configure"
+#line 11276 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15062,11 +15063,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:15065: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15066: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15069: \$? = $ac_status" >&5
+ echo "$as_me:15070: \$? = $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.
@@ -15161,11 +15162,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:15164: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15165: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15168: \$? = $ac_status" >&5
+ echo "$as_me:15169: \$? = $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
@@ -15213,11 +15214,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:15216: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15217: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15220: \$? = $ac_status" >&5
+ echo "$as_me:15221: \$? = $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