summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-03-26 17:49:49 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-03-26 17:49:49 +0000
commit86cd8242c84f96343172773431bcf614b0c7b349 (patch)
tree432be33ed67ec14520282649a73c6a1562ce9eff /Build/source/texk/web2c
parente3801dcee49cd7bd91f7005dbdcbd83360affbb5 (diff)
new build system: cleanup and more dvipng
git-svn-id: svn://tug.org/texlive/trunk@12522 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r--Build/source/texk/web2c/ac/web2c.ac27
-rw-r--r--Build/source/texk/web2c/c-auto.in2
-rwxr-xr-xBuild/source/texk/web2c/configure75
-rw-r--r--Build/source/texk/web2c/configure.ac2
4 files changed, 57 insertions, 49 deletions
diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac
index e5f0d273d1f..01c2f6ffbfb 100644
--- a/Build/source/texk/web2c/ac/web2c.ac
+++ b/Build/source/texk/web2c/ac/web2c.ac
@@ -1,21 +1,27 @@
## texk/web2c/ac/web2c.ac
## configure options for TeX and MF
+m4_define_default([kpse_indent_26], [26])[]dnl
+m4_define_default([kpse_indent_28], [28])[]dnl
AC_ARG_WITH([editor],
[AS_HELP_STRING([--with-editor=CMD],
[invoke CMD from the `e' option @<:@vi +%d %s@:>@])])[]dnl
AC_ARG_ENABLE([auto-core],
[AS_HELP_STRING([--enable-auto-core],
- [cause TeX&MF to dump core, given a certain filename])])[]dnl
+ [cause TeX&MF to dump core, given a certain filename],
+ kpse_indent_26)])[]dnl
AC_ARG_ENABLE([dump-share],
[AS_HELP_STRING([--disable-dump-share],
- [make fmt/base/mem files architecture-dependent])])[]dnl
+ [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])])[]dnl
+ [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])])[]dnl
+ [enable TeX's --ipc option, i.e., pipe to a program],
+ kpse_indent_26)])[]dnl
m4_define([kpse_tex_progs], [dnl
[[tex], [yes], [no], [TeX], []],
[[etex], [no], [yes], [e-TeX], []],
@@ -31,11 +37,12 @@ m4_foreach([Kpse_Prog], [kpse_tex_progs],
## configure options for MF
AC_ARG_ENABLE([mf],
[AS_HELP_STRING([--disable-mf],
- [do not build METAFONT])])[]dnl
+ [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],
- [30])])[]dnl
+ kpse_indent_28)])[]dnl
AC_ARG_WITH([mf-x-toolkit],
[AS_HELP_STRING([--with-mf-x-toolkit],
[Use X toolkit for METAFONT])])[]dnl
@@ -45,7 +52,7 @@ m4_define([kpse_mf_win], [dnl
[[mftalk], [MFTALK], [mftalk (generic server)]],
[[next], [NEXT], [NeXT]],
[[regis], [REGIS], [Regis]],
-[[suntools], [SUN], [old Suntools (this is not X)]],
+[[suntools], [SUN], [old Suntools (not X)]],
[[tektronix], [TEKTRONIX], [Tektronix]],
[[uniterm], [UNITERM], [Uniterm]],
])[]dnl
@@ -55,8 +62,10 @@ m4_foreach([Kpse_Win], [kpse_mf_win],
## configure options for MP
AC_ARG_ENABLE([mp],
[AS_HELP_STRING([--disable-mp],
- [do not build METAPOST])])[]dnl
+ [do not build METAPOST],
+ kpse_indent_26)])[]dnl
## configure options for WEB programs
AC_ARG_ENABLE([web-progs],
[AS_HELP_STRING([--disable-web-progs],
- [do not build WEB programs bibtex ... weave])])[]dnl
+ [do not build WEB programs bibtex ... weave],
+ kpse_indent_26)])[]dnl
diff --git a/Build/source/texk/web2c/c-auto.in b/Build/source/texk/web2c/c-auto.in
index 6065acc3214..01e05b9f2e2 100644
--- a/Build/source/texk/web2c/c-auto.in
+++ b/Build/source/texk/web2c/c-auto.in
@@ -229,7 +229,7 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
-/* metafont: Define to include old Suntools (this is not X) window support. */
+/* metafont: Define to include old Suntools (not X) window support. */
#undef SUNWIN
/* metafont: Define to include Tektronix window support. */
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index de15451d014..3702ba2c72e 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -1707,24 +1707,23 @@ Optional Features:
--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-tex do not compile and install TeX
- --enable-etex compile and install e-TeX
- --enable-omega compile and install Omega
- --disable-aleph do not compile and install Aleph
- --disable-pdftex do not compile and install pdfTeX
- --disable-luatex do not compile and install luaTeX
- --enable-xetex compile and install XeTeX
+ --disable-tex do not compile and install TeX
+ --enable-etex compile and install e-TeX
+ --enable-omega compile and install Omega
+ --disable-aleph do not compile and install Aleph
+ --disable-pdftex do not compile and install pdfTeX
+ --disable-luatex do not compile and install luaTeX
+ --enable-xetex compile and install XeTeX
--disable-mf do not build METAFONT
- --enable-mf-nowin 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 (this is not X) window
- support
- --enable-tektronixwin include Tektronix window support
- --enable-unitermwin include Uniterm window support
+ --enable-mf-nowin 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
@@ -4359,13 +4358,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:4362: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4361: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4365: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4364: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4368: output\"" >&5)
+ (eval echo "\"\$as_me:4367: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5571,7 +5570,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5574 "configure"' > conftest.$ac_ext
+ echo '#line 5573 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7618,11 +7617,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:7621: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7620: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7625: \$? = $ac_status" >&5
+ echo "$as_me:7624: \$? = $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.
@@ -7957,11 +7956,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:7960: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7959: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7964: \$? = $ac_status" >&5
+ echo "$as_me:7963: \$? = $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.
@@ -8062,11 +8061,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:8065: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8064: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8069: \$? = $ac_status" >&5
+ echo "$as_me:8068: \$? = $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
@@ -8117,11 +8116,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:8120: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8119: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8124: \$? = $ac_status" >&5
+ echo "$as_me:8123: \$? = $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
@@ -10917,7 +10916,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10920 "configure"
+#line 10919 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11013,7 +11012,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11016 "configure"
+#line 11015 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16264,11 +16263,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:16267: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16266: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16271: \$? = $ac_status" >&5
+ echo "$as_me:16270: \$? = $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.
@@ -16363,11 +16362,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:16366: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16365: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16370: \$? = $ac_status" >&5
+ echo "$as_me:16369: \$? = $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
@@ -16415,11 +16414,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:16418: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16417: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16422: \$? = $ac_status" >&5
+ echo "$as_me:16421: \$? = $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
@@ -26108,7 +26107,7 @@ $as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
if test "x$cross_compiling" = xyes; then
cache_file=/dev/null
- ac_configure_args="$ac_configure_args --host='$build_alias' \
+ ac_configure_args="$ac_configure_args --host='$build' \
CC='$BUILDCC' CPPFLAGS='$BUILDCPPFLAGS'\
CFLAGS='$BUILDCFLAGS' LDFLAGS='$BUILDLDFLAGS'"
fi
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index d7e2437f48f..96459d1387d 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -303,7 +303,7 @@ dnl The subdirectory web2c must be configured for the build system.
dnl Can not share the cache file with the subdirectory!
AC_CONFIG_COMMANDS_POST([AS_IF([test "x$cross_compiling" = xyes],
[cache_file=/dev/null
- ac_configure_args="$ac_configure_args --host='$build_alias' \
+ ac_configure_args="$ac_configure_args --host='$build' \
CC='$BUILDCC' CPPFLAGS='$BUILDCPPFLAGS'\
CFLAGS='$BUILDCFLAGS' LDFLAGS='$BUILDLDFLAGS'"])])