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

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

3 files changed, 4 insertions, 83 deletions

diff --git a/Build/source/texk/ttf2pk/ChangeLog b/Build/source/texk/ttf2pk/ChangeLog
index a84a79382ae..b8805da4cad 100644
--- a/Build/source/texk/ttf2pk/ChangeLog
+++ b/Build/source/texk/ttf2pk/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Adapt to TL2009 build system.
+
 2008-02-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.in: added AC_CONFIG_HEADERS (moved
diff --git a/Build/source/texk/ttf2pk/Makefile.in.orig b/Build/source/texk/ttf2pk/Makefile.in.orig
deleted file mode 100644
index 64669ac3189..00000000000
--- a/Build/source/texk/ttf2pk/Makefile.in.orig
+++ /dev/null
@@ -1,64 +0,0 @@
-# @configure_input@
-# Makefile for ttf2pk --te@dbs.uni-hannover.de. Public domain.
-
-kpse_include ../make/paths.mk
-kpse_include ../make/common.mk
-kpse_include ../make/programs.mk
-
-LDFREETYPE=@LDFREETYPE@
-FREETYPECPPFLAGS=@FREETYPECPPFLAGS@
-FREETYPEDEP=@FREETYPEDEP@
-FREETYPEDIR = ../../libs/freetype
-FREETYPESRCDIR = $(srcdir)/$(FREETYPEDIR)
-
-prog_cflags = -DHAVE_LIBKPATHSEA $(FREETYPECPPFLAGS) 
-prog_ldflags = $(LDFREETYPE)
-
-ttf2pkobjs = errormsg.o filesrch.o ligkern.o newobj.o parse.o pklib.o \
-  subfont.o texenc.o ttf2pk.o ttfenc.o ttflib.o
-
-ttf2tfmobjs = case.o errormsg.o filesrch.o ligkern.o newobj.o parse.o \
-  subfont.o texenc.o tfmaux.o ttf2tfm.o ttfaux.o ttfenc.o vplaux.o
-
-programs = ttf2pk ttf2tfm
-
-default all: $(programs)
-
-ttf2pk: $(kpathsea) $(ttf2pkobjs) $(FREETYPEDEP)
-	$(kpathsea_link)  $(ttf2pkobjs) $(prog_ldflags) $(LOADLIBES)
-
-ttf2tfm: $(kpathsea) $(ttf2tfmobjs) $(FREETYPEDEP)
-	$(kpathsea_link) $(ttf2tfmobjs) $(prog_ldflags) $(LOADLIBES)
-
-$(FREETYPEDIR)/lib/.libs/libttf.a:
-	cd $(FREETYPEDIR); $(MAKE) $(makeargs)
-
-kpse_include ../make/tkpathsea.mk
-
-install: install-exec install-data
-uninstall: uninstall-exec uninstall-data
-
-install-exec: $(programs)
-	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-uninstall-exec:
-	for p in $(programs); do rm -f $(bindir)/$$p; done
-
-install-data: ttf2pk.1 ttf2tfm.1
-	$(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
-	$(INSTALL_DATA) $(srcdir)/ttf2pk.1 $(man1dir)/ttf2pk.$(manext)
-	$(INSTALL_DATA) $(srcdir)/ttf2tfm.1 $(man1dir)/ttf2tfm.$(manext)
-uninstall-data:
-	rm -f $(man1dir)/ttf2pk.$(manext) $(man1dir)/ttf2tfm.$(manext)
-
-pre-dist-$(distname):
-post-dist-$(distname):
-
-kpse_include ../make/dist.mk
-kpse_include ../make/config.mk
-
-info dvi check:
-
-kpse_include ../make/clean.mk
-kpse_include ../make/rdepend.mk
-kpse_include depend.mk
diff --git a/Build/source/texk/ttf2pk/configure.in.orig b/Build/source/texk/ttf2pk/configure.in.orig
deleted file mode 100644
index c8a32886130..00000000000
--- a/Build/source/texk/ttf2pk/configure.in.orig
+++ /dev/null
@@ -1,19 +0,0 @@
-dnl Public domain.
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(ttf2pk.c)
-
-AC_CONFIG_HEADERS([c-auto.h:c-auto.in])
-
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_PROG_LN_S
-
-sinclude(../kpathsea/withenable.ac)
-sinclude(../../libs/freetype/withenable.ac)
-sinclude(../../libs/freetype/freetype.ac)
-
-AC_CHECK_LIB(m, main)
-
-KPSE_CONFIG_FILES([Makefile])
-AC_OUTPUT