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

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

10 files changed, 18 insertions, 101 deletions

diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index c40c14bc9c2..b639bcd0912 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -696,7 +696,6 @@ enable_web2c
 with_editor
 enable_auto_core
 enable_dump_share
-enable_fmtutil
 enable_ipc
 enable_tex
 enable_etex
@@ -1459,8 +1458,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
@@ -1468,7 +1467,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
@@ -1540,7 +1540,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
@@ -2356,10 +2356,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/libs/gd/ChangeLog b/Build/source/libs/gd/ChangeLog
index 327c56808ff..23dc097edce 100644
--- a/Build/source/libs/gd/ChangeLog
+++ b/Build/source/libs/gd/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Adapt to TL2009 build system.
+
 2008-01-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Convert from autoconf-2.13 to autoconf-2.59+:
diff --git a/Build/source/libs/gd/Makefile.in.orig b/Build/source/libs/gd/Makefile.in.orig
deleted file mode 100644
index b86ba7e837f..00000000000
--- a/Build/source/libs/gd/Makefile.in.orig
+++ /dev/null
@@ -1,32 +0,0 @@
-# @configure_input@
-
-kpse_include ../../texk/make/common.mk
-kpse_include ../../texk/make/programs.mk
-kpse_include ../../texk/make/library.mk
-
-ZLIBDIR=../zlib
-ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
-
-LIBPNGDIR=../libpng
-LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
-
-XDEFS = -DHAVE_LIBPNG @ZLIBCPPFLAGS@ @LIBPNGCPPFLAGS@
-
-OBJS = gdcache.o gdfontg.o gdfontl.o gdfontmb.o gdfonts.o gdfontt.o gdft.o \
-  gdfx.o gd_gd2.o gd_gd.o gd_gif_in.o gd_gif_out.o gdhelpers.o gd_io_dp.o \
-  gd_io_file.o gd_io.o gd_io_ss.o gd_jpeg.o gdkanji.o gd.o gd_png.o \
-  gd_ss.o gdtables.o gd_topal.o gd_wbmp.o gdxpm.o wbmp.o gd_security.o
-all: libgd.a
-
-libgd.a: $(OBJS)
-	rm -f $@
-	$(AR) $(ARFLAGS) $@ $(OBJS)
-	$(RANLIB) $@
-
-kpse_include ../../texk/make/clean.mk
-
-clean::
-	rm -f libgd.a
-
-distclean:: clean
-	rm -f config.h
diff --git a/Build/source/libs/gd/configure.in.orig b/Build/source/libs/gd/configure.in.orig
deleted file mode 100644
index f779102b465..00000000000
--- a/Build/source/libs/gd/configure.in.orig
+++ /dev/null
@@ -1,32 +0,0 @@
-AC_INIT(gd.c)
-AC_CONFIG_AUX_DIR(../../config)
-
-GDLIB_MAJOR=2
-GDLIB_MINOR=0
-GDLIB_REVISION=33
-GDLIBNAME=gd
-
-AC_SUBST(GDLIB_MAJOR)
-AC_SUBST(GDLIB_MINOR)
-AC_SUBST(GDLIB_REVISION)
-AC_SUBST(GDLIBNAME)
-
-AC_CONFIG_HEADERS(config.h:config.hin)
-
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-
-AC_HEADER_STDC
-AC_CHECK_HEADERS([errno.h limits.h stddef.h stdlib.h string.h unistd.h])
-
-sinclude(../../texk/kpathsea/withenable.ac)
-sinclude(../zlib/withenable.ac)
-sinclude(../zlib/zlib.ac)
-sinclude(../libpng/withenable.ac)
-sinclude(../libpng/libpng.ac)
-
-KPSE_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/Build/source/libs/obsdcompat/ChangeLog b/Build/source/libs/obsdcompat/ChangeLog
new file mode 100644
index 00000000000..9cc14b044f6
--- /dev/null
+++ b/Build/source/libs/obsdcompat/ChangeLog
@@ -0,0 +1,4 @@
+2009-05-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Adapt to TL2009 build system.
+
diff --git a/Build/source/libs/obsdcompat/Makefile.in b/Build/source/libs/obsdcompat/Makefile.in
index b1b66532117..997e47f12ce 100644
--- a/Build/source/libs/obsdcompat/Makefile.in
+++ b/Build/source/libs/obsdcompat/Makefile.in
@@ -44,7 +44,7 @@ DIST_COMMON = README $(am__configure_deps) \
 	../../build-aux/config.guess ../../build-aux/config.sub \
 	../../build-aux/depcomp ../../build-aux/install-sh \
 	../../build-aux/ltmain.sh ../../build-aux/missing \
-	../../build-aux/texinfo.tex ../../build-aux/ylwrap
+	../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/Build/source/libs/obsdcompat/libobsd-compat.ac b/Build/source/libs/obsdcompat/libobsd-compat.ac
deleted file mode 100644
index 5958ee7ecc9..00000000000
--- a/Build/source/libs/obsdcompat/libobsd-compat.ac
+++ /dev/null
@@ -1,13 +0,0 @@
-if test "$needs_obsdcompat" = no; then
-  LIBOBSDCFLAGS=
-  LDLIBOBSD=
-  LIBOBSDDEP=
-else
-  LIBOBSDCFLAGS='-I$(LIBOBSDCOMPATDIR)'
-  LDLIBOBSD='$(LIBOBSDCOMPATDIR)/libopenbsd-compat.a'
-  LIBOBSDDEP='$(LIBOBSDCOMPATDIR)/libopenbsd-compat.a'
-fi
-
-AC_SUBST(LIBOBSDCFLAGS)
-AC_SUBST(LDLIBOBSD)
-AC_SUBST(LIBOBSDDEP)
diff --git a/Build/source/libs/teckit/ChangeLog b/Build/source/libs/teckit/ChangeLog
index e69de29bb2d..9cc14b044f6 100644
--- a/Build/source/libs/teckit/ChangeLog
+++ b/Build/source/libs/teckit/ChangeLog
@@ -0,0 +1,4 @@
+2009-05-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Adapt to TL2009 build system.
+
diff --git a/Build/source/libs/teckit/teckit.ac b/Build/source/libs/teckit/teckit.ac
deleted file mode 100644
index 3760c7aa312..00000000000
--- a/Build/source/libs/teckit/teckit.ac
+++ /dev/null
@@ -1,13 +0,0 @@
-if test "$needs_teckit" = no; then
-  TECKITCPPFLAGS=
-  LDTECKIT=
-  TECKITDEP=
-else
-  TECKITCPPFLAGS='-I$(TECKITSRCDIR)/source/Public-headers'
-  LDTECKIT='$(TECKITDIR)/lib/.libs/libTECkit.a'
-  TECKITDEP='$(TECKITDIR)/lib/.libs/libTECkit.a'
-fi
-
-AC_SUBST(TECKITCPPFLAGS)
-AC_SUBST(LDTECKIT)
-AC_SUBST(TECKITDEP)
diff --git a/Build/source/libs/teckit/withenable.ac b/Build/source/libs/teckit/withenable.ac
deleted file mode 100644
index ddb0c8b61a7..00000000000
--- a/Build/source/libs/teckit/withenable.ac
+++ /dev/null
@@ -1 +0,0 @@
-# we don't currently support use of an installed teckit lib