diff options
Diffstat (limited to 'Build/source/texk')
35 files changed, 101 insertions, 1044 deletions
diff --git a/Build/source/texk/afm2pl/ChangeLog b/Build/source/texk/afm2pl/ChangeLog index ac5c3d88527..107b3246fa8 100644 --- a/Build/source/texk/afm2pl/ChangeLog +++ b/Build/source/texk/afm2pl/ChangeLog @@ -1,3 +1,7 @@ +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + 2008-01-30 Peter Breitenlohner <peb@mppmu.mpg.de> Convert from autoconf-2.13 to autoconf-2.59+: diff --git a/Build/source/texk/afm2pl/Makefile.in.orig b/Build/source/texk/afm2pl/Makefile.in.orig deleted file mode 100644 index d22379fbd5a..00000000000 --- a/Build/source/texk/afm2pl/Makefile.in.orig +++ /dev/null @@ -1,43 +0,0 @@ -# @configure_input@ -# Makefile for afm2pl. Thomas Esser. public domain. - -program = afm2pl -default all: $(program) $(program).1 - -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk - -# See INSTALL for compilation options. -# DEFS = @DEFS@ $(XDEFS) -DKPATHSEA -I$(srcdir)/../dvipsk -DEFS = @DEFS@ $(XDEFS) -DKPATHSEA - -objects = $(program).o - -$(program): $(kpathsea) $(objects) - $(kpathsea_link) $(objects) $(LOADLIBES) - -kpse_include ../make/tkpathsea.mk - -install: install-exec install-data -uninstall: uninstall-exec uninstall-data - -install-exec: $(program) - $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) - $(INSTALL_LIBTOOL_PROG) $(program) $(bindir) -uninstall-exec: - rm -f $(bindir)/$(program) - -install-data: $(program).1 - $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) - $(INSTALL_DATA) $(srcdir)/$(program).1 $(man1dir)/$(program).$(manext) -uninstall-data: - rm -f $(man1dir)/$(program).$(manext) - -kpse_include ../make/clean.mk -kpse_include ../make/config.mk - -info dvi check: - -kpse_include ../make/rdepend.mk -kpse_include depend.mk diff --git a/Build/source/texk/afm2pl/configure.in.orig b/Build/source/texk/afm2pl/configure.in.orig deleted file mode 100644 index 4678c90e576..00000000000 --- a/Build/source/texk/afm2pl/configure.in.orig +++ /dev/null @@ -1,25 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(afm2pl.c) - -AC_CONFIG_HEADERS(c-auto.h:c-auto.in) - -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_LN_S - -# If libm is present, use it. -AC_CHECK_LIB(m, main,LIBS="$LIBS -lm") - -sinclude(../kpathsea/withenable.ac) - -dnl These tests prevent reliable cross-compilation. Sigh. -dnl Some special hacks are used to make cross-compilation -dnl succeed in one special case. - -AC_UNSET_CC -AC_RESET_CC - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT -date >stamp-auto diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 08c07cb8f5a..6ddd3f391e9 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -696,7 +696,6 @@ enable_web2c with_editor enable_auto_core enable_dump_share -enable_fmtutil enable_ipc enable_tex enable_etex @@ -1478,8 +1477,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 @@ -1487,7 +1486,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 @@ -1559,7 +1559,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 @@ -2375,10 +2375,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/texk/dviljk/ChangeLog b/Build/source/texk/dviljk/ChangeLog index caad3d00676..110138393f6 100644 --- a/Build/source/texk/dviljk/ChangeLog +++ b/Build/source/texk/dviljk/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> * acconfig.h: removed. diff --git a/Build/source/texk/dviljk/Makefile.in.orig b/Build/source/texk/dviljk/Makefile.in.orig deleted file mode 100644 index 2b5ea365d1e..00000000000 --- a/Build/source/texk/dviljk/Makefile.in.orig +++ /dev/null @@ -1,112 +0,0 @@ -# @configure_input@ -# Makefile for dviljk -- kb@mail.tug.org. Public domain. -version = 2.6 - -.NOTPARALLEL: - -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk - -prog_cflags = -DKPATHSEA - -common_objects = tfm.o - -program = dvilj -objects = dvilj.o $(common_objects) -objects2p = dvilj2p.o $(common_objects) -program2p = dvilj2p -objects4 = dvilj4.o $(common_objects) -program4 = dvilj4 -objects4l = dvilj4l.o $(common_objects) -program4l = dvilj4l -program6 = dvilj6 - -programs = $(program) $(program2p) $(program4) $(program4l) - -default: $(program4) -all: $(programs) - -$(program): $(objects) $(kpathsea) - $(kpathsea_link) $(objects) $(LOADLIBES) -$(program2p): $(objects2p) $(kpathsea) - $(kpathsea_link) $(objects2p) $(LOADLIBES) -$(program4): $(objects4) $(kpathsea) - $(kpathsea_link) $(objects4) $(LOADLIBES) -$(program4l): $(objects4l) $(kpathsea) - $(kpathsea_link) $(objects4l) $(LOADLIBES) - -dvilj.o: - $(compile) -c -DLJ $(srcdir)/dvi2xx.c -o $@ -dvilj2p.o: - $(compile) -c -DLJ2P $(srcdir)/dvi2xx.c -o $@ -dvilj4.o: - $(compile) -c -DLJ4 $(srcdir)/dvi2xx.c -o $@ -dvilj4l.o: - $(compile) -c -DLJ4 -DLJ4L $(srcdir)/dvi2xx.c -o $@ - -dvilj.o dvilj2p.o dvilj4.o dvilj4l.o: dvi2xx.c - -VERSION = `grep 'define VERSION' dvi2xx.c | sed -e 's/^.*version //' -e 's/).*//'` -dvilj.man: dvilj.pod dvi2xx.c - pod2man --center="TeX-Live" --release="Version $(VERSION)" $< >$@ -dvilj.ps: dvilj.man - man -t -l $< >$@ - -kpse_include ../make/tkpathsea.mk - -install: install-exec install-data -uninstall: uninstall-exec uninstall-data - -install-exec: - $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) - test ! -f $(program) \ - || $(INSTALL_LIBTOOL_PROG) $(program) $(bindir) - test ! -f $(program2p) \ - || $(INSTALL_LIBTOOL_PROG) $(program2p) $(bindir) - test ! -f $(program4) \ - || $(INSTALL_LIBTOOL_PROG) $(program4) $(bindir) - test ! -f $(program4l) \ - || $(INSTALL_LIBTOOL_PROG) $(program4l) $(bindir) - $(INSTALL_SCRIPT) $(srcdir)/dvihp $(scriptdir)/dvihp - cd $(bindir) && (rm -f $(program6); $(LN) $(program4) $(program6)) -uninstall-exec: - cd $(bindir); rm -f $(programs) - -install-data: - $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) - $(INSTALL_DATA) $(srcdir)/dvilj.man $(man1dir)/dvilj.$(manext) - for p in dvilj2p dvilj4 dvilj4l dvilj6; do \ - rm -f $(man1dir)/$$p.$(manext); \ - ln -s dvilj.$(manext) $(man1dir)/$$p.$(manext); \ - done - $(INSTALL_DATA) $(srcdir)/dvihp.man $(man1dir)/dvihp.$(manext) - -# It seems simplest to keep this separate. Use find and cpio instead of -# just cp -r in case the source hierarchy is cvs- or rcs-ified. -# Use "" to quote wildcards because backslash is a directory separator -# on MS-DOS and MS-Windows. -install-fonts: - find fonts -name \( "*.tfm" -o -name "*.vf" \) -print | cpio -pld $(texmf) - -uninstall-data: - rm -f $(man1dir)/dvilj.$(manext) - - -distname = dviljk -program_files = dvihp dvilj.man README.fonts -version_files = dvi2xx.c dvihp - -pre-dist-$(distname): -post-dist-$(distname): - ln -s `pwd`/fonts `pwd`/tex `pwd`/src.fonts $(distdir) - -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/dviljk/configure.in.orig b/Build/source/texk/dviljk/configure.in.orig deleted file mode 100644 index 32c3066d897..00000000000 --- a/Build/source/texk/dviljk/configure.in.orig +++ /dev/null @@ -1,20 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(dvi2xx.c) - -AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto]) - -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_LN_S - -sinclude(../kpathsea/withenable.ac) - -dnl These tests prevent reliable cross-compilation. Sigh. -AC_C_CHAR_UNSIGNED -AC_CHECK_SIZEOF(long) - -AC_CHECK_FUNCS(rmdir unlink mkdtemp mktemp) - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/texk/gsftopk/ChangeLog b/Build/source/texk/gsftopk/ChangeLog index 7101504aec1..5a3a6432aa9 100644 --- a/Build/source/texk/gsftopk/ChangeLog +++ b/Build/source/texk/gsftopk/ChangeLog @@ -1,3 +1,7 @@ +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + 2008-02-27 Peter Breitenlohner <peb@mppmu.mpg.de> * acconfig.h: removed (empty file). * configure.in: stricter m4 quoting. diff --git a/Build/source/texk/gsftopk/Makefile.in.orig b/Build/source/texk/gsftopk/Makefile.in.orig deleted file mode 100644 index ca7916ed1dd..00000000000 --- a/Build/source/texk/gsftopk/Makefile.in.orig +++ /dev/null @@ -1,64 +0,0 @@ -# @configure_input@ -# Makefile for gsftopkk --kb@cs.umb.edu. Modified Yves.Arrouye@imag.fr -version = 1.19 - -program = gsftopk -default all: $(program) gsftopk.1 - -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk - -gsftopkpsheaderdir = $(psheaderdir)/gsftopk - -# (Optional) The fully-qualified path of Ghostscript. -# GSPATH=-DGS=\"/usr/local/gnu/bin/gs\" - -# See INSTALL for compilation options. -DEFS = @DEFS@ $(XDEFS) $(GSPATH) -DKPATHSEA - -objects = gsftopk.o - - -$(program): $(kpathsea) $(objects) - $(kpathsea_link) $(objects) $(LOADLIBES) - -kpse_include ../make/tkpathsea.mk - -gsftopk.1: gsftopk1.sed sedscript - sed -f sedscript <$(srcdir)/gsftopk1.sed >$@ - -sedscript: mksedscript Makefile - $(SHELL) $(srcdir)/mksedscript $(DEFS) >$@ - -install: install-exec install-data -uninstall: uninstall-exec uninstall-data - -install-exec: $(program) - $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) - $(INSTALL_LIBTOOL_PROG) $(program) $(bindir) -uninstall-exec: - rm -f $(bindir)/$(program) - -install-data: gsftopk.1 - $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(gsftopkpsheaderdir) - $(INSTALL_DATA) gsftopk.1 $(man1dir)/gsftopk.$(manext) - $(INSTALL_DATA) $(srcdir)/render.ps $(gsftopkpsheaderdir)/render.ps -uninstall-data: - rm -f $(man1dir)/gsftopk.$(manext) - rm -f $(gsftopkpsheaderdir)/render.ps - -kpse_include ../make/clean.mk - -clean:: - rm -f sedscript - -distclean:: - rm -f gsftopk.1 - -kpse_include ../make/config.mk - -info dvi check: - -kpse_include ../make/rdepend.mk -kpse_include depend.mk diff --git a/Build/source/texk/gsftopk/configure.in.orig b/Build/source/texk/gsftopk/configure.in.orig deleted file mode 100644 index e81367859fa..00000000000 --- a/Build/source/texk/gsftopk/configure.in.orig +++ /dev/null @@ -1,28 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(gsftopk.c) - -AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto]) - -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_LN_S - -sinclude(../kpathsea/withenable.ac) - -dnl Checks for header files. -AC_HEADER_SYS_WAIT -AC_HEADER_TIME -AC_CHECK_HEADERS([poll.h sys/time.h]) - -dnl Checks for library functions. -AC_FUNC_VFORK -AC_TYPE_SIGNAL -AC_CHECK_FUNCS([poll sigaction]) - -if test "$ac_cv_header_poll_h" = no || test "$ac_cv_func_poll" = no; then - AC_CHECK_HEADERS([sys/select.h select.h]) -fi - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/texk/makeindexk/ChangeLog b/Build/source/texk/makeindexk/ChangeLog index 2b355ec3ede..ad9793c8b71 100644 --- a/Build/source/texk/makeindexk/ChangeLog +++ b/Build/source/texk/makeindexk/ChangeLog @@ -1,3 +1,7 @@ +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + 2008-03-04 Karl Berry <karl@tug.org> * mkind.h (ARABIC_MAX, ROMAN_MAX, NUMBER_MAX): increase to 99. diff --git a/Build/source/texk/makeindexk/Makefile.in.orig b/Build/source/texk/makeindexk/Makefile.in.orig deleted file mode 100644 index d3c5f49aaa2..00000000000 --- a/Build/source/texk/makeindexk/Makefile.in.orig +++ /dev/null @@ -1,54 +0,0 @@ -# @configure_input@ -# Makefile for makeindexk --te@dbs.uni-hannover.de. Public domain. -version = 2.13 - -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk - -objects = genind.o mkind.o qsort.o scanid.o scanst.o sortid.o -program = makeindex -programs = $(program) - -default all: $(programs) - -$(program): $(kpathsea) $(objects) - $(kpathsea_link) $(objects) $(LOADLIBES) -kpse_include ../make/tkpathsea.mk - -install: install-exec install-data -uninstall: uninstall-exec uninstall-data - -install-exec: $(programs) - $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) - $(INSTALL_LIBTOOL_PROG) $(program) $(bindir) - $(INSTALL_SCRIPT) $(srcdir)/mkindex $(scriptdir)/mkindex -uninstall-exec: - cd $(bindir) && rm -f $(program) - cd $(scriptdir) && rm -f mkindex - -install-data: makeindex.1 - $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) - $(INSTALL_DATA) $(srcdir)/makeindex.1 $(man1dir)/makeindex.$(manext) - $(INSTALL_DATA) $(srcdir)/mkindex.1 $(man1dir)/mkindex.$(manext) - -uninstall-data: - -distname = makeindex -program_files = -version_files = - -pre-dist-$(distname): -post-dist-$(distname): - -kpse_include ../make/dist.mk -kpse_include ../make/config.mk - -info dvi check: - -kpse_include ../make/clean.mk - -distclean:: - -kpse_include ../make/rdepend.mk -kpse_include depend.mk diff --git a/Build/source/texk/makeindexk/configure.in.orig b/Build/source/texk/makeindexk/configure.in.orig deleted file mode 100644 index 434e56f1008..00000000000 --- a/Build/source/texk/makeindexk/configure.in.orig +++ /dev/null @@ -1,18 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(mkind.c) - -AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto]) - -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_LN_S - -sinclude(../kpathsea/withenable.ac) - -AC_ARG_PROGRAM -AC_HAVE_HEADERS(ctype.h types.h locale.h) -AC_CHECK_FUNCS(strchr strrchr setlocale) - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/texk/musixflx/ChangeLog b/Build/source/texk/musixflx/ChangeLog index 112f761c848..8464641037a 100644 --- a/Build/source/texk/musixflx/ChangeLog +++ b/Build/source/texk/musixflx/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/musixflx/Makefile.in.orig b/Build/source/texk/musixflx/Makefile.in.orig deleted file mode 100644 index 52beb1f7037..00000000000 --- a/Build/source/texk/musixflx/Makefile.in.orig +++ /dev/null @@ -1,42 +0,0 @@ -# @configure_input@ -# Makefile for musixflx. Public domain. -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk - -prog_cflags = -DUNIX -DKPATHSEA -DNeedFunctionPrototypes - -program = musixflx -objects = musixflx.o - -programs = $(program) - -default: $(program) -all: $(program) - -$(program): $(objects) - $(kpathsea_link) $(objects) - -install: install-exec - -uninstall: uninstall-exec - -install-exec: all - $(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: - -uninstall-data: - -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/musixflx/configure.in.orig b/Build/source/texk/musixflx/configure.in.orig deleted file mode 100644 index ee2b36b9d30..00000000000 --- a/Build/source/texk/musixflx/configure.in.orig +++ /dev/null @@ -1,14 +0,0 @@ -dnl Public domain. -dnl Process this file with autoconf to produce a configure script. - -AC_INIT(musixflx.c) -AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto]) - -sinclude(../kpathsea/common.ac) - -dnl These tests prevent reliable cross-compilation. Sigh. -AC_C_CHAR_UNSIGNED -AC_CHECK_SIZEOF(long) - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/texk/ps2pkm/ChangeLog b/Build/source/texk/ps2pkm/ChangeLog index a95a4eccb0b..60d874aab36 100644 --- a/Build/source/texk/ps2pkm/ChangeLog +++ b/Build/source/texk/ps2pkm/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> * acconfig.h: removed. diff --git a/Build/source/texk/ps2pkm/Makefile.in.orig b/Build/source/texk/ps2pkm/Makefile.in.orig deleted file mode 100644 index 0a55b49752f..00000000000 --- a/Build/source/texk/ps2pkm/Makefile.in.orig +++ /dev/null @@ -1,64 +0,0 @@ -# @configure_input@ -# Makefile for ps2pkm --te@dbs.uni-hannover.de. Public domain. -version = 1.5m - -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk -prog_cflags = -DUNIX -DKPATHSEA - -libobj = arith.o curves.o fontfcn.o hints.o lines.o objects.o paths.o \ - regions.o scanfont.o spaces.o t1funcs.o t1info.o t1io.o \ - t1snap.o t1stub.o token.o type1.o util.o bstring.o basics.o -common_objects = pkout.o filenames.o -ps2pkobjs = $(libobj) ps2pk.o encoding.o pkout.o filenames.o -pk2bmobjs = pk2bm.o pkin.o -pfb2pfaobjs = pfb2pfa.o filenames.o basics.o -magobjs = mag.o basics.o - -program = ps2pk -programs = pfb2pfa mag pk2bm $(program) - -default all: $(programs) - -$(program): $(kpathsea) $(ps2pkobjs) - $(kpathsea_link) $(ps2pkobjs) $(LOADLIBES) -pk2bm: $(kpathsea) $(pk2bmobjs) - $(kpathsea_link) $(pk2bmobjs) $(LOADLIBES) -pfb2pfa: $(kpathsea) $(pfb2pfaobjs) - $(kpathsea_link) $(pfb2pfaobjs) $(LOADLIBES) -mag: $(kpathsea) $(magobjs) - $(kpathsea_link) $(magobjs) $(LOADLIBES) - -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: mag.1 pfb2pfa.1 pk2bm.1 ps2pk.1 - $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) - $(INSTALL_DATA) $(srcdir)/mag.1 $(man1dir)/mag.$(manext) - $(INSTALL_DATA) $(srcdir)/pfb2pfa.1 $(man1dir)/pfb2pfa.$(manext) - $(INSTALL_DATA) $(srcdir)/pk2bm.1 $(man1dir)/pk2bm.$(manext) - $(INSTALL_DATA) $(srcdir)/ps2pk.1 $(man1dir)/ps2pk.$(manext) -uninstall-data: - rm -f $(man1dir)/ps2pk.$(manext) $(man1dir)/pk2bm.$(manext) \ - $(man1dir)/pfb2pfa.$(manext) $(man1dir)/mag.$(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/ps2pkm/configure.in.orig b/Build/source/texk/ps2pkm/configure.in.orig deleted file mode 100644 index 4f750585481..00000000000 --- a/Build/source/texk/ps2pkm/configure.in.orig +++ /dev/null @@ -1,23 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(arith.c) - -AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto]) - -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_LN_S - -sinclude(../kpathsea/withenable.ac) -AC_CHECK_LIB(m, main) - -dnl Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h) - -dnl Checks for library functions. -AC_FUNC_VPRINTF -AC_CHECK_FUNCS(memset) - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog index 2d8b9ab3490..7aef2d38d4b 100644 --- a/Build/source/texk/tetex/ChangeLog +++ b/Build/source/texk/tetex/ChangeLog @@ -1,3 +1,7 @@ +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + 2009-04-03 Karl Berry <karl@tug.org> * Makefile.am (EXTRA_DIST): remove texdoc.man from list. diff --git a/Build/source/texk/tetex/Makefile.in.orig b/Build/source/texk/tetex/Makefile.in.orig deleted file mode 100644 index 012005bf879..00000000000 --- a/Build/source/texk/tetex/Makefile.in.orig +++ /dev/null @@ -1,113 +0,0 @@ -# $Id$ -# @configure_input@ -# Makefile for teTeX's extra scripts - te@dbs.uni-hannover.de. -# Public domain. - -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk - -man5dir = $(mandir)/man5 - -SCRIPTS = \ - allcm allneeded dvi2fax dvired fmtutil fmtutil-sys fontinst \ - kpsetool kpsewhere ps2frag ps4pdf pslatex rubibtex rumakeindex \ - texconfig texconfig-dialog texconfig-sys \ - texlinks updmap updmap-sys - -contextmanpgs = \ - ctxtools makempy mptopdf pstopdf texfind texmfstart \ - pdftools texexec texfont textools texutil - -# The man pages for script packages such as thumbpdf and mkjobtexmf are -# copied here by hand; ctan2tl doesn't know how to handle this case. Help. -manpgs = \ - allcm allec allneeded dvi2fax dvired e2pall epstopdf fontinst \ - kpsetool kpsewhere mkjobtexmf mkocp mkofm ofm2opl opl2ofm otp2ocp outocp \ - ovf2ovp ovp2ovf ps2frag pslatex rubibtex rumakeindex texconfig \ - texdoctk thumbpdf ttf2afm updmap - -all: $(SCRIPTS) -default: all - -install: install-data install-exec - -# Auxiliary files. -install-data:: - $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(man5dir) $(texpooldir) $(texmf)/doc/tetex - for p in $(manpgs); do \ - $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \ - done - for p in $(contextmanpgs); do \ - $(INSTALL_DATA) $(srcdir)/context/$$p.man $(man1dir)/$$p.$(manext); \ - done - $(INSTALL_DATA) $(srcdir)/fmtutil.man $(man1dir)/fmtutil.1 - $(INSTALL_DATA) $(srcdir)/texlinks.man $(man1dir)/texlinks.1 - $(INSTALL_DATA) $(srcdir)/fmtutil.cnf.5 $(man5dir)/fmtutil.cnf.5 - $(INSTALL_DATA) $(srcdir)/updmap.cfg.5 $(man5dir)/updmap.cfg.5 - cd $(man1dir); rm -f allec.$(manext) texhash.$(manext) \ - lambda.$(manext) pdflatex.$(manext) kpsepath.$(manext) \ - kpsexpand.$(manext) mf-nowin.$(manext) ctangle.$(manext) \ - cweave.$(manext) odvicopy.$(manext) \ - odvitype.$(manext) texconfig-sys.$(manext) \ - updmap-sys.$(manext) mktexfmt.$(manext) fmtutil-sys.$(manext) - ln -s allcm.$(manext) $(man1dir)/allec.$(manext) - ln -s mktexlsr.$(manext) $(man1dir)/texhash.$(manext) - ln -s omega.$(manext) $(man1dir)/lambda.$(manext) - ln -s pdftex.$(manext) $(man1dir)/pdflatex.$(manext) - ln -s kpsetool.$(manext) $(man1dir)/kpsepath.$(manext) - ln -s kpsetool.$(manext) $(man1dir)/kpsexpand.$(manext) - ln -s mf.$(manext) $(man1dir)/mf-nowin.$(manext) - ln -s cweb.$(manext) $(man1dir)/ctangle.$(manext) - ln -s cweb.$(manext) $(man1dir)/cweave.$(manext) - ln -s dvicopy.$(manext) $(man1dir)/odvicopy.$(manext) - ln -s dvitype.$(manext) $(man1dir)/odvitype.$(manext) - ln -s texconfig.$(manext) $(man1dir)/texconfig-sys.$(manext) - ln -s updmap.$(manext) $(man1dir)/updmap-sys.$(manext) - ln -s fmtutil.$(manext) $(man1dir)/mktexfmt.$(manext) - ln -s fmtutil.$(manext) $(man1dir)/fmtutil-sys.$(manext) - for p in TETEXDOC.pdf TETEXDOC.ps TETEXDOC.dvi teTeX-FAQ; do \ - $(INSTALL_DATA) $(srcdir)/doc/$$p $(texmf)/doc/tetex; \ - done - $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/texconfig $(texmf)/texconfig/g $(texmf)/texconfig/v $(texmf)/texconfig/x - $(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic $(texmf)/texconfig/g - $(INSTALL_DATA) $(srcdir)/texmf/texconfig/v/vt100 $(texmf)/texconfig/v - $(INSTALL_DATA) $(srcdir)/texmf/texconfig/x/xterm $(texmf)/texconfig/x - $(INSTALL_DATA) $(srcdir)/texmf/texconfig/README $(texmf)/texconfig - $(INSTALL_DATA) $(srcdir)/texmf/texconfig/generic $(texmf)/texconfig - $(INSTALL_SCRIPT) $(srcdir)/tcfmgr $(texmf)/texconfig/tcfmgr - $(INSTALL_DATA) $(srcdir)/tcfmgr.map $(texmf)/texconfig/tcfmgr.map - $(INSTALL_DATA) $(srcdir)/fmtutil.cnf $(texmf)/web2c/fmtutil.cnf - -install-exec: - -$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir) - for s in $(SCRIPTS); do \ - $(INSTALL_SCRIPT) $(srcdir)/$$s $(scriptdir)/$$s; \ - done - cd $(scriptdir) && rm -f allec kpsepath kpsexpand texhash; \ - ln -s allcm allec; \ - ln -s kpsetool kpsepath; \ - ln -s kpsetool kpsexpand; \ - ln -s mktexlsr texhash - cd $(scriptdir) && rm -f mktexfmt; ln -s fmtutil mktexfmt - -# -# This target is invoked by the top-level make, -# to create the per-format engine symlinks in $(bindir), -# after everything else is installed. We explicitly specify the -# fmtutil.cnf file to use for the sake of distro builds. Also, that way -# we don't have to run mktexlsr also. -run_texlinks = $(bindir)/texlinks -f $(web2cdir)/fmtutil.cnf -run-texlinks: - PATH="$(bindir):$(PATH)"; export PATH; $(run_texlinks) - -kpse_include ../make/clean.mk - -config.status: $(srcdir)/configure - $(SHELL) $(srcdir)/configure --no-create --verbose - -Makefile: $(srcdir)/Makefile.in config.status - $(SHELL) config.status - -depend: -check: diff --git a/Build/source/texk/tetex/configure.in.orig b/Build/source/texk/tetex/configure.in.orig deleted file mode 100644 index fcaf2e14755..00000000000 --- a/Build/source/texk/tetex/configure.in.orig +++ /dev/null @@ -1,12 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(texconfig) - -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_MAKE_SET - -sinclude(../kpathsea/withenable.ac) - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog index 40026903b90..bb87d0e66ec 100644 --- a/Build/source/texk/tex4htk/ChangeLog +++ b/Build/source/texk/tex4htk/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/tex4htk/Makefile.in.orig b/Build/source/texk/tex4htk/Makefile.in.orig deleted file mode 100644 index d7859d85fda..00000000000 --- a/Build/source/texk/tex4htk/Makefile.in.orig +++ /dev/null @@ -1,79 +0,0 @@ -# @configure_input@ -# Makefile for tex4ht in TeX Live. Public domain. -# Originally written by S. Rahtz. -version = 1.0 - -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk -kpse_include ../make/texi.mk -prog_cflags = -DUNIX -DKPATHSEA -DNeedFunctionPrototypes - -objects = tex4ht.o t4ht.o - -programs = tex4ht t4ht -shell_scripts = htcontext htlatex htmex httex httexi htxelatex htxetex ht -perl_scripts = mk4ht - -default all: $(programs) - -t4ht: $(kpathsea) t4ht.o - $(kpathsea_link) t4ht.o $(LOADLIBES) - -tex4ht: $(kpathsea) tex4ht.o - $(kpathsea_link) tex4ht.o $(LOADLIBES) - -kpse_include ../make/tkpathsea.mk - -install: install-exec install-data - -uninstall: uninstall-exec uninstall-data - -install-exec: all - $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) - for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done - $(INSTALL) -d "$(prefix)/texmf-dist/scripts/tex4ht" - for p in $(shell_scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p "$(prefix)/texmf-dist/scripts/tex4ht/$$p.sh"; done - for p in $(perl_scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p "$(prefix)/texmf-dist/scripts/tex4ht/$$p.pl"; done - if test -d "$(bindir)/../../texmf-dist/scripts/tex4ht"; then \ - d=../../texmf-dist/scripts/tex4ht; \ - elif test -d "$(bindir)/../texmf-dist/scripts/tex4ht"; then \ - d=../texmf-dist/scripts/tex4ht; \ - else \ - echo "Error: texmf-dist/scripts/tex4ht directory not found" >&2; \ - exit 1; \ - fi; \ - for p in $(shell_scripts); do rm -f $(bindir)/$$p; ln -s $$d/$$p.sh $(bindir)/$$p; done; \ - for p in $(perl_scripts); do rm -f $(bindir)/$$p; ln -s $$d/$$p.pl $(bindir)/$$p; done - -uninstall-exec: - for p in $(programs) $(scripts); do rm -f $(bindir)/$$p; done - -install-data: - -uninstall-data: - -distname = tex4ht - -kpse_include ../make/dist.mk -kpse_include ../make/config.mk -kpse_include ../make/clean.mk -distclean:: - -rm v*.tex *.txt i*.tex *.gif *.toc *.otc *.lg *.xref *.html *.idv *.log *.aux tmp.* tex4ht.env - -dvi info check: - -maybecheck: - TEXINPUTS=$(srcdir): $(SHELL) $(srcdir)/ht latex test - - -tex4ht.env: tex4ht.in - sed -e "s;@texmf@;$(texmf);" < $(srcdir)/tex4ht.in \ - | sed -e "s;@prefix@;$(prefix);g" \ - | sed -e "s;@imbindir@.;;g" \ - | sed -e "s/Mmove/Mmv/" \ - | sed -e "s/Ccopy/Ccp/" \ - > tex4ht.env - -kpse_include ../make/rdepend.mk -kpse_include depend.mk diff --git a/Build/source/texk/tex4htk/configure.in.orig b/Build/source/texk/tex4htk/configure.in.orig deleted file mode 100644 index 4a988f8dab2..00000000000 --- a/Build/source/texk/tex4htk/configure.in.orig +++ /dev/null @@ -1,11 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. - -AC_INIT(tex4ht.c) -AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto]) - -sinclude(../kpathsea/common.ac) - -AC_CHECK_SIZEOF(int) - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/texk/texlive/ChangeLog b/Build/source/texk/texlive/ChangeLog index 0a1b18dda5f..ff3905cc7a3 100644 --- a/Build/source/texk/texlive/ChangeLog +++ b/Build/source/texk/texlive/ChangeLog @@ -1,3 +1,7 @@ +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + 2009-04-03 Karl Berry <karl@tug.org> * Makefile.am (EXTRA_DIST): remove texdoc.man from list. diff --git a/Build/source/texk/texlive/Makefile.in.orig b/Build/source/texk/texlive/Makefile.in.orig deleted file mode 100644 index ca77c09c249..00000000000 --- a/Build/source/texk/texlive/Makefile.in.orig +++ /dev/null @@ -1,148 +0,0 @@ -# $Id$ -# @configure_input@ -# Makefile for texlive's extra scripts. -# Public domain. - -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk - -# Copies of these scripts exist in /source/live_scripts/ for the sake -# of avoiding dangling links produced by Build; the instances -# in texmf are the masters (except when it is CTAN). -LINKED_SCRIPTS = \ - texmf/scripts/a2ping/a2ping.pl \ - texmf/scripts/epstopdf/epstopdf.pl \ - texmf/scripts/pkfix/pkfix.pl \ - texmf/scripts/ps2eps/ps2eps.pl \ - texmf/scripts/simpdftex/simpdftex \ - texmf/scripts/tetex/e2pall.pl \ - texmf/scripts/tetex/texdoctk.pl \ - texmf/scripts/texlive/getnonfreefonts.pl \ - texmf/scripts/texlive/rungs.tlu \ - texmf/scripts/texlive/tlmgr.pl \ - texmf/scripts/texdoc/texdoc.tlu \ - texmf-dist/scripts/bengali/ebong.py \ - texmf-dist/scripts/dviasm/dviasm.py \ - texmf-dist/scripts/epspdf/epspdf \ - texmf-dist/scripts/epspdf/epspdftk \ - texmf-dist/scripts/fragmaster/fragmaster.pl \ - texmf-dist/scripts/glossaries/makeglossaries \ - texmf-dist/scripts/latex2man/latex2man \ - texmf-dist/scripts/latexmk/latexmk.pl \ - texmf-dist/scripts/mkjobtexmf/mkjobtexmf.pl \ - texmf-dist/scripts/oberdiek/pdfatfi.pl \ - texmf-dist/scripts/pax/pdfannotextractor.pl \ - texmf-dist/scripts/ppower4/ppower4.texlua \ - texmf-dist/scripts/pdfcrop/pdfcrop.pl \ - texmf-dist/scripts/perltex/perltex \ - texmf-dist/scripts/pkfix-helper/pkfix-helper \ - texmf-dist/scripts/ppower4/pdfthumb.texlua \ - texmf-dist/scripts/ppower4/ppower4.texlua \ - texmf-dist/scripts/pst-pdf/ps4pdf \ - texmf-dist/scripts/pst2pdf/pst2pdf.pl \ - texmf-dist/scripts/purifyeps/purifyeps \ - texmf-dist/scripts/splitindex/perl/splitindex.pl \ - texmf-dist/scripts/svn-multi/svn-multi.pl \ - texmf-dist/scripts/texcount/TeXcount.pl \ - texmf-dist/scripts/texloganalyser/texloganalyser \ - texmf-dist/scripts/thumbpdf/thumbpdf.pl \ - texmf-dist/scripts/vpe/vpe.pl \ - texmf-dist/scripts/context/ruby/texmfstart.rb \ - texmf-dist/scripts/context/lua/luatools.lua \ - texmf-dist/scripts/context/lua/mtxrun.lua \ - texmf-dist/scripts/context/stubs/unix/context \ - texmf-dist/scripts/context/stubs/unix/ctxtools \ - texmf-dist/scripts/context/stubs/unix/exatools \ - texmf-dist/scripts/context/stubs/unix/makempy \ - texmf-dist/scripts/context/stubs/unix/mpstools \ - texmf-dist/scripts/context/stubs/unix/mptopdf \ - texmf-dist/scripts/context/stubs/unix/mtxtools \ - texmf-dist/scripts/context/stubs/unix/pdftools \ - texmf-dist/scripts/context/stubs/unix/pdftrimwhite \ - texmf-dist/scripts/context/stubs/unix/pstopdf \ - texmf-dist/scripts/context/stubs/unix/rlxtools \ - texmf-dist/scripts/context/stubs/unix/runtools \ - texmf-dist/scripts/context/stubs/unix/texexec \ - texmf-dist/scripts/context/stubs/unix/texfind \ - texmf-dist/scripts/context/stubs/unix/texfont \ - texmf-dist/scripts/context/stubs/unix/texshow \ - texmf-dist/scripts/context/stubs/unix/textools \ - texmf-dist/scripts/context/stubs/unix/texutil \ - texmf-dist/scripts/context/stubs/unix/tmftools \ - texmf-dist/scripts/context/stubs/unix/xmltools \ - -manpgs = getnonfreefonts getnonfreefonts-sys - -all: -default: all - -install: install-data install-exec - -# Auxiliary files. -install-data:: - for p in $(manpgs); do \ - $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \ - done - -# The idea is to install the scripts themselves in texmf*/scripts, and -# have bin/arch/foo be a symlink to, say, -# ../../texmf/scripts/foo/foo.pl. That way we save a bit of disk space, -# but more importantly omit duplication, and most importantly make it -# possible to invoke the same Perl script on Windows (via -# tl-w32-wrapper.texlua). -# -# The installation into texmf*/scripts is ideally done with ctan2tl. -# The copy of the texlua wrapper for Windows is also done by hand, but -# could/should also be done by ctan2tl. The check-wrapper-consistency -# script at least checks after the fact for problems. -# -# We also keep a copy of all the scripts here, in the linked_scripts -# subdirectory, and install from there into the runtime. This is purely -# for other distro builders, so symlinks are not dangling in the -# inst/bin dir (it is meaningless in native TL). We have not yet -# written the auto-update to ensure linked_scripts is actually up to -# date with the masters in Master/texmf*/script, but it will happen. -# -# By the way, $(scriptdir) here is the binary directory, e.g., -# bin/i386-linux, not the texmf*/scripts dir. -# -install-exec: - -$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir) -# - link to the basename, removing any extension, of the source. -# - we downcase for the sake of TeXcount.pl -> texcount. -# - the purpose of the case..esac is to support both multiplatform and -# non-multiplatform builds. - for s in $(LINKED_SCRIPTS); do \ - target=$(scriptdir)/`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \ - target=$$target; \ - rm -f $$target; \ - case "$(scriptdir)" in \ - */bin) d=..;; \ - */bin/*) d=../..;; \ - *) echo "$(scriptdir): strange directory for linked scripts" >&2;\ - exit 1;; \ - esac; \ - $(SHELL) $(srcdir)/../mkinstalldirs $(prefix)/`dirname $$s`; \ - $(INSTALL_SCRIPT) $(srcdir)/linked_scripts/`basename $$s` $(prefix)/$$s; \ - ln -s $$d/$$s $$target; \ - done -# -# one -sys variant we don't want to program. - rm -f $(scriptdir)/getnonfreefonts-sys - ln -s getnonfreefonts $(scriptdir)/getnonfreefonts-sys -# -# man dir link for those mans which can use it. - rm -f $(scriptdir)/man - ln -s ../../texmf/doc/man $(scriptdir)/man - -kpse_include ../make/clean.mk - -config.status: $(srcdir)/configure - $(SHELL) $(srcdir)/configure --no-create --verbose - -Makefile: $(srcdir)/Makefile.in config.status - $(SHELL) config.status - -depend: -check: diff --git a/Build/source/texk/texlive/configure.in.orig b/Build/source/texk/texlive/configure.in.orig deleted file mode 100644 index 15409c4ea40..00000000000 --- a/Build/source/texk/texlive/configure.in.orig +++ /dev/null @@ -1,11 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. - -AC_INIT(hugetex) -AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto]) - -AC_PROG_MAKE_SET - -sinclude(../kpathsea/common.ac) - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT 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 diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 6d61844e467..7f66194032c 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,7 @@ +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + * ac/web2c.ac, configure.ac: Remove --enable-fmtutil option. + 2009-05-05 Peter Breitenlohner <peb@mppmu.mpg.de> * texmfmp.h: remove references to pdfeTeX. diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac index e024927493b..c387810e650 100644 --- a/Build/source/texk/web2c/ac/web2c.ac +++ b/Build/source/texk/web2c/ac/web2c.ac @@ -16,14 +16,10 @@ AC_ARG_ENABLE([dump-share], [AS_HELP_STRING([--disable-dump-share], [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], - 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], []], @@ -42,12 +38,12 @@ AC_ARG_ENABLE([mf], [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], + [AS_HELP_STRING([--disable-mf-nowin], + [do not build a separate non-windows-capable METAFONT], kpse_indent_26+2)])[]dnl AC_ARG_WITH([mf-x-toolkit], - [AS_HELP_STRING([--with-mf-x-toolkit], - [Use X toolkit for METAFONT])])[]dnl + [AS_HELP_STRING([--without-mf-x-toolkit], + [do not use X toolkit for METAFONT])])[]dnl m4_define([kpse_mf_win], [dnl [[epsf], [EPSF], [EPSF pseudo]], [[hp2627], [HP2627], [HP 2627]], diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 24ea78626d3..2bd844b3a0c 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -899,8 +899,6 @@ MINGW32_FALSE MINGW32_TRUE WIN32_FALSE WIN32_TRUE -FMU_FALSE -FMU_TRUE CXX_HACK_LIBS CXX_HACK_DEPS CXXLD @@ -1035,7 +1033,6 @@ enable_cxx_runtime_hack with_editor enable_auto_core enable_dump_share -enable_fmtutil enable_ipc enable_tex enable_etex @@ -1739,8 +1736,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-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 @@ -1748,7 +1744,7 @@ 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 @@ -1767,7 +1763,7 @@ Optional Packages: both] --with-gnu-ld assume the C compiler uses GNU ld [default=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-fontconfig=DIR use fontconfig include/library files from DIR --with-x use the X Window System --with-system-kpathsea use installed kpathsea headers and library @@ -4406,13 +4402,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:4409: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4405: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4412: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4408: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4415: output\"" >&5) + (eval echo "\"\$as_me:4411: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5618,7 +5614,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5621 "configure"' > conftest.$ac_ext + echo '#line 5617 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7665,11 +7661,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:7668: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7664: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7672: \$? = $ac_status" >&5 + echo "$as_me:7668: \$? = $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. @@ -8004,11 +8000,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:8007: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8003: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8011: \$? = $ac_status" >&5 + echo "$as_me:8007: \$? = $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. @@ -8109,11 +8105,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:8112: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8108: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8116: \$? = $ac_status" >&5 + echo "$as_me:8112: \$? = $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 @@ -8164,11 +8160,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:8167: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8163: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8171: \$? = $ac_status" >&5 + echo "$as_me:8167: \$? = $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 @@ -10964,7 +10960,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10967 "configure" +#line 10963 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11060,7 +11056,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11063 "configure" +#line 11059 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16076,11 +16072,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:16079: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16075: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16083: \$? = $ac_status" >&5 + echo "$as_me:16079: \$? = $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. @@ -16175,11 +16171,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:16178: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16174: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16182: \$? = $ac_status" >&5 + echo "$as_me:16178: \$? = $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 @@ -16227,11 +16223,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:16230: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16226: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16234: \$? = $ac_status" >&5 + echo "$as_me:16230: \$? = $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 @@ -17491,10 +17487,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 @@ -17734,13 +17726,10 @@ _ACEOF fi - if test "x$enable_fmtutil" = xyes; then - FMU_TRUE= - FMU_FALSE='#' -else - FMU_TRUE='#' - FMU_FALSE= -fi +case $enable_ipc in + yes|no) : ;; + *) enable_ipc=yes ;; +esac { $as_echo "$as_me:$LINENO: checking for native WIN32 or MINGW32" >&5 @@ -18536,7 +18525,7 @@ else MF_FALSE= fi - if test "x$enable_mf_nowin" = xyes; then + if test "x$enable_mf_nowin" != xno; then MFN_TRUE= MFN_FALSE='#' else @@ -18547,17 +18536,17 @@ fi # Handle --with-mf-x-toolkit and --with-x case $with_mf_x_toolkit in - ''|yes|no) : ;; + yes|no) : ;; ''|y|ye) with_mf_x_toolkit=yes ;; n) with_mf_x_toolkit=no ;; *) { $as_echo "$as_me:$LINENO: WARNING: unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using yes." >&5 $as_echo "$as_me: WARNING: unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using yes." >&2;} - with_mf_x_toolkit=yes ;; + with_mf_x_toolkit=yes ;; esac test "x$with_x_toolkit" = xyes && with_x=yes test "x$with_x" = xno && with_x_toolkit=no -: ${with_x=no} # tell PATH_XTRA no X by default, if not specified. +: ${with_x=yes} # tell PATH_XTRA to use X by default, if not specified. # Distinguish no X at all, no toolkit, or toolkit. { $as_echo "$as_me:$LINENO: checking for X" >&5 @@ -24597,13 +24586,6 @@ $as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${FMU_TRUE}" && test -z "${FMU_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"FMU\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"FMU\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"WIN32\" was never defined. Usually this means the macro was only invoked conditionally." >&5 diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 9b7358e9b08..2556a517803 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -46,7 +46,8 @@ m4_include([ac/web2c.ac]) KPSE_ASM_UNDERSCORE -AS_CASE([$with_editor], [''|yes|no], [with_editor='vi +%d %s']) +AS_CASE([$with_editor], + [''|yes|no], [with_editor='vi +%d %s']) AC_DEFINE_UNQUOTED([EDITOR], ["$with_editor"], [web2c: Default editor for interactive `e' option.]) @@ -59,7 +60,9 @@ AS_IF([test "x$enable_dump_share" = xno], [web2c: Define to disable architecture-independent dump files. Faster on LittleEndian architectures.])]) -AM_CONDITIONAL([FMU], [test "x$enable_fmtutil" = xyes]) +AS_CASE([$enable_ipc], + [yes|no], [], + [enable_ipc=yes]) KPSE_CHECK_WIN32 AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno]) @@ -75,7 +78,7 @@ AS_IF([test "x$enable_luatex:$enable_ipc" != xno:no], AS_IF([test "x$enable_ipc" = xyes], [AC_MSG_WARN([no socket library: disabling ipc]) enable_ipc=no])], - [socketlibs=$ac_cv_search_connect])]) + [socketlibs=$ac_cv_search_connect])]) if test "x$enable_ipc" = xyes; then ipc_socketlibs=$socketlibs AC_DEFINE([IPC], 1, [tex: Define to enable --ipc.]) @@ -94,13 +97,13 @@ if test "x$kpse_cv_have_win32" = xno; then [no], [AS_IF([test "x$enable_luatex" = xyes], [AC_MSG_WARN([Sorry, no gethostbyname(): can not build luaTeX]) enable_luatex=no])], - [lua_socketlibs="$lua_socketlibs $ac_cv_search_gethostbyname"]) + [lua_socketlibs="$lua_socketlibs $ac_cv_search_gethostbyname"]) AS_CASE([$ac_cv_search_nanosleep], ["none required"], [], [no], [AS_IF([test "x$enable_luatex" = xyes], [AC_MSG_WARN([Sorry, no nanosleep(): can not build luaTeX]) enable_luatex=no])], - [lua_socketlibs="$lua_socketlibs $ac_cv_search_nanosleep"]) + [lua_socketlibs="$lua_socketlibs $ac_cv_search_nanosleep"]) fi AC_SUBST([lua_socketlibs]) AC_SUBST([ipc_socketlibs]) @@ -128,18 +131,18 @@ AM_CONDITIONAL([OTANGLE], AM_CONDITIONAL([OMFONTS], [true]) AM_CONDITIONAL([MF], [test "x$enable_mf" != xno]) -AM_CONDITIONAL([MFN], [test "x$enable_mf_nowin" = xyes]) +AM_CONDITIONAL([MFN], [test "x$enable_mf_nowin" != xno]) # Handle --with-mf-x-toolkit and --with-x AS_CASE([$with_mf_x_toolkit], - [''|yes|no], , - [''|y|ye], [with_mf_x_toolkit=yes], - [n], [with_mf_x_toolkit=no], - [AC_MSG_WARN([unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using yes.]) - with_mf_x_toolkit=yes]) + [yes|no], [], + [''|y|ye], [with_mf_x_toolkit=yes], + [n], [with_mf_x_toolkit=no], + [AC_MSG_WARN([unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using yes.]) + with_mf_x_toolkit=yes]) test "x$with_x_toolkit" = xyes && with_x=yes test "x$with_x" = xno && with_x_toolkit=no -: ${with_x=no} # tell PATH_XTRA no X by default, if not specified. +: ${with_x=yes} # tell PATH_XTRA to use X by default, if not specified. # Distinguish no X at all, no toolkit, or toolkit. AC_PATH_XTRA |