diff options
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r-- | Build/source/texk/web2c/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/ac/web2c.ac | 4 | ||||
-rwxr-xr-x | Build/source/texk/web2c/configure | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/configure.ac | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/kpathsea.mk | 7 | ||||
-rw-r--r-- | Build/source/texk/web2c/withenable.ac | 175 |
6 files changed, 9 insertions, 187 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 068e5b09b8c..60bce946d24 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,7 @@ +2009-05-27 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac, ac/web2c.ac (enable_ipc): default is enabled. + 2009-05-25 Peter Breitenlohner <peb@mppmu.mpg.de> * mp.ch, mp.web, mpdir/, mpware/: removed (old MetaPost). diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac index 2080c3bce68..8fd0fde6fc7 100644 --- a/Build/source/texk/web2c/ac/web2c.ac +++ b/Build/source/texk/web2c/ac/web2c.ac @@ -18,8 +18,8 @@ AC_ARG_ENABLE([dump-share], 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], []], diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 053dbbf12b0..4d57fb921ee 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -1738,7 +1738,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-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 @@ -17866,7 +17866,7 @@ fi case $enable_ipc in yes|no) : ;; - *) enable_ipc=no ;; + *) enable_ipc=yes ;; esac diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index bba9281374b..c3649484fd5 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -65,7 +65,7 @@ AS_IF([test "x$enable_dump_share" = xno], AS_CASE([$enable_ipc], [yes|no], [], - [enable_ipc=no]) + [enable_ipc=yes]) KPSE_CHECK_WIN32 AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno]) diff --git a/Build/source/texk/web2c/kpathsea.mk b/Build/source/texk/web2c/kpathsea.mk deleted file mode 100644 index 99fb51196a3..00000000000 --- a/Build/source/texk/web2c/kpathsea.mk +++ /dev/null @@ -1,7 +0,0 @@ -# web2c/kpathsea.mk -- In subdirectories of web2c, the build directory -# for kpathsea is one more level up. c_auto_h_dir is used by make depend. -kpathsea_parent = ../.. -c_auto_h_dir = .. - -prog_cflags = -I.. -I$(srcdir)/.. -# End of web2c/kpathsea.mk. diff --git a/Build/source/texk/web2c/withenable.ac b/Build/source/texk/web2c/withenable.ac deleted file mode 100644 index ffc691384f3..00000000000 --- a/Build/source/texk/web2c/withenable.ac +++ /dev/null @@ -1,175 +0,0 @@ -dnl withenable.ac: --with and --enable options. - -dnl The implementation of the defaults for the next three options is found -dnl in configure.in. - -dnl Do we compile e-TeX? -dnl We default to yes if the sources are available. -AC_ARG_WITH([etex], -[ --without-etex don't compile and install e-TeX]) - -dnl Do we compile Omega? -dnl We default to yes if the sources are available. -AC_ARG_WITH([omega], -[ --without-omega don't compile and install Omega]) - -dnl Do we compile Aleph? -dnl We default to yes if the sources are available. -AC_ARG_WITH([aleph], -[ --without-aleph don't compile and install Aleph]) - -dnl Do we compile pdfTeX? -dnl We default to yes if the sources are available. -AC_ARG_WITH([pdftex], -[ --without-pdftex don't compile and install pdfTeX]) - -dnl Do we compile pdfeTeX? -dnl We default to yes if the sources are available. -AC_ARG_WITH([pdfetex], -[ --without-pdfetex don't compile and install pdfeTeX]) - -dnl Do we compile luaTeX? -dnl We default to yes if the sources are available. -AC_ARG_WITH([luatex], -[ --without-luatex don't compile and install luaTeX]) - -dnl Do we compile XeTeX? -dnl We default to yes if the sources are available. -AC_ARG_WITH([xetex], -[ --without-xetex don't compile and install XeTeX]) - -dnl Try to link C++ runtime statically? -dnl Only important, if you want to create binaries which are slightly -dnl more portable. -AC_ARG_WITH([cxx-runtime-hack], -[ --with-cxx-runtime-hack link C++ runtime statically]) - -AC_ARG_WITH([editor], -[ --with-editor=CMD invoke CMD from the e option [vi +%d %s]], - [], [with_editor="vi +%d %s"]) -AC_DEFINE_UNQUOTED([EDITOR], ["$with_editor"], - [web2c: Default editor for interactive `e' option.]) - -AC_ARG_ENABLE([ipc], -[ --enable-ipc enable TeX's --ipc option, i.e., pipe to a program], -[if test "x$enableval" = xyes; then - AC_DEFINE([IPC], , [tex: Define to enable --ipc.]) - # -lsocket is needed on Solaris, at least. Maybe -lnsl on SCO, too? - # See ac_path_xtra. - AC_CHECK_FUNC(connect) - if test x$ac_cv_func_connect = xno; then - AC_CHECK_LIB(socket, connect, socketlibs="-lsocket $socketlibs") - fi -fi -]) -AC_SUBST(socketlibs) - -AC_ARG_ENABLE([auto-core], -[ --enable-auto-core cause TeX&MF to dump core given a certain filename], - [AC_DEFINE([FUNNY_CORE_DUMP], , - [web2c: Define to enable HackyInputFileNameForCoreDump.tex.]) -]) - -AC_ARG_ENABLE([dump-share], -[ --disable-dump-share make fmt/base/mem files architecture-dependent], -[if test "x$enableval" = xno; then - AC_DEFINE([NO_DUMP_SHARE], , - [web2c: Define to disable architecture-independent dump files. - Faster on LittleEndian architectures.]) -fi -]) - -AC_ARG_ENABLE([fmtutil], -[ --enable-fmtutil use fmtutil for build dumps]) - -dnl Do we include Window system support in MF? -dnl Here we have three choices: yes, no, and as a separate executable mfw. -dnl We default to mf. -AC_ARG_WITH([mf-nowin], -[ --with-mf-nowin build a separate non-windows-capable METAFONT]) - -# Window system support for Metafont. -AC_ARG_WITH([epsfwin], - [ --with-epsfwin include EPSF pseudo-window support], -[if test "x$withval" = xyes; then - AC_DEFINE([EPSFWIN], , - [metafont: Define to include EPSF pseudo-window support]) -fi -]) -AC_ARG_WITH([hp2627win], - [ --with-hp2627win include HP 2627 window support in Metafont], -[if test "x$withval" = xyes; then - AC_DEFINE([HP2627WIN], , - [metafont: Define to include HP 2627 window support]) -fi -]) -AC_ARG_WITH([mftalkwin], - [ --with-mftalkwin include mftalk (generic server) window support], -[if test "x$withval" = xyes; then - AC_DEFINE([MFTALKWIN], , - [metafont: Define to include mftalk (generic server) window support]) -fi -]) -AC_ARG_WITH([nextwin], - [ --with-nextwin include NeXT window support], -[if test "x$withval" = xyes; then - AC_DEFINE([NEXTWIN], , - [metafont: Define to include NeXT window support]) -fi -]) -AC_ARG_WITH([regiswin], - [ --with-regiswin include Regis window support], -[if test "x$withval" = xyes; then - AC_DEFINE([REGISWIN], , - [metafont: Define to include Regis window support]) -fi -]) -AC_ARG_WITH([suntoolswin], - [ --with-suntoolswin include old Suntools window support (this is not X)], -[if test "x$withval" = xyes; then - wlibs="-lsuntool -lsunwindow -lpixrect $wlibs" - AC_DEFINE([SUNWIN], , - [metafont: Define to include old Suntools window support (this is not X)]) -fi -]) -AC_ARG_WITH([tektronixwin], - [ --with-tektronixwin include Tektronix window support], -[if test "x$withval" = xyes; then - AC_DEFINE([TEKTRONIXWIN], , - [metafont: Define to include Tektronix window support]) -fi -]) -AC_ARG_WITH([unitermwin], - [ --with-unitermwin include Uniterm window support], -[if test "x$withval" = xyes; then - AC_DEFINE([UNITERMWIN], , - [metafont: Define to include Uniterm window support]) -fi -]) - -sinclude(../kpathsea/xt.ac) - -AC_ARG_WITH([x11win], - [ --with-x11win same as --with-x], - [with_x="$withval"]) -AC_ARG_WITH([x11], - [ --with-x11 same as --with-x], - [with_x="$withval"]) - -dnl This defines --with-x implicitly (which is why we use that package -dnl name below), so put it here, so it comes first in the --help output. -dnl This reads best. - -dnl Remember to add AC_PATH_XTRA when actually using X. - -AC_ARG_WITH([mf-x-toolkit], -[ --with-mf-x-toolkit Use X toolkit for mf.], -[ case "${withval}" in - y | ye | yes ) val=yes ;; - n | no ) val=no ;; - * ) -AC_MSG_WARN([unknown --with-mf-x-toolkit argument \`$withval'; using yes.]) - val=yes;; - esac - with_mf_x_toolkit=$val -]) |