build system: remove --enable-fmtutil, fix option defaults, general cleanup

git-svn-id: svn://tug.org/texlive/trunk@12986 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 5 insertions, 353 deletions

diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index efcfc2a5edd..f4abe2497ba 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -696,7 +696,6 @@ enable_web2c
 with_editor
 enable_auto_core
 enable_dump_share
-enable_fmtutil
 enable_ipc
 enable_tex
 enable_etex
@@ -1455,8 +1454,8 @@ Optional Features:
   --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
@@ -1464,7 +1463,8 @@ 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
@@ -1536,7 +1536,7 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=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-gs=/PATH/TO/gs   Hard-wire the location of GhostScript
   --with-xdvi-x-toolkit=KIT
                           Use toolkit KIT (motif/xaw/xaw3d/neXtaw) for xdvi
@@ -2352,10 +2352,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
diff --git a/Build/source/utils/pdfopen/Makefile.am.orig b/Build/source/utils/pdfopen/Makefile.am.orig
deleted file mode 100644
index 7aab0fdef8a..00000000000
--- a/Build/source/utils/pdfopen/Makefile.am.orig
+++ /dev/null
@@ -1,12 +0,0 @@
-
-AM_CFLAGS = $(X_CFLAGS)
-
-LDADD = $(X_LIBS) -lX11 -lXmu $(X_EXTRA_LIBS)
-
-bin_PROGRAMS = pdfopen pdfclose
-
-pdfopen_SOURCES = pdfopen.c sendx.c
-
-pdfclose_SOURCES = pdfclose.c sendx.c
-
-
diff --git a/Build/source/utils/pdfopen/configure.ac.orig b/Build/source/utils/pdfopen/configure.ac.orig
deleted file mode 100644
index 882aa35bd14..00000000000
--- a/Build/source/utils/pdfopen/configure.ac.orig
+++ /dev/null
@@ -1,25 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl this is for autoconf 2.5x
-
-AC_INIT(pdfopen, 0.5, taco@metatex.org)
-
-AC_CONFIG_AUX_DIR(config)
-
-AM_INIT_AUTOMAKE(pdfopen, 0.5)
-
-AC_CONFIG_FILES(Makefile)
-
-AC_PROG_CC
-
-dnl AC_PROG_INSTALL
-
-dnl Checks for header files.
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-
-dnl Checks for library functions.
-
-dnl Find Xlibs.
-AC_PATH_XTRA
-
-AC_OUTPUT
diff --git a/Build/source/utils/ps2eps/Makefile.in.orig b/Build/source/utils/ps2eps/Makefile.in.orig
deleted file mode 100644
index f7dd345b3c6..00000000000
--- a/Build/source/utils/ps2eps/Makefile.in.orig
+++ /dev/null
@@ -1,53 +0,0 @@
-# Public domain, written by Vladimir Volovich.
-
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-CC = @CC@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-
-prefix = @prefix@
-datarootdir = @datarootdir@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-mandir = @mandir@
-manext = 1
-man1dir = $(mandir)/man$(manext)
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_DATA = @INSTALL_DATA@
-
-default all: bbox
-
-bbox: bbox.o
-	$(CC) $(LDFLAGS) bbox.o -o bbox
-
-.c.o:
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
-
-install: bbox
-	$(INSTALL) -d $(bindir)
-	$(INSTALL) -d $(man1dir)
-	$(INSTALL_SCRIPT) $(srcdir)/ps2eps $(bindir)/ps2eps
-	$(INSTALL_PROGRAM) bbox $(bindir)/bbox
-	$(INSTALL_DATA) $(srcdir)/ps2eps.1 $(man1dir)/ps2eps.1
-	$(INSTALL_DATA) $(srcdir)/bbox.1 $(man1dir)/bbox.1
-
-check:
-
-uninstall:
-	-rm -f $(bindir)/ps2eps $(bindir)/bbox $(man1dir)/ps2eps.1 $(man1dir)/bbox.1
-
-clean:
-	-rm -f bbox bbox.o
-
-distclean: clean
-	-rm -f Makefile config.status config.log config.cache
-
-realclean: distclean
-
-mostlyclean: clean
diff --git a/Build/source/utils/ps2eps/configure.in.orig b/Build/source/utils/ps2eps/configure.in.orig
deleted file mode 100644
index 23a72b87b3d..00000000000
--- a/Build/source/utils/ps2eps/configure.in.orig
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_INIT(ps2eps, 1.61, texlive@tug.org)
-
-AC_CONFIG_FILES(Makefile)
-
-AC_PROG_INSTALL
-
-AC_PROG_CC
-
-AC_OUTPUT
diff --git a/Build/source/utils/psutils/Makefile.in.orig b/Build/source/utils/psutils/Makefile.in.orig
deleted file mode 100644
index 28b8f61b48d..00000000000
--- a/Build/source/utils/psutils/Makefile.in.orig
+++ /dev/null
@@ -1,230 +0,0 @@
-# @configure_input@
-#
-#	Makefile for psutils
-#
-
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-CC = @CC@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-defines = -DUNIX -DPAPER=\"$(PAPER)\"
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-scriptdir = $(bindir)
-mandir = @mandir@
-man1dir = $(mandir)/man$(manext)
-manext = 1
-
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL = @INSTALL@
-
-BIN = psbook psselect pstops epsffit psnup psresize
-SHELLSCRIPTS = getafm showchar
-PERLSCRIPTS = fixfmps fixmacps fixpsditps fixpspps fixtpps fixwfwps fixwpps fixscribeps fixwwps fixdlsrps extractres includeres psmerge
-MANPAGES = psbook.$(manext) psselect.$(manext) pstops.$(manext) epsffit.$(manext) psnup.$(manext) psresize.$(manext) psmerge.$(manext) fixscribeps.$(manext) getafm.$(manext) fixdlsrps.$(manext) fixfmps.$(manext) fixmacps.$(manext) fixpsditps.$(manext) fixpspps.$(manext) fixtpps.$(manext) fixwfwps.$(manext) fixwpps.$(manext) fixwwps.$(manext) extractres.$(manext) includeres.$(manext)
-INCLUDES = md68_0.ps md71_0.ps
-OS = UNIX
-PAPER = a4
-
-default all: $(BIN) $(PERLSCRIPTS) $(MANPAGES) $(SHELLSCRIPTS)
-
-.SUFFIXES:
-.SUFFIXES: .o .c .h .ps .dvi .info .texinfo
-
-.c.o:
-	$(CC) $(defines) -c -I. -I$(srcdir) $(CPPFLAGS) $(CFLAGS) $<
-
-PERL = /usr/bin/env perl
-BINMODE = 0755
-MANMODE = 0644
-CHMOD = chmod
-MAKETEXT = $(PERL) $(srcdir)/maketext
-
-epsffit: epsffit.o pserror.o
-	$(CC) $(LDFLAGS) -o epsffit pserror.o epsffit.o
-
-psnup: psnup.o psutil.o psspec.o pserror.o
-	$(CC) $(LDFLAGS) -o psnup psutil.o psspec.o pserror.o psnup.o
-
-psresize: psresize.o psutil.o pserror.o psspec.o
-	$(CC) $(LDFLAGS) -o psresize psutil.o psspec.o pserror.o psresize.o
-
-psbook: psbook.o psutil.o pserror.o
-	$(CC) $(LDFLAGS) -o psbook psutil.o pserror.o psbook.o
-
-psselect: psselect.o psutil.o pserror.o
-	$(CC) $(LDFLAGS) -o psselect psutil.o pserror.o psselect.o
-
-pstops: pstops.o psutil.o psspec.o pserror.o
-	$(CC) $(LDFLAGS) -o pstops psutil.o psspec.o pserror.o pstops.o
-
-getafm: getafm.sh
-	cp $(srcdir)/getafm.sh getafm
-	$(CHMOD) $(BINMODE) getafm
-
-showchar: showchar.sh
-	cp $(srcdir)/showchar.sh showchar
-	$(CHMOD) $(BINMODE) showchar
-
-psmerge: psmerge.pl
-	$(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/psmerge.pl > psmerge
-	$(CHMOD) $(BINMODE) psmerge
-
-fixfmps: fixfmps.pl
-	$(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/fixfmps.pl > fixfmps
-	$(CHMOD) $(BINMODE) fixfmps
-
-fixmacps: fixmacps.pl
-	$(MAKETEXT) OS=$(OS) PERL="$(PERL)" INCLUDE=$(INCLUDEDIR) $(srcdir)/fixmacps.pl > fixmacps
-	$(CHMOD) $(BINMODE) fixmacps
-
-fixpsditps: fixpsditps.pl
-	$(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/fixpsditps.pl > fixpsditps
-	$(CHMOD) $(BINMODE) fixpsditps
-
-fixpspps: fixpspps.pl
-	$(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/fixpspps.pl > fixpspps
-	$(CHMOD) $(BINMODE) fixpspps
-
-fixscribeps: fixscribeps.pl
-	$(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/fixscribeps.pl > fixscribeps
-	$(CHMOD) $(BINMODE) fixscribeps
-
-fixtpps: fixtpps.pl
-	$(MAKETEXT) OS=$(OS) PERL="$(PERL)"  $(srcdir)/fixtpps.pl > fixtpps
-	$(CHMOD) $(BINMODE) fixtpps
-
-fixwfwps: fixwfwps.pl
-	$(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/fixwfwps.pl > fixwfwps
-	$(CHMOD) $(BINMODE) fixwfwps
-
-fixwpps: fixwpps.pl
-	$(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/fixwpps.pl > fixwpps
-	$(CHMOD) $(BINMODE) fixwpps
-
-fixwwps: fixwwps.pl
-	$(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/fixwwps.pl > fixwwps
-	$(CHMOD) $(BINMODE) fixwwps
-
-fixdlsrps: fixdlsrps.pl
-	$(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/fixdlsrps.pl > fixdlsrps
-	$(CHMOD) $(BINMODE) fixdlsrps
-
-extractres: extractres.pl
-	$(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/extractres.pl > extractres
-	$(CHMOD) $(BINMODE) extractres
-
-includeres: includeres.pl
-	$(MAKETEXT) OS=$(OS) PERL="$(PERL)" INCLUDE=$(INCLUDEDIR) $(srcdir)/includeres.pl > includeres
-	$(CHMOD) $(BINMODE) includeres
-
-epsffit.$(manext): epsffit.man
-	$(MAKETEXT) MAN="$(MANPAGES)" $(srcdir)/epsffit.man > epsffit.$(manext)
-
-psnup.$(manext): psnup.man
-	$(MAKETEXT) MAN="$(MANPAGES)" PAPER=$(PAPER) $(srcdir)/psnup.man > psnup.$(manext)
-
-psresize.$(manext): psresize.man
-	$(MAKETEXT) MAN="$(MANPAGES)" PAPER=$(PAPER) $(srcdir)/psresize.man > psresize.$(manext)
-
-psbook.$(manext): psbook.man
-	$(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/psbook.man > psbook.$(manext)
-
-psselect.$(manext): psselect.man
-	$(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/psselect.man > psselect.$(manext)
-
-pstops.$(manext): pstops.man
-	$(MAKETEXT) "MAN=$(MANPAGES)" PAPER=$(PAPER) $(srcdir)/pstops.man > pstops.$(manext)
-
-psmerge.$(manext): psmerge.man
-	$(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/psmerge.man > psmerge.$(manext)
-
-fixfmps.$(manext): fixfmps.man
-	$(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/fixfmps.man > fixfmps.$(manext)
-
-fixmacps.$(manext): fixmacps.man
-	$(MAKETEXT) "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $(srcdir)/fixmacps.man > fixmacps.$(manext)
-
-fixpsditps.$(manext): fixpsditps.man
-	$(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/fixpsditps.man > fixpsditps.$(manext)
-
-fixpspps.$(manext): fixpspps.man
-	$(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/fixpspps.man > fixpspps.$(manext)
-
-fixscribeps.$(manext): fixscribeps.man
-	$(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/fixscribeps.man > fixscribeps.$(manext)
-
-fixtpps.$(manext): fixtpps.man
-	$(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/fixtpps.man > fixtpps.$(manext)
-
-fixwfwps.$(manext): fixwfwps.man
-	$(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/fixwfwps.man > fixwfwps.$(manext)
-
-fixwpps.$(manext): fixwpps.man
-	$(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/fixwpps.man > fixwpps.$(manext)
-
-fixwwps.$(manext): fixwwps.man
-	$(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/fixwwps.man > fixwwps.$(manext)
-
-fixdlsrps.$(manext): fixdlsrps.man
-	$(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/fixdlsrps.man > fixdlsrps.$(manext)
-
-extractres.$(manext): extractres.man
-	$(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/extractres.man > extractres.$(manext)
-
-includeres.$(manext): includeres.man
-	$(MAKETEXT) "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $(srcdir)/includeres.man > includeres.$(manext)
-
-getafm.$(manext): getafm.man
-	$(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/getafm.man > getafm.$(manext)
-
-info:
-dvi:
-
-SHELL = /bin/sh
-@SET_MAKE@
-
-.PHONY: install installdirs install-exec install-man clean realclean distclean mostlyclean all check info dvi
-install: install-exec install-man
-
-install-exec: installdirs
-	for p in $(BIN); do $(INSTALL_PROGRAM) $$p $(bindir)/$$p; done
-	for p in $(SHELLSCRIPTS) $(PERLSCRIPTS); do $(INSTALL_PROGRAM) $$p $(scriptdir)/$$p; done
-
-install-man: installdirs
-	for p in $(MANPAGES); do $(INSTALL_DATA) $$p $(man1dir)/$$p; done
-
-installdirs:
-	$(SHELL) ${srcdir}/../../texk/mkinstalldirs $(bindir) $(scriptdir) $(man1dir) 
-
-clean:
-	rm -f *.o $(BIN) $(SHELLSCRIPTS) $(PERLSCRIPTS) $(MANPAGES)
-
-distclean: mostlyclean
-	rm -f Makefile  config.cache  config.log  config.status  patchlev.h
-
-realclean: distclean
-mostlyclean: clean
-
-Makefile: config.status $(srcdir)/Makefile.in
-	$(SHELL) config.status
-
-# This tells versions [3.59,3.63) of GNU make not to export all variables.
-.NOEXPORT:
-
-# Automatically generated dependencies will be put at the end of the file.
-psutil.o: psutil.h patchlev.h pserror.h psutil.c
-psspec.o: psutil.h patchlev.h psspec.h pserror.h psspec.c
-pserror.o: psutil.h patchlev.h pserror.h pserror.c
-epsffit.o: epsffit.c pserror.h patchlev.h
-psnup.o: psutil.h patchlev.h psspec.h pserror.h psnup.c
-psresize.o: psutil.h patchlev.h psspec.h pserror.h psresize.c
-psbook.o: psutil.h patchlev.h pserror.h psbook.c
-psselect.o: psutil.h patchlev.h pserror.h psselect.c
-pstops.o: psutil.h patchlev.h psspec.h pserror.h pstops.c
diff --git a/Build/source/utils/psutils/configure.in.orig b/Build/source/utils/psutils/configure.in.orig
deleted file mode 100644
index 35a06cdf7c1..00000000000
--- a/Build/source/utils/psutils/configure.in.orig
+++ /dev/null
@@ -1,15 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(psutil.c)
-
-AC_CONFIG_AUX_DIR(../../config)
-
-AC_PROG_CC
-AC_PROG_CPP
-AC_ISC_POSIX
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-
-sinclude(../../multiplatform.ac)
-
-AC_CONFIG_FILES([Makefile patchlev.h])
-AC_OUTPUT