summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-07 14:33:48 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-07 14:33:48 +0000
commit8243edfca0be6770fa56b9bc220b05ae505d1082 (patch)
tree0fc8b06d0c1ffdc32b1184c2e0815fe5359fcb35 /Build/source/texk/web2c
parent47a56b5dc7f17f502aee404c912490f135ca3c52 (diff)
build system: remove --enable-fmtutil, fix option defaults, general cleanup
git-svn-id: svn://tug.org/texlive/trunk@12986 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r--Build/source/texk/web2c/ChangeLog4
-rw-r--r--Build/source/texk/web2c/ac/web2c.ac16
-rwxr-xr-xBuild/source/texk/web2c/configure80
-rw-r--r--Build/source/texk/web2c/configure.ac27
4 files changed, 56 insertions, 71 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 6d61844e467..7f66194032c 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * ac/web2c.ac, configure.ac: Remove --enable-fmtutil option.
+
2009-05-05 Peter Breitenlohner <peb@mppmu.mpg.de>
* texmfmp.h: remove references to pdfeTeX.
diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac
index e024927493b..c387810e650 100644
--- a/Build/source/texk/web2c/ac/web2c.ac
+++ b/Build/source/texk/web2c/ac/web2c.ac
@@ -16,14 +16,10 @@ AC_ARG_ENABLE([dump-share],
[AS_HELP_STRING([--disable-dump-share],
[make fmt/base/mem files architecture-dependent],
kpse_indent_26)])[]dnl
-AC_ARG_ENABLE([fmtutil],
- [AS_HELP_STRING([--enable-fmtutil],
- [use fmtutil for build dumps],
- kpse_indent_26)])[]dnl
## configure options for TeX
AC_ARG_ENABLE([ipc],
- [AS_HELP_STRING([--enable-ipc],
- [enable TeX's --ipc option, i.e., pipe to a program],
+ [AS_HELP_STRING([--disable-ipc],
+ [disable TeX's --ipc option, i.e., pipe to a program],
kpse_indent_26)])[]dnl
m4_define([kpse_tex_progs], [dnl
[[tex], [yes], [no], [TeX], []],
@@ -42,12 +38,12 @@ AC_ARG_ENABLE([mf],
[do not build METAFONT],
kpse_indent_26)])[]dnl
AC_ARG_ENABLE([mf-nowin],
- [AS_HELP_STRING([--enable-mf-nowin],
- [build a separate non-windows-capable METAFONT],
+ [AS_HELP_STRING([--disable-mf-nowin],
+ [do not build a separate non-windows-capable METAFONT],
kpse_indent_26+2)])[]dnl
AC_ARG_WITH([mf-x-toolkit],
- [AS_HELP_STRING([--with-mf-x-toolkit],
- [Use X toolkit for METAFONT])])[]dnl
+ [AS_HELP_STRING([--without-mf-x-toolkit],
+ [do not 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 24ea78626d3..2bd844b3a0c 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -899,8 +899,6 @@ MINGW32_FALSE
MINGW32_TRUE
WIN32_FALSE
WIN32_TRUE
-FMU_FALSE
-FMU_TRUE
CXX_HACK_LIBS
CXX_HACK_DEPS
CXXLD
@@ -1035,7 +1033,6 @@ enable_cxx_runtime_hack
with_editor
enable_auto_core
enable_dump_share
-enable_fmtutil
enable_ipc
enable_tex
enable_etex
@@ -1739,8 +1736,7 @@ Optional Features:
--enable-cxx-runtime-hack link C++ runtime statically
--enable-auto-core cause TeX&MF to dump core, given a certain filename
--disable-dump-share make fmt/base/mem files architecture-dependent
- --enable-fmtutil use fmtutil for build dumps
- --enable-ipc enable TeX's --ipc option, i.e., pipe to a program
+ --disable-ipc disable TeX's --ipc option, i.e., pipe to a program
--disable-tex do not compile and install TeX
--enable-etex compile and install e-TeX
--disable-aleph do not compile and install Aleph
@@ -1748,7 +1744,7 @@ Optional Features:
--disable-luatex do not compile and install luaTeX
--disable-xetex do not compile and install XeTeX
--disable-mf do not build METAFONT
- --enable-mf-nowin build a separate non-windows-capable 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
@@ -1767,7 +1763,7 @@ Optional Packages:
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-editor=CMD invoke CMD from the `e' option [vi +%d %s]
- --with-mf-x-toolkit Use X toolkit for METAFONT
+ --without-mf-x-toolkit do not use X toolkit for METAFONT
--with-fontconfig=DIR use fontconfig include/library files from DIR
--with-x use the X Window System
--with-system-kpathsea use installed kpathsea headers and library
@@ -4406,13 +4402,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:4409: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4405: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4412: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4408: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4415: output\"" >&5)
+ (eval echo "\"\$as_me:4411: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5618,7 +5614,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5621 "configure"' > conftest.$ac_ext
+ echo '#line 5617 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7665,11 +7661,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:7668: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7664: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7672: \$? = $ac_status" >&5
+ echo "$as_me:7668: \$? = $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.
@@ -8004,11 +8000,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:8007: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8003: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8011: \$? = $ac_status" >&5
+ echo "$as_me:8007: \$? = $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.
@@ -8109,11 +8105,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:8112: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8108: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8116: \$? = $ac_status" >&5
+ echo "$as_me:8112: \$? = $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
@@ -8164,11 +8160,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:8167: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8163: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8171: \$? = $ac_status" >&5
+ echo "$as_me:8167: \$? = $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
@@ -10964,7 +10960,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10967 "configure"
+#line 10963 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11060,7 +11056,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11063 "configure"
+#line 11059 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16076,11 +16072,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:16079: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16075: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16083: \$? = $ac_status" >&5
+ echo "$as_me:16079: \$? = $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.
@@ -16175,11 +16171,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:16178: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16174: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16182: \$? = $ac_status" >&5
+ echo "$as_me:16178: \$? = $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
@@ -16227,11 +16223,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:16230: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16226: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16234: \$? = $ac_status" >&5
+ echo "$as_me:16230: \$? = $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
@@ -17491,10 +17487,6 @@ fi
if test "${enable_dump_share+set}" = set; then
enableval=$enable_dump_share;
fi
-# Check whether --enable-fmtutil was given.
-if test "${enable_fmtutil+set}" = set; then
- enableval=$enable_fmtutil;
-fi
## configure options for TeX
# Check whether --enable-ipc was given.
if test "${enable_ipc+set}" = set; then
@@ -17734,13 +17726,10 @@ _ACEOF
fi
- if test "x$enable_fmtutil" = xyes; then
- FMU_TRUE=
- FMU_FALSE='#'
-else
- FMU_TRUE='#'
- FMU_FALSE=
-fi
+case $enable_ipc in
+ yes|no) : ;;
+ *) enable_ipc=yes ;;
+esac
{ $as_echo "$as_me:$LINENO: checking for native WIN32 or MINGW32" >&5
@@ -18536,7 +18525,7 @@ else
MF_FALSE=
fi
- if test "x$enable_mf_nowin" = xyes; then
+ if test "x$enable_mf_nowin" != xno; then
MFN_TRUE=
MFN_FALSE='#'
else
@@ -18547,17 +18536,17 @@ fi
# Handle --with-mf-x-toolkit and --with-x
case $with_mf_x_toolkit in
- ''|yes|no) : ;;
+ yes|no) : ;;
''|y|ye) with_mf_x_toolkit=yes ;;
n) with_mf_x_toolkit=no ;;
*) { $as_echo "$as_me:$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 ;;
+ with_mf_x_toolkit=yes ;;
esac
test "x$with_x_toolkit" = xyes && with_x=yes
test "x$with_x" = xno && with_x_toolkit=no
-: ${with_x=no} # tell PATH_XTRA no X by default, if not specified.
+: ${with_x=yes} # tell PATH_XTRA to use X by default, if not specified.
# Distinguish no X at all, no toolkit, or toolkit.
{ $as_echo "$as_me:$LINENO: checking for X" >&5
@@ -24597,13 +24586,6 @@ $as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${FMU_TRUE}" && test -z "${FMU_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"FMU\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"FMU\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then
{ { $as_echo "$as_me:$LINENO: error: conditional \"WIN32\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index 9b7358e9b08..2556a517803 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -46,7 +46,8 @@ m4_include([ac/web2c.ac])
KPSE_ASM_UNDERSCORE
-AS_CASE([$with_editor], [''|yes|no], [with_editor='vi +%d %s'])
+AS_CASE([$with_editor],
+ [''|yes|no], [with_editor='vi +%d %s'])
AC_DEFINE_UNQUOTED([EDITOR], ["$with_editor"],
[web2c: Default editor for interactive `e' option.])
@@ -59,7 +60,9 @@ AS_IF([test "x$enable_dump_share" = xno],
[web2c: Define to disable architecture-independent dump files.
Faster on LittleEndian architectures.])])
-AM_CONDITIONAL([FMU], [test "x$enable_fmtutil" = xyes])
+AS_CASE([$enable_ipc],
+ [yes|no], [],
+ [enable_ipc=yes])
KPSE_CHECK_WIN32
AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno])
@@ -75,7 +78,7 @@ AS_IF([test "x$enable_luatex:$enable_ipc" != xno:no],
AS_IF([test "x$enable_ipc" = xyes],
[AC_MSG_WARN([no socket library: disabling ipc])
enable_ipc=no])],
- [socketlibs=$ac_cv_search_connect])])
+ [socketlibs=$ac_cv_search_connect])])
if test "x$enable_ipc" = xyes; then
ipc_socketlibs=$socketlibs
AC_DEFINE([IPC], 1, [tex: Define to enable --ipc.])
@@ -94,13 +97,13 @@ if test "x$kpse_cv_have_win32" = xno; then
[no], [AS_IF([test "x$enable_luatex" = xyes],
[AC_MSG_WARN([Sorry, no gethostbyname(): can not build luaTeX])
enable_luatex=no])],
- [lua_socketlibs="$lua_socketlibs $ac_cv_search_gethostbyname"])
+ [lua_socketlibs="$lua_socketlibs $ac_cv_search_gethostbyname"])
AS_CASE([$ac_cv_search_nanosleep],
["none required"], [],
[no], [AS_IF([test "x$enable_luatex" = xyes],
[AC_MSG_WARN([Sorry, no nanosleep(): can not build luaTeX])
enable_luatex=no])],
- [lua_socketlibs="$lua_socketlibs $ac_cv_search_nanosleep"])
+ [lua_socketlibs="$lua_socketlibs $ac_cv_search_nanosleep"])
fi
AC_SUBST([lua_socketlibs])
AC_SUBST([ipc_socketlibs])
@@ -128,18 +131,18 @@ AM_CONDITIONAL([OTANGLE],
AM_CONDITIONAL([OMFONTS], [true])
AM_CONDITIONAL([MF], [test "x$enable_mf" != xno])
-AM_CONDITIONAL([MFN], [test "x$enable_mf_nowin" = xyes])
+AM_CONDITIONAL([MFN], [test "x$enable_mf_nowin" != xno])
# Handle --with-mf-x-toolkit and --with-x
AS_CASE([$with_mf_x_toolkit],
- [''|yes|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])
+ [yes|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])
test "x$with_x_toolkit" = xyes && with_x=yes
test "x$with_x" = xno && with_x_toolkit=no
-: ${with_x=no} # tell PATH_XTRA no X by default, if not specified.
+: ${with_x=yes} # tell PATH_XTRA to use X by default, if not specified.
# Distinguish no X at all, no toolkit, or toolkit.
AC_PATH_XTRA