summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-27 09:46:39 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-27 09:46:39 +0000
commit548c801baf05f4a158b42c8de28378a2a44bfa89 (patch)
treee2ee4779c72604a8838da3a8c6fe2e3774db0a20 /Build/source
parente4da8ade35c41f81e0f39a6fb40af0e50d1e0c8b (diff)
change ipc default to enabled, remove obsolete files
git-svn-id: svn://tug.org/texlive/trunk@13492 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/Makefile.in.orig146
-rwxr-xr-xBuild/source/configure43
-rw-r--r--Build/source/configure.in.orig287
-rwxr-xr-xBuild/source/libs/configure3
-rw-r--r--Build/source/tetex.ac81
-rwxr-xr-xBuild/source/texk/configure3
-rw-r--r--Build/source/texk/detex/ChangeLog4
-rw-r--r--Build/source/texk/devnag/ChangeLog4
-rw-r--r--Build/source/texk/dtl/ChangeLog4
-rw-r--r--Build/source/texk/dvi2tty/ChangeLog4
-rw-r--r--Build/source/texk/dvidvi/ChangeLog4
-rw-r--r--Build/source/texk/dvipdfmx/ChangeLog.TL4
-rw-r--r--Build/source/texk/dvipdfmx/Makefile.am8
-rw-r--r--Build/source/texk/dvipdfmx/Makefile.am.orig6
-rw-r--r--Build/source/texk/dvipdfmx/Makefile.in2
-rw-r--r--Build/source/texk/dvipdfmx/configure.in.orig149
-rw-r--r--Build/source/texk/dvipdfmx/src/Makefile.am4
-rw-r--r--Build/source/texk/dvipdfmx/src/Makefile.am.orig43
-rw-r--r--Build/source/texk/dvipdfmx/src/Makefile.in1
-rw-r--r--Build/source/texk/dvipos/ChangeLog4
-rw-r--r--Build/source/texk/kpathsea/configure.in.orig73
-rw-r--r--Build/source/texk/seetexk/ChangeLog4
-rw-r--r--Build/source/texk/ttfdump/ChangeLog4
-rw-r--r--Build/source/texk/ttfdump/Makefile.am10
-rw-r--r--Build/source/texk/ttfdump/Makefile.in5
-rw-r--r--Build/source/texk/ttfdump/Makefile.in.orig148
-rw-r--r--Build/source/texk/ttfdump/configure.in.orig31
-rw-r--r--Build/source/texk/ttfdump/libttf/Makefile.in103
-rw-r--r--Build/source/texk/ttfdump/src/Makefile.in115
-rw-r--r--Build/source/texk/web2c/ChangeLog4
-rw-r--r--Build/source/texk/web2c/ac/web2c.ac4
-rwxr-xr-xBuild/source/texk/web2c/configure4
-rw-r--r--Build/source/texk/web2c/configure.ac2
-rw-r--r--Build/source/texk/web2c/kpathsea.mk7
-rw-r--r--Build/source/texk/web2c/withenable.ac175
-rw-r--r--Build/source/texk/xdv2pdf/ChangeLog4
-rw-r--r--Build/source/texk/xdv2pdf/Makefile.am12
-rw-r--r--Build/source/texk/xdv2pdf/Makefile.in3
-rw-r--r--Build/source/texk/xdv2pdf/Makefile.in.orig80
-rw-r--r--Build/source/texk/xdv2pdf/acconfig.h.dist37
-rw-r--r--Build/source/texk/xdv2pdf/acconfig.h.in45
-rw-r--r--Build/source/texk/xdv2pdf/configure.in.orig66
-rw-r--r--Build/source/texk/xdvik/Makefile.in.orig243
-rw-r--r--Build/source/texk/xdvik/configure.in.orig311
-rw-r--r--Build/source/texk/xdvik/kpathsea.ac.orig58
-rw-r--r--Build/source/texk/xdvipdfmx/ChangeLog.TL4
-rw-r--r--Build/source/texk/xdvipdfmx/Makefile.am8
-rw-r--r--Build/source/texk/xdvipdfmx/Makefile.am.orig5
-rw-r--r--Build/source/texk/xdvipdfmx/Makefile.in15
-rw-r--r--Build/source/texk/xdvipdfmx/configure.in.orig181
-rwxr-xr-xBuild/source/utils/configure3
51 files changed, 116 insertions, 2452 deletions
diff --git a/Build/source/Makefile.in.orig b/Build/source/Makefile.in.orig
deleted file mode 100644
index 9b8886dc1c2..00000000000
--- a/Build/source/Makefile.in.orig
+++ /dev/null
@@ -1,146 +0,0 @@
-# $Id$
-# @configure_input@
-# Makefile for teTeX distribution, also used for TeX Live.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-srcdir = @srcdir@
-VPATH = $(srcdir)
-
-SHELL = /bin/sh
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-scriptdir = $(bindir)
-texmf = @texmfmain@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_DATA = @INSTALL_DATA@
-
-NCURSESDIR=libs/ncurses
-ZLIBDIR=libs/zlib
-LIBPNGDIR=libs/libpng
-LIBT1DIR=libs/t1lib
-LIBTYPE1DIR=$(LIBT1DIR)/../type1
-LIBXPDFDIR=libs/xpdf
-GDDIR=libs/gd
-FREETYPEDIR=libs/freetype
-FREETYPE2DIR=libs/freetype2
-ICUDIR=libs/icu-xetex
-TECKITDIR=libs/teckit
-LIBOBSDCOMPATDIR=libs/obsdcompat
-GRAPHITEDIR=libs/graphite-engine
-
-# Subdirectories that have makefiles
-ESUBDIRS = @ESUBDIRS@ texk
-LIBSDIRS = @LIBSDIRS@
-
-# Subdirectories for which we want to run make (un)install; these are
-# different for xdvik standalone distribution where we don't want to
-# install kpathsea and friends by default.
-INSTDIRS = @INSTDIRS@
-
-default: all
-install install-exec install-data uninstall: all
- for dir in $(INSTDIRS); do \
- echo making $@ in $$dir; \
- (cd $$dir && $(MAKE) $@) || exit 1; \
- done
-# only do this at make install, because the binaries won't be there with
-# just install-data, and fmtutil.cnf won't be there with just install-exec.
- if test "$@" = install; then \
- echo "top-level make $@: running texlinks ..."; \
- cd texk/tetex && $(MAKE) run-texlinks; \
- fi
-
-strip: install
- cd $(bindir) && strip * >/dev/null 2>&1 || true
-
-check:
- cd texk; TEXMF='{$(texmf),$(texmf)-dist}' TEXMFCNF=$(texmf)/web2c $(MAKE) $@
-
-Makefile: Makefile.in config.status
- $(SHELL) ./config.status
-
-all clean mostlyclean:
- esubdirs="$(LIBSDIRS) $(ESUBDIRS)"; \
- for dir in $$esubdirs; do \
- echo making $@ in $$dir; \
- (if test -f $$dir/Makefile; then cd $$dir && $(MAKE) $@; else true; fi) || exit 1; \
- done
- @echo "make $@ done."
-
-# to build libraries only, when working on drivers.
-lib: @LIBSDEP@
-
-distclean: clean
- cleandirs="$(LIBSDIRS) $(ESUBDIRS)"; \
- for dir in $$cleandirs; do \
- echo making $@ in $$dir; \
- (if test -f $$dir/Makefile; then cd $$dir && $(MAKE) $@; else true; fi) || exit 1; \
- done
- rm -f Makefile *.status *.cache *.log dialogconfig.h TAGS
- rm -f libs/config.log libs/config.status libs/config.cache
-realclean: distclean
-
-tags TAGS:
- rm -f TAGS
- find . -name '*.[ch]' -print | xargs etags --append -o TAGS
-
-#
-# This is the default target for the Build script in TeX Live.
-world: strip
- @echo "make $@ done."
-
-pdftex pdfetex:
- cd texk/web2c && $(MAKE) $@
- test -f texk/web2c/pdftex && ls -l texk/web2c/pdftex
- test -f texk/web2c/pdfetex && ls -l texk/web2c/pdfetex
-
-$(NCURSESDIR)/lib/libncurses.a:
- cd $(NCURSESDIR); $(MAKE)
-$(ZLIBDIR)/libz.a:
- cd $(ZLIBDIR); $(MAKE) libz.a
-$(LIBPNGDIR)/libpng.a:
- cd $(LIBPNGDIR); $(MAKE) libpng.a
-$(LIBT1DIR)/libt1.a:
- cd $(LIBT1DIR); $(MAKE) libt1.a
-$(LIBTYPE1DIR)/libtype1.a:
- cd $(LIBTYPE1DIR); $(MAKE) libtype1.a
-$(LIBXPDFDIR)/xpdf/libxpdf.a:
- cd $(LIBXPDFDIR)/xpdf; $(MAKE) libxpdf.a
-$(LIBXPDFDIR)/goo/libGoo.a:
- cd $(LIBXPDFDIR)/goo; $(MAKE) libGoo.a
-$(LIBXPDFDIR)/fofi/libfofi.a:
- cd $(LIBXPDFDIR)/fofi; $(MAKE) libfofi.a
-$(GDDIR)/libgd.a:
- cd $(GDDIR); $(MAKE) libgd.a
-$(FREETYPEDIR)/lib/.libs/libttf.a:
- cd $(FREETYPEDIR); $(MAKE)
-$(FREETYPE2DIR)/.libs/libfreetype.a:
- cd $(FREETYPE2DIR); $(MAKE)
-$(ICUDIR)/lib/libsicuuc.a $(ICUDIR)/lib/libsicule.a $(ICUDIR)/lib/libsicudata.a:
- cd $(ICUDIR); $(MAKE)
-$(TECKITDIR)/lib/.libs/libTECkit.a:
- cd $(TECKITDIR); $(MAKE)
-$(LIBOBSDCOMPATDIR)/libopenbsd-compat.a:
- cd $(LIBOBSDCOMPATDIR); $(MAKE) libopenbsd-compat.a
-$(GRAPHITEDIR)/src/.libs/libgraphite.a:
- cd $(GRAPHITEDIR); $(MAKE)
-
-# Prevent GNU make v3 from overflowing arg limit on SysV.
-.NOEXPORT:
diff --git a/Build/source/configure b/Build/source/configure
index 7fd6b3bdfa6..60741de11b4 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -1714,7 +1714,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-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
@@ -6155,13 +6156,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:6158: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:6159: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:6161: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:6162: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:6164: output\"" >&5)
+ (eval echo "\"\$as_me:6165: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -7367,7 +7368,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7370 "configure"' > conftest.$ac_ext
+ echo '#line 7371 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9313,11 +9314,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:9316: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9317: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9320: \$? = $ac_status" >&5
+ echo "$as_me:9321: \$? = $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.
@@ -9652,11 +9653,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:9655: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9656: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9659: \$? = $ac_status" >&5
+ echo "$as_me:9660: \$? = $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.
@@ -9757,11 +9758,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:9760: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9761: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9764: \$? = $ac_status" >&5
+ echo "$as_me:9765: \$? = $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
@@ -9812,11 +9813,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:9815: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9816: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9819: \$? = $ac_status" >&5
+ echo "$as_me:9820: \$? = $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
@@ -12612,7 +12613,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12615 "configure"
+#line 12616 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12708,7 +12709,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12711 "configure"
+#line 12712 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19142,11 +19143,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:19145: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19146: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19149: \$? = $ac_status" >&5
+ echo "$as_me:19150: \$? = $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.
@@ -19241,11 +19242,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:19244: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19245: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19248: \$? = $ac_status" >&5
+ echo "$as_me:19249: \$? = $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
@@ -19293,11 +19294,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:19296: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19297: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19300: \$? = $ac_status" >&5
+ echo "$as_me:19301: \$? = $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
diff --git a/Build/source/configure.in.orig b/Build/source/configure.in.orig
deleted file mode 100644
index 35e69aaf613..00000000000
--- a/Build/source/configure.in.orig
+++ /dev/null
@@ -1,287 +0,0 @@
-dnl Top-level configure for TeX Live build. Public domain.
-
-AC_INIT(texk/make/common.mk)
-
-AC_CONFIG_AUX_DIR(config)
-AC_PROG_MAKE_SET
-AC_PROG_CC
-AC_PROG_CXX
-
-AC_PROG_LEX
-case $LEX in
- lex)
- OLDIFS=$IFS; IFS=:
- foundLEX=false
- for p in $PATH; do
- if test -f "$p/lex"; then
- foundLEX=true
- break
- fi
- done
- IFS=$OLDIFS
- ;;
-esac
-if $foundLEX; then :; else
- AC_MSG_ERROR(no working lexical scanner (lex/flex) found)
-fi
-
-AC_PROG_YACC
-case $YACC in
- yacc)
- OLDIFS=$IFS; IFS=:
- foundYACC=false
- for p in $PATH; do
- if test -f "$p/yacc"; then
- foundYACC=true
- break
- fi
- done
- IFS=$OLDIFS
- ;;
-esac
-if $foundYACC; then :; else
- AC_MSG_ERROR(no working parser generator (yacc/bison) found)
-fi
-
-AC_CANONICAL_SYSTEM
-
-dnl Various compiler directives
-AC_MSG_CHECKING(whether to define additional compiler specific flags)
-case "$target" in
- alpha*-dec*)
- if test "$CC" = "cc"; then
- CFLAGS="$CFLAGS -Olimit 1000 -std1"; export CFLAGS
- AC_MSG_WARN(Digital Unix's cc)
- fi
- ;;
- hp*hpux*)
- if test "$CC" = "cc"; then
- CFLAGS="$CFLAGS -Aa +e -D_HPUX_SOURCE"; export CFLAGS
- AC_MSG_WARN(HP-UX's cc)
- fi
- ;;
- *-darwin*)
- : ${INSTALL='/usr/bin/install -c -p'}; export INSTALL
- : ${NCURSES_CPP_FIX=true}; export NCURSES_CPP_FIX
- AC_MSG_RESULT([no, but using other fixes for Darwin])
- ;;
- *)
- AC_MSG_RESULT(no)
- ;;
-esac
-
-dnl We check this here, because otherwise some worse check (from ncurses?)
-dnl is used instead for the cached value.
-AC_HEADER_SYS_WAIT
-
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_PROG_LN_S
-AC_FUNC_ALLOCA
-AC_PROG_RANLIB
-AC_PATH_X
-
-dnl These are included for compilation with either teTeX or standalone xdvik
-dnl (tetex will only provide tetex.ac, xdvik only xdvik.ac)
-sinclude(tetex.ac)
-sinclude(texlive.ac)
-sinclude(xdvik.ac)
-sinclude(withenable.ac)
-sinclude(utils/dialog/withenable.ac)
-sinclude(texk/withenable.ac)
-sinclude(texk/kpathsea/xt.ac)
-sinclude(texk/kpathsea/withenable.ac)
-sinclude(texk/web2c/withenable.ac)
-sinclude(texk/web2c/xetexdir/withenable.ac)
-sinclude(texk/xdvik/withenable.ac)
-sinclude(libs/ncurses/withenable.ac)
-sinclude(libs/zlib/withenable.ac)
-sinclude(libs/libpng/withenable.ac)
-sinclude(libs/t1lib/withenable.ac)
-sinclude(libs/freetype/withenable.ac)
-sinclude(libs/freetype2/withenable.ac)
-sinclude(libs/gd/withenable.ac)
-sinclude(libs/icu-xetex/withenable.ac)
-sinclude(libs/teckit/withenable.ac)
-sinclude(libs/graphite-engine/withenable.ac)
-
-NCURSESDIR=libs/ncurses
-LIBT1DIR=libs/t1lib
-LIBTYPE1DIR=libs/type1
-LIBPNGDIR=libs/libpng
-ZLIBDIR=libs/zlib
-LIBXPDFDIR=libs/xpdf
-FREETYPEDIR=libs/freetype
-FREETYPE2DIR=libs/freetype2
-ICUDIR=libs/icu-xetex
-GRAPHITEDIR=libs/graphite-engine
-TECKITDIR=libs/teckit
-GDDIR=libs/gd
-LIBOBSDCOMPATDIR=libs/obsdcompat
-
-test "$no_x" = yes && { with_xdvik=no; with_oxdvik=no; }
-export with_xdvik with_oxdvik
-
-# we need libt1 for dvipng, xdvik, oxdvik
-test ! -d $srcdir/$LIBT1DIR && : ${needs_libt1=no}
-test "$with_dvipng" != no && : ${needs_libt1=yes}
-test "$with_xdvik" != no && : ${needs_libt1=yes}
-test "$with_oxdvik" != no && : ${needs_libt1=yes}
-: ${needs_libt1=no}
-export needs_libt1
-
-# we need ncurses for dialog
-test ! -d $srcdir/$NCURSESDIR && : ${needs_ncurses=no}
-test "$with_dialog" != no && : ${needs_ncurses=yes}
-: ${needs_ncurses=no}
-export needs_ncurses
-
-# we need pnglib for dvipng, pdf[ex]tex, xetex, dvipdfm, dvipdfmx, xdvipdfmx
-test ! -d $srcdir/$LIBPNGDIR && : ${needs_pnglib=no}
-test "$with_dvipng" != no && : ${needs_pnglib=yes}
-test "$with_pdftex" != no && : ${needs_pnglib=yes}
-test "$with_pdfetex" != no && : ${needs_pnglib=yes}
-test "$with_xetex" != no && : ${needs_pnglib=yes}
-test "$with_dvipdfm" != no && : ${needs_pnglib=yes}
-test "$with_dvipdfmx" != no && : ${needs_pnglib=yes}
-test "$with_xdvipdfmx" != no && : ${needs_pnglib=yes}
-: ${needs_pnglib=no}
-export needs_pnglib
-
-# we need zlib for dvipng, pdf[ex]tex, xetex, dvipdfm, etc.
-test ! -d $srcdir/$ZLIBDIR && : ${needs_zlib=no}
-test "$with_dvipng" != no && : ${needs_zlib=yes}
-test "$with_pdftex" != no && : ${needs_zlib=yes}
-test "$with_pdfetex" != no && : ${needs_zlib=yes}
-test "$with_xetex" != no && : ${needs_zlib=yes}
-test "$with_dvipdfm" != no && : ${needs_zlib=yes}
-test "$with_dvipdfmx" != no && : ${needs_zlib=yes}
-test "$with_xdvipdfmx" != no && : ${needs_zlib=yes}
-: ${needs_zlib=no}
-export needs_zlib
-
-# we need libxpdf for pdf[ex]tex, xetex
-test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
-test "$with_pdftex" != no && : ${needs_libxpdf=yes}
-test "$with_pdfetex" != no && : ${needs_libxpdf=yes}
-test "$with_xetex" != no && : ${needs_libxpdf=yes}
-: ${needs_libxpdf=no}
-export needs_libxpdf
-
-# we need libobsdcompat for pdftex
-test ! -d $srcdir/$LIBOBSDCOMPATDIR && : ${needs_obsdcompat=no}
-test "$with_pdftex" != no && : ${needs_obsdcompat=yes}
-test "$with_pdfetex" != no && : ${needs_obsdcompat=yes}
-: ${needs_obsdcompat=no}
-export needs_obsdcompat
-
-# we need gd for dvipng
-test ! -d $srcdir/$GDDIR && : ${needs_gd=no}
-test "$with_dvipng" != no && : ${needs_gd=yes}
-: ${needs_gd=no}
-export needs_gd
-
-# we need freetype for ttf2pk
-test ! -d $srcdir/$FREETYPEDIR && : ${needs_freetype=no}
-test ! -d $srcdir/texk/ttf2pk && : ${needs_freetype=no}
-test "$with_ttf2pk" = no && : ${needs_freetype=no}
-: ${needs_freetype=yes}
-export needs_freetype
-
-# we need freetype2 for xetex, xdvipdfmx, dvipng
-test ! -d $srcdir/$FREETYPE2DIR && : ${needs_freetype2=no}
-test "$with_xetex" != no && : ${needs_freetype2=yes}
-test "$with_xdvipdfmx" != no && : ${needs_freetype2=yes}
-test "$with_dvipng" != no && : ${needs_freetype2=yes}
-: ${needs_freetype2=no}
-export needs_freetype2
-
-# we need icu for xetex
-test ! -d $srcdir/$ICUDIR && : ${needs_icu=no}
-test "$with_xetex" != no && : ${needs_icu=yes}
-: ${needs_icu=no}
-export needs_icu
-
-# we need graphite for xetex, unless specifically disabled
-test ! -d $srcdir/$GRAPHITEDIR && : ${needs_graphite=no}
-test "$with_graphite" = no && : ${needs_graphite=no}
-test "$with_xetex" != no && : ${needs_graphite=yes}
-: ${needs_graphite=no}
-export needs_graphite
-
-# we need teckit for xetex
-test ! -d $srcdir/$TECKITDIR && : ${needs_teckit=no}
-test "$with_xetex" != no && : ${needs_teckit=yes}
-: ${needs_teckit=no}
-export needs_teckit
-
-dnl We cannot use variables (e.g. $LIBPNGDIR) for sinclude, so...
-sinclude(libs/ncurses/ncurses.ac)
-sinclude(libs/zlib/zlib.ac)
-sinclude(libs/libpng/libpng.ac)
-sinclude(libs/xpdf/libxpdf.ac)
-sinclude(libs/t1lib/t1lib.ac)
-sinclude(libs/freetype/freetype.ac)
-sinclude(libs/freetype2/freetype2.ac)
-sinclude(libs/gd/gd.ac)
-sinclude(libs/icu-xetex/icu-xetex.ac)
-sinclude(libs/graphite-engine/graphite-engine.ac)
-sinclude(libs/teckit/teckit.ac)
-sinclude(libs/obsdcompat/libobsd-compat.ac)
-
-LIBSDEP="$CURSESDEP $ZLIBDEP $LIBPNGDEP $LIBXPDFDEP $LIBT1DEP $GDDEP $FREETYPEDEP $FREETYPE2DEP $ICUDEP $GRAPHITEDEP $TECKITDEP $LIBOBSDDEP"
-
-LIBSDIRS=
-test "$needs_ncurses" = yes && test "$using_system_ncurses" != yes \
- && LIBSDIRS="$LIBSDIRS $NCURSESDIR"
-test "$needs_zlib" = yes && test "$using_system_zlib" != yes \
- && LIBSDIRS="$LIBSDIRS $ZLIBDIR"
-test "$needs_pnglib" = yes && test "$using_system_pnglib" != yes \
- && LIBSDIRS="$LIBSDIRS $LIBPNGDIR"
-test "$needs_libxpdf" = yes \
- && LIBSDIRS="$LIBSDIRS $LIBXPDFDIR"
-test "$needs_libt1" = yes && test "$using_system_t1lib" != yes \
- && LIBSDIRS="$LIBSDIRS $LIBT1DIR $LIBTYPE1DIR"
-test "$needs_freetype" = yes && test "$using_system_freetype" != yes \
- && LIBSDIRS="$LIBSDIRS $FREETYPEDIR"
-test "$needs_freetype2" = yes && test "$using_system_freetype2" != yes \
- && LIBSDIRS="$LIBSDIRS $FREETYPE2DIR"
-test "$needs_gd" = yes && test "$using_system_gd" != yes \
- && LIBSDIRS="$LIBSDIRS $GDDIR"
-test "$needs_icu" = yes && test "$using_system_icu" != yes \
- && LIBSDIRS="$LIBSDIRS $ICUDIR"
-test "$needs_teckit" = yes \
- && LIBSDIRS="$LIBSDIRS $TECKITDIR"
-test "$needs_graphite" = yes \
- && LIBSDIRS="$LIBSDIRS $GRAPHITEDIR"
-test "$needs_obsdcompat" = yes \
- && LIBSDIRS="$LIBSDIRS $LIBOBSDCOMPATDIR"
-
-dnl required subdir
-AC_CONFIG_SUBDIRS([libs])
-
-dnl optional subdirs in utils/ => ESUBDIRS
-KPSE_CONFIG_SUBDIRS(kpse_utils_pkglist, [utils])
-
-AC_SUBST(LIBSDEP)
-AC_SUBST(LIBSDIRS)
-
-# initialize texmf tree with fmtutil only for teTeX and TeX Live
-if test ! -d $srcdir/texk/tetex || test -n "$xdvik_standalone" || test "x$cross_compiling" = xyes; then
- FMU=
-else
- FMU='# '
-fi
-AC_SUBST(FMU)
-
-# more customizations for standalone xdvik
-if test -z "$xdvik_standalone"; then
- INSTDIRS='$(ESUBDIRS)'
-else
- INSTDIRS=texk/xdvik
-fi
-AC_SUBST(INSTDIRS)
-
-AC_CONFIG_SUBDIRS([texk])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 86399c171a2..edee723770f 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -1464,7 +1464,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-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
diff --git a/Build/source/tetex.ac b/Build/source/tetex.ac
deleted file mode 100644
index 2d0316d4685..00000000000
--- a/Build/source/tetex.ac
+++ /dev/null
@@ -1,81 +0,0 @@
-# $Id$
-# tetex.ac -- public domain. Created by Thomas Esser.
-
-# e.g. for lcdf-typetools
-# With --enable-maintainer-mode, just exporting enable_tetex_build=yes
-# isn't enough: e.g., `make' => `configure --recheck'.
-# FIXME: the same should also be done for other options
-if test "x$enable_tetex_build" = x; then
- enable_tetex_build=yes
- export enable_tetex_build
- ac_configure_args="$ac_configure_args '--enable-tetex-build'"
-fi
-
-# for lcdf-typetools
-: ${with_kpathsea=yes}
-export with_kpathsea
-
-# for sam2p
-: ${enable_gif=yes}
-export enable gif
-
-# we just build pdfetex, not pdftex and not etex:
-: ${with_etex=no} ${with_pdftex=no}
-export with_etex with_pdftex
-
-: ${enable_shared=no}
-export enable_shared
-
-# teTeX uses fmtutil / mktexfmt
-: ${enable_fmtutil=yes} ${with_mktexfmt_default=yes}
-export enable_fmtutil with_mktexfmt_default
-
-: ${enable_multiplatform=yes}
-export enable_multiplatform
-if test "x$enable_multiplatform" = xyes; then
- if test "x$bindir" = 'x${exec_prefix}/bin'; then
- bindir="$bindir/$host"
- ac_configure_args="$ac_configure_args '--bindir=$bindir'"
- fi
- if test "x$libdir" = 'x${exec_prefix}/lib'; then
- libdir="$libdir/$host"
- ac_configure_args="$ac_configure_args '--libdir=$libdir'"
- fi
-fi
-
-test "${enable_nls+set}" = set || { enable_nls=no; export enable_nls; }
-
-AC_PREFIX_DEFAULT(/usr/local/teTeX)
-if test "x$prefix" = xNONE; then
- prefix=$ac_default_prefix
- ac_configure_args="$ac_configure_args --prefix=$ac_default_prefix"
-fi
-
-# teTeX enables tex-ipc by default
-enable_ipc=yes; export enable_ipc
-
-case "$target" in
- *nextstep3*|*NEXTSTEP*)
- with_xdvik=no; with_oxdvik=no
- with_nextwin=yes; with_ps=dps
- export with_xdvik with_oxdvik with_nextwin with_ps;;
-esac
-
-# teTeX uses the mf / mf-nowin split
-if test "x$no_x" != xyes; then
- : ${with_mf_nowin=yes}
- : ${with_x=yes}
- export with_mf_nowin with_x
-fi
-
-# /bin/sh on ULTRIX is too broken for ncurses' configure
-case "$build" in
- *ultrix4*)
- case "$CONFIG_SHELL" in
- /bin/sh|"")
- if test -f /bin/ksh; then
- CONFIG_SHELL=/bin/ksh; export CONFIG_SHELL
- AC_MSG_WARN(Using /bin/ksh as new CONFIG_SHELL)
- fi;;
- esac;;
-esac
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index d206404d460..a1ab02f3ca5 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -1482,7 +1482,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-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
diff --git a/Build/source/texk/detex/ChangeLog b/Build/source/texk/detex/ChangeLog
index a29cea8f6e7..e3cd4dc3010 100644
--- a/Build/source/texk/detex/ChangeLog
+++ b/Build/source/texk/detex/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Adapt to TL2009 build system.
+
2008-02-22 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.in: remove AC_DECL_YYTEXT to avoid autoconf warning.
diff --git a/Build/source/texk/devnag/ChangeLog b/Build/source/texk/devnag/ChangeLog
index e07449b1ce7..722c18f256a 100644
--- a/Build/source/texk/devnag/ChangeLog
+++ b/Build/source/texk/devnag/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Adapt to TL2009 build system.
+
2008-01-31 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.in (removed): moved ...
diff --git a/Build/source/texk/dtl/ChangeLog b/Build/source/texk/dtl/ChangeLog
index f522443e4cf..df83e827c67 100644
--- a/Build/source/texk/dtl/ChangeLog
+++ b/Build/source/texk/dtl/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-27 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/dvi2tty/ChangeLog b/Build/source/texk/dvi2tty/ChangeLog
index 87dcbd576a4..44ea7d806f8 100644
--- a/Build/source/texk/dvi2tty/ChangeLog
+++ b/Build/source/texk/dvi2tty/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-27 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.
diff --git a/Build/source/texk/dvidvi/ChangeLog b/Build/source/texk/dvidvi/ChangeLog
index 0bb51a6e9b9..eae98bf51ec 100644
--- a/Build/source/texk/dvidvi/ChangeLog
+++ b/Build/source/texk/dvidvi/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-27 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/dvipdfmx/ChangeLog.TL b/Build/source/texk/dvipdfmx/ChangeLog.TL
index fba4c767ca7..c479ac5c195 100644
--- a/Build/source/texk/dvipdfmx/ChangeLog.TL
+++ b/Build/source/texk/dvipdfmx/ChangeLog.TL
@@ -1,6 +1,10 @@
ChangeLog.TL: Changes for dvipdfmx (teTeX / TeX Live)
=====================================================
+2009-05-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Adapt to TL2009 build system.
+
2009-05-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* pdfdoc.c (pdf_doc_get_page): Avoid C99isms
diff --git a/Build/source/texk/dvipdfmx/Makefile.am b/Build/source/texk/dvipdfmx/Makefile.am
index eea486dc358..670bb1d70b8 100644
--- a/Build/source/texk/dvipdfmx/Makefile.am
+++ b/Build/source/texk/dvipdfmx/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory texk/dtl/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -5,7 +9,3 @@ SUBDIRS = data src
EXTRA_DIST = ChangeLog.TL
-## Eventually delete these files
-##
-EXTRA_DIST += Makefile.am.orig configure.in.orig
-
diff --git a/Build/source/texk/dvipdfmx/Makefile.am.orig b/Build/source/texk/dvipdfmx/Makefile.am.orig
deleted file mode 100644
index c7b1787e9f0..00000000000
--- a/Build/source/texk/dvipdfmx/Makefile.am.orig
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS = data src
-ACLOCAL_AMFLAGS = -I m4
-
-# to regenerate autofiles, run
-# aclocal -I m4 && autoconf && autoheader && automake
-# tested with autoconf 2.62 and automake 1.10.1. --karl, 21apr08.
diff --git a/Build/source/texk/dvipdfmx/Makefile.in b/Build/source/texk/dvipdfmx/Makefile.in
index ad98a955948..057a4e35e49 100644
--- a/Build/source/texk/dvipdfmx/Makefile.in
+++ b/Build/source/texk/dvipdfmx/Makefile.in
@@ -244,7 +244,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
SUBDIRS = data src
-EXTRA_DIST = ChangeLog.TL Makefile.am.orig configure.in.orig
+EXTRA_DIST = ChangeLog.TL
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/Build/source/texk/dvipdfmx/configure.in.orig b/Build/source/texk/dvipdfmx/configure.in.orig
deleted file mode 100644
index b7d3b21514f..00000000000
--- a/Build/source/texk/dvipdfmx/configure.in.orig
+++ /dev/null
@@ -1,149 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(src/dvipdfmx.c)
-AM_INIT_AUTOMAKE(dvipdfmx, 20080607)
-AM_CONFIG_HEADER(config.h)
-AM_MAINTAINER_MODE
-
-dnl Checks for programs.
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-
-AC_SYS_LARGEFILE
-AC_FUNC_FSEEKO
-
-# Building inside teTeX or TeX Live?
-AC_ARG_ENABLE(tetex-build, [ --enable-tetex-build build as part of a teTeX installation])
-
-
-dnl Check for kpathsea library. (required)
-if test "x$enable_tetex_build" = xyes; then
- # In teTeX and TeX Live, LDFLAGS is passed by texk/Makefile and
- # reserved for the user. Therefore we need another variable for the
- # loader flags to find the local kpathsea. We use dvipdfmx_LDFLAGS
- # since Automake already sets that up in the link command.
- dvipdfmx_LDFLAGS=
- AC_SUBST(dvipdfmx_LDFLAGS)
-
- if test ! -d $srcdir/../../texk/kpathsea; then
- AC_MSG_ERROR([
-=========================================
-
-You specified --enable-tetex-build, but I can't find the kpathsea
-directory. I expected it to be in $srcdir/../../texk/kpathsea.
-
-=========================================])
- fi
- CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/../../texk -I\$(top_srcdir)/../../texk"
- dvipdfmx_LDFLAGS="-L\$(top_builddir)/../../texk/kpathsea/.libs"
-
- AM_CONDITIONAL(TDS_VERSION_11, true)
- AC_DEFINE([__TDS_VERSION__], 0x200406L)
-else
- dnl Don't bother going further if we don't have kpse installed.
- AC_ARG_WITH(kpathsea,
- [ --with-kpathsea=DIR use kpathsea include/library files from DIR], [
- if test -d "$withval"; then
- CPPFLAGS="$CPPFLAGS -I$withval/include"
- LDFLAGS="$LDFLAGS -L$withval/lib"
- fi
- ], [
- if test -d "$prefix"; then
- CPPFLAGS="$CPPFLAGS -I$prefix/include"
- LDFLAGS="$LDFLAGS -L$prefix/lib"
- else
- CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include"
- LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib"
- fi
- ])
-
- AC_CHECK_LIB(kpathsea, kpse_find_file, [LIBS="-lkpathsea $LIBS"],
- AC_MSG_ERROR([kpathsea library not found
-This version of dvipdfmx requires the kpathsea library and its headers. If
-you know where it is you might try setting the LDFLAGS environment variable
-with -L pointing to the directory containing libkpathsea.a.
- ])
- )
-
- dnl Check kpathsea support for required formats and funcs.
- CHO_CHECK_KPSE_SUPPORT([dvipdfmx])
-
- dnl Check for TDS version kpathsea library supports.
- CHO_CHECK_KPSE_TDS_VERSION
-fi
-
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-AC_CHECK_HEADERS(stdint.h inttypes.h sys/types.h)
-
-dnl Checks for library functions.
-AC_FUNC_MEMCMP
-AC_CHECK_FUNCS(open close system getenv mkstemp basename)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-MAW_EXT_TIMEZONE
-MAW_TZ_HAS_TM_GMTOFF
-
-AC_C_CONST
-AC_C_INLINE
-AC_TYPE_SIZE_T
-AC_STRUCT_TM
-AC_STRUCT_TIMEZONE
-AC_C_BIGENDIAN
-
-AC_CHECK_SIZEOF(char)
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-
-
-dnl Check for additional libraries.
-if test "x$enable_tetex_build" = xyes; then
- # Get these common libraries from the sources, too.
- # Seems like it would be simpler to treat kpathsea this way too, but
- # we're just starting from what lcdf-typetools did.
- sinclude(../../libs/zlib/withenable.ac)
- sinclude(../../libs/zlib/zlib.ac)
-
- sinclude(../../libs/libpng/withenable.ac)
- sinclude(../../libs/libpng/libpng.ac)
-
- # yes, we have zlib and png.
- AC_DEFINE(HAVE_ZLIB)
- AC_DEFINE(HAVE_LIBPNG)
-
- # You must define HAVE_ZLIB_COMPRESS2 to enable '-z' option for controlling
- # zlib compression level, but zlib.ac included above does not do this test.
- # We assume zlib always has compress2() here although that's not always true.
- AC_DEFINE([HAVE_ZLIB_COMPRESS2], 1)
-
- # tetex/tex live build; this always has kpathsea, xbasename, etc.,
- # as we're building from current sources. Do this stuff at the end so
- # other configure tests don't try to link with kpathsea (which doesn't
- # exist at configure time).
- LIBS="-lkpathsea -lm $LIBS"
- AC_MSG_NOTICE([tetex build enabled, LIBS now: $LIBS])
-else
- CHO_HAS_LIBPAPER
- CHO_HAS_ZLIB
- CHO_HAS_LIBPNG
-
-dnl these variables are defined in the tetex case and used in src/Makefile.am.
-dnl just let them be empty.
- AC_SUBST(LIBPNGCPPFLAGS)
- AC_SUBST(LDLIBPNG)
- AC_SUBST(LIBPNGDEP)
- AC_SUBST(ZLIBCPPFLAGS)
- AC_SUBST(LDZLIB)
- AC_SUBST(ZLIBDEP)
- AC_SUBST(dvipdfmx_LDFLAGS)
-fi
-
-AC_CONFIG_FILES([Makefile data/Makefile src/Makefile])
-AC_OUTPUT
-
diff --git a/Build/source/texk/dvipdfmx/src/Makefile.am b/Build/source/texk/dvipdfmx/src/Makefile.am
index 341b8807f05..0a39cdfb9eb 100644
--- a/Build/source/texk/dvipdfmx/src/Makefile.am
+++ b/Build/source/texk/dvipdfmx/src/Makefile.am
@@ -52,7 +52,3 @@ uninstall-hook:
rm -f $(DESTDIR)$(bindir)/extractbb$(EXEEXT)
rm -f $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT)
-## Eventually delete these files
-##
-EXTRA_DIST = Makefile.am.orig
-
diff --git a/Build/source/texk/dvipdfmx/src/Makefile.am.orig b/Build/source/texk/dvipdfmx/src/Makefile.am.orig
deleted file mode 100644
index 61469a3205c..00000000000
--- a/Build/source/texk/dvipdfmx/src/Makefile.am.orig
+++ /dev/null
@@ -1,43 +0,0 @@
-bin_PROGRAMS = dvipdfmx
-dvipdfmx_SOURCES = agl.c bmpimage.c cff.c cff_dict.c cid.c cidtype0.c cidtype2.c \
-cmap.c cmap_read.c cmap_write.c cs_type2.c \
-dpxconf.c dpxcrypt.c dpxfile.c dpxutil.c \
-dvi.c dvipdfmx.c epdf.c error.c fontmap.c jpegimage.c mem.c mfileio.c mpost.c \
-numbers.c otl_conf.c otl_opt.c pdfcolor.c pdfdev.c pdfdoc.c pdfdraw.c pdfencoding.c \
-pdfencrypt.c pdffont.c pdfnames.c pdfobj.c pdfparse.c pdfresource.c pdfximage.c \
-pkfont.c pngimage.c pst.c pst_obj.c sfnt.c \
-spc_color.c spc_dvips.c spc_html.c spc_misc.c spc_pdfm.c spc_tpic.c spc_util.c specials.c \
-subfont.c tfm.c \
-tt_aux.c tt_cmap.c tt_glyf.c tt_gsub.c tt_post.c tt_table.c truetype.c \
-type0.c t1_char.c t1_load.c type1.c type1c.c \
-unicode.c vf.c xbb.c \
-agl.h bmpimage.h cff.h cff_dict.h cff_limits.h cff_stdstr.h cff_types.h \
-cid.h cid_basefont.h cid_p.h cidtype0.h cidtype2.h cmap.h cmap_p.h cmap_read.h cmap_write.h \
-cs_type2.h dpxconf.h dpxcrypt.h dpxutil.h dpxfile.h dvi.h dvicodes.h epdf.h error.h fontmap.h \
-jpegimage.h mem.h mfileio.h mpost.h numbers.h otl_conf.h otl_opt.h pdfcolor.h pdfdev.h \
-pdfdoc.h pdfdraw.h pdfencoding.h pdfencrypt.h pdffont.h pdflimits.h pdfnames.h pdfobj.h \
-pdfparse.h pdfresource.h pdfximage.h pkfont.h pngimage.h pst.h pst_obj.h sfnt.h \
-spc_color.h spc_dvips.h spc_html.h spc_misc.h spc_pdfm.h spc_tpic.h spc_util.h specials.h \
-subfont.h system.h tfm.h \
-tt_aux.h tt_cmap.h tt_glyf.h tt_gsub.h tt_post.h tt_table.h truetype.h \
-type0.h t1_char.h t1_load.h type1.h type1c.h \
-unicode.h vf.h xbb.h
-
-LIBPNGDIR=$(top_builddir)/../../libs/libpng
-LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
-LIBPNGDEP = @LIBPNGDEP@
-LDLIBPNG = @LDLIBPNG@
-
-ZLIBDIR=$(top_builddir)/../../libs/zlib
-ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
-ZLIBDEP = @ZLIBDEP@
-LDZLIB = @LDZLIB@
-
-dvipdfmx_CPPFLAGS = @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@
-dvipdfmx_LDADD = $(LDADD) $(LDLIBPNG) $(LDZLIB)
-dvipdfmx_DEPENDENCIES = $(ZLIBDEP) $(LIBPNGDEP)
-dvipdfmx_LDFLAGS = @dvipdfmx_LDFLAGS@
-
-install-exec-hook:
- cd $(DESTDIR)$(bindir) && rm -f ebb && $(LN_S) dvipdfmx ebb
- cd $(DESTDIR)$(bindir) && rm -f extractbb && $(LN_S) dvipdfmx extractbb
diff --git a/Build/source/texk/dvipdfmx/src/Makefile.in b/Build/source/texk/dvipdfmx/src/Makefile.in
index 42bc98da8b0..8cc0fd2b5b0 100644
--- a/Build/source/texk/dvipdfmx/src/Makefile.in
+++ b/Build/source/texk/dvipdfmx/src/Makefile.in
@@ -251,7 +251,6 @@ dvipdfmx_SOURCES = \
dvipdfmx_DEPENDENCIES = $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) $(ZLIB_DEPEND)
LDADD = $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS)
-EXTRA_DIST = Makefile.am.orig
all: all-am
.SUFFIXES:
diff --git a/Build/source/texk/dvipos/ChangeLog b/Build/source/texk/dvipos/ChangeLog
index 9f48cc4b489..dd243a3f692 100644
--- a/Build/source/texk/dvipos/ChangeLog
+++ b/Build/source/texk/dvipos/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Adapt to TL2009 build system.
+
2009-04-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* dvipos.1 (BUGS): added a missing "\fB=\fP".
diff --git a/Build/source/texk/kpathsea/configure.in.orig b/Build/source/texk/kpathsea/configure.in.orig
deleted file mode 100644
index 67c9b4b9bb2..00000000000
--- a/Build/source/texk/kpathsea/configure.in.orig
+++ /dev/null
@@ -1,73 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl
-dnl Kpathsea package version:
-dnl Starting development:
-dnl kpse_devel_version = dev;
-dnl Making releases:
-dnl kpse_micro_version += 1;
-dnl kpse_devel_version = ;
-dnl
-dnl Kpathsea shared library version:
-dnl Only bug fixes:
-dnl kpse_lib_micro += 1;
-dnl Adding new interfaces (backwards compatible)
-dnl kpse_lib_minor += 1;
-dnl kpse_lib_micro = 0;
-dnl Modifying or revoking interfaces (not backwards compatible)
-dnl kpse_lib_major += 1;
-dnl kpse_lib_minor = 0;
-dnl kpse_lib_micro = 0;
-dnl
-m4_define([kpse_major_version], [3])[]dnl
-m4_define([kpse_minor_version], [5])[]dnl
-m4_define([kpse_micro_version], [7])[]dnl
-m4_define([kpse_devel_version], [dev])[]dnl
-m4_define([kpse_version], [kpse_major_version.kpse_minor_version.kpse_micro_version[]kpse_devel_version])[]dnl
-
-m4_define([kpse_lib_major], [5])[]dnl
-m4_define([kpse_lib_minor], [0])[]dnl
-m4_define([kpse_lib_micro], [0])[]dnl
-m4_define([kpse_lt_version],[m4_eval(kpse_lib_major + kpse_lib_minor):kpse_lib_micro:kpse_lib_minor])[]dnl
-
-AC_INIT([kpathsea], [kpse_version], [tex-k@mail.tug.org])
-AC_CONFIG_SRCDIR([pathsearch.c])
-
-AC_SUBST([KPSEVERSION], [kpse_version])
-AC_DEFINE([KPSEVERSION], ["kpathsea version kpse_version"])
-AC_SUBST([KPSE_LT_VERS], [kpse_lt_version])
-
-dnl Write output here, instead of putting a zillion -D's on the command line.
-AC_CONFIG_HEADERS([c-auto.h:c-auto.in],
- [sed 's/^#define PACKAGE_/#define KPSE_PACKAGE_/' c-auto.h >c-auto.tmp && mv -f c-auto.tmp c-auto.h
- date >stamp-auto])
-
-sinclude(common.ac)
-
-AH_TOP([/* c-auto.h: defines for kpathsea, as determined by configure.
-
- Copyright 1994-97, 2008 Karl Berry.
- Copyright 1997-99, 2002, 2005 Olaf Weber.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, see <http://www.gnu.org/licenses/>. */
-
-/* Guard against double inclusion. */
-#ifndef KPATHSEA_C_AUTO_H
-#define KPATHSEA_C_AUTO_H
-
-/* kpathsea: the version string. */
-#define KPSEVERSION "REPLACE-WITH-KPSEVERSION"])
-AH_BOTTOM([#endif /* !KPATHSEA_C_AUTO_H */])
-
-KPSE_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/Build/source/texk/seetexk/ChangeLog b/Build/source/texk/seetexk/ChangeLog
index 8c5463ebe70..17823312fab 100644
--- a/Build/source/texk/seetexk/ChangeLog
+++ b/Build/source/texk/seetexk/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Adapt to TL2009 build system.
+
2009-02-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* error.c: Include <config.h> instead of <c-auto.h> as
diff --git a/Build/source/texk/ttfdump/ChangeLog b/Build/source/texk/ttfdump/ChangeLog
index 338bb5557a9..cbaedc2192b 100644
--- a/Build/source/texk/ttfdump/ChangeLog
+++ b/Build/source/texk/ttfdump/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-27 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/texk/ttfdump/Makefile.am b/Build/source/texk/ttfdump/Makefile.am
index fe6b13949ca..8ce8e170e73 100644
--- a/Build/source/texk/ttfdump/Makefile.am
+++ b/Build/source/texk/ttfdump/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory texk/afm2pl/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -10,6 +14,8 @@ EXTRA_DIST = docs include libttf src
# in case of an SVN repository
dist-hook:
rm -rf `find $(distdir) -name .svn`
+ rm -f $(distdir)/libttf/Makefile.in
+ rm -f $(distdir)/src/Makefile.in
INCLUDES = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES)
@@ -67,7 +73,3 @@ nodist_man1_MANS = docs/ttfdump.1
##
EXTRA_DIST += ILX NOTE README.bg5
-## Eventually delete these files
-##
-EXTRA_DIST += Makefile.in.orig configure.in.orig
-
diff --git a/Build/source/texk/ttfdump/Makefile.in b/Build/source/texk/ttfdump/Makefile.in
index a9d33503ae5..3392b9a8e16 100644
--- a/Build/source/texk/ttfdump/Makefile.in
+++ b/Build/source/texk/ttfdump/Makefile.in
@@ -256,8 +256,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-EXTRA_DIST = docs include libttf src ILX NOTE README.bg5 \
- Makefile.in.orig configure.in.orig
+EXTRA_DIST = docs include libttf src ILX NOTE README.bg5
INCLUDES = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES)
noinst_LIBRARIES = libttf.a
nodist_libttf_a_SOURCES = \
@@ -1304,6 +1303,8 @@ uninstall-man: uninstall-man1
# in case of an SVN repository
dist-hook:
rm -rf `find $(distdir) -name .svn`
+ rm -f $(distdir)/libttf/Makefile.in
+ rm -f $(distdir)/src/Makefile.in
@KPATHSEA_RULE@
diff --git a/Build/source/texk/ttfdump/Makefile.in.orig b/Build/source/texk/ttfdump/Makefile.in.orig
deleted file mode 100644
index d01b644dd81..00000000000
--- a/Build/source/texk/ttfdump/Makefile.in.orig
+++ /dev/null
@@ -1,148 +0,0 @@
-# Makefile.in for Autoconf.
-# @configure_input@
-# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# @configure_input@
-
-SHELL = /bin/sh
-
-#### Start of system configuration section. ####
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-# If you use gcc, you should either run the fixincludes script that
-# comes with it or else use gcc with the -traditional option. Otherwise
-# ioctl calls will be compiled incorrectly on some systems.
-CC = @CC@
-AR = ar
-
-# set make command
-@SET_MAKE@
-
-# Set RANLIB = echo if your system doesn't have or need ranlib.
-RANLIB = @RANLIB@
-
-# Use cp if you don't have install.
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-DEFS = @DEFS@
-LIBS = @LIBS@
-
-INCLUDES = -I@top_srcdir@/include
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-
-MAKEINFO = makeinfo
-TEXI2DVI = texi2dvi
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-# Where to install the executables.
-bindir = $(exec_prefix)/bin
-
-# Where to put the include header
-includedir = $(prefix)/include
-
-# Where to put the Info files
-infodir = $(prefix)/info
-
-# Where to put the library file
-libdir = $(prefix)/lib
-
-# Where to put the manual pages.
-mandir = $(prefix)/man
-
-#### End of system configuration section. ####
-
-SUBDIRS = libttf src
-
-# Set default target.
-all:
-
-.PHONY: all install uninstall
-all check install uninstall: config.h Makefile all-local
- @for subdir in $(SUBDIRS); do \
- echo "making $@ in $$subdir"; \
- ( cd $$subdir && $(MAKE) $(FLAGS_TO_PASS) $@ ) || exit 1; \
- done
-
-.PHONY: all-local
-all-local:
-
-.PHONY: clean
-clean: clean-local
- @for dir in $(SUBDIRS); do echo making $@ in $$dir; cd $$dir && $(MAKE) $(FLAGS_TO_PASS) $@ || exit 1; cd ..; done
-
-.PHONY: distclean
-distclean: distclean-local
- @for dir in $(SUBDIRS); do echo making $@ in $$dir; cd $$dir && $(MAKE) $(FLAGS_TO_PASS) $@ || exit 1; cd ..; done
- rm -f config.status
-
-.PHONY: realclean
-realclean: realclean-local
- @for dir in $(SUBDIRS); do echo making $@ in $$dir; cd $$dir && $(MAKE) $(FLAGS_TO_PASS) $@ || exit 1; cd ..; done
- rm -f config.status
-
-.PHONY: mostlyclean-local
-mostlyclean-local:
- rm -f *~
-
-.PHONY: clean-local
-clean-local: mostlyclean-local
-
-.PHONY: distclean-local
-distclean-local: clean-local
- rm -f Makefile config.cache config.h config.log stamp-h
- rm -f tags TAGS
-
-.PHONY: realclean-local
-realclean-local: distclean-local
-
-#distclean: clean
-# rm -f Makefile config.log config.cache config.status config.h stamp-h *~
-
-# For the justification of the following Makefile rules, see node
-# `Automatic Remaking' in GNU Autoconf documentation.
-Makefile: Makefile.in config.status
- CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
-config.status: configure
- ./config.status --recheck
-# The rules to run autoconf and autoheader are commented out. This is because
-# when the user unpacks a tarfile, configure.in might end up newer than
-# configure, but the user might not have (and does not need to have) autoconf
-# installed.
-#configure: configure.in #aclocal.m4
-# cd $(srcdir); autoconf
-
-config.h: stamp-h
-
-# This used to do a ./config.status --recheck, to update config.status with
-# any new #defines from config.h.in. The problem was that the rule itself
-# depends on config.status, so that the --recheck would get run several
-# times, which is bad if the user was trying to specify CFLAGS manually.
-# It was a big pain in the neck.
-stamp-h: config.h.in config.status
- CONFIG_FILES=$@ CONFIG_HEADERS=config.h ./config.status
-
-#config.h.in: stamp-h.in
-#stamp-h.in: configure.in #aclocal.m4 acconfig.h
-# cd $(srcdir); autoheader
-# date > $(srcdir)/stamp-h.in \ No newline at end of file
diff --git a/Build/source/texk/ttfdump/configure.in.orig b/Build/source/texk/ttfdump/configure.in.orig
deleted file mode 100644
index 7b5ab86ac91..00000000000
--- a/Build/source/texk/ttfdump/configure.in.orig
+++ /dev/null
@@ -1,31 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT
-AC_CONFIG_SRCDIR([include/ttf.h])
-
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_RANLIB
-AC_PROG_MAKE_SET
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-AC_HEADER_STDC
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-
-AC_C_BIGENDIAN
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(long long)
-AC_C_INLINE
-
-dnl Checks for library functions.
-AC_CHECK_FUNCS(strstr)
-
-
-AC_CONFIG_HEADER(config.h)
-AC_CONFIG_FILES([libttf/Makefile src/Makefile Makefile])
-AC_CONFIG_COMMANDS([default],[test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h],[])
-AC_OUTPUT
diff --git a/Build/source/texk/ttfdump/libttf/Makefile.in b/Build/source/texk/ttfdump/libttf/Makefile.in
deleted file mode 100644
index 178137425f9..00000000000
--- a/Build/source/texk/ttfdump/libttf/Makefile.in
+++ /dev/null
@@ -1,103 +0,0 @@
-# @configure_input@
-# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-# @configure_input@
-
-SHELL = /bin/sh
-
-#### Start of system configuration section. ####
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-# If you use gcc, you should either run the fixincludes script that
-# comes with it or else use gcc with the -traditional option. Otherwise
-# ioctl calls will be compiled incorrectly on some systems.
-CC = @CC@
-AR = ar
-
-# set make command
-@SET_MAKE@
-
-# Set RANLIB = echo if your system doesn't have or need ranlib.
-RANLIB = @RANLIB@
-
-# Use cp if you don't have install.
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-DEFS = @DEFS@
-LIBS = @LIBS@
-
-INCLUDES = -I@top_srcdir@ -I@top_srcdir@/include
-CFLAGS = @CFLAGS@ $(INCLUDES)
-LDFLAGS = @LDFLAGS@
-
-MAKEINFO = makeinfo
-TEXI2DVI = texi2dvi
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-# Where to install the executables.
-bindir = $(exec_prefix)/bin
-
-# Where to put the include header
-includedir = $(prefix)/include
-
-# Where to put the Info files
-infodir = $(prefix)/info
-
-# Where to put the library file
-libdir = $(prefix)/lib
-
-# Where to put the manual pages.
-mandir = $(prefix)/man
-
-#### End of system configuration section. ####
-
-#CFLAGS = -g -pg -Wall -m486 -DMEMCHECK -DTESTCODE -DCOPYDELETE -I/usr/local/include
-#CFLAGS = -O3 -Wall -m486 -DTESTCODE -DCOPYDELETE -I/usr/local/include -I../ -I../include
-#LDFLAGS = -L/usr/local/lib
-#LIBS = -ldmalloc
-#LIBS = -lefence
-#LIBS = -lc_p
-OBJS = ttfread.o tabledir.o ttfutil.o font.o cmap.o glyf.o gcache.o \
- head.o hhea.o hmtx.o loca.o maxp.o name.o os2.o post.o \
- cvt.o fpgm.o gasp.o hdmx.o kern.o ltsh.o prep.o pclt.o vdmx.o vhea.o \
- vmtx.o gstate.o stack.o interp.o disasm.o ttc.o
-
-all: libttf.a
-
-libttf.a: ${OBJS}
- $(AR) r $@ $?
- ranlib $@ || $(AR) ts $@ || true
-
-clean:
- rm -f *.a *.o *~
-.PHONY: clean
-
-distclean: clean
- rm -f tags TAGS Makefile
-.PHONY: distclean
-
-install:
- @echo Nothing to install from this directory
-
-check:
- @echo Nothing to check in this directory
diff --git a/Build/source/texk/ttfdump/src/Makefile.in b/Build/source/texk/ttfdump/src/Makefile.in
deleted file mode 100644
index b53d3c605a0..00000000000
--- a/Build/source/texk/ttfdump/src/Makefile.in
+++ /dev/null
@@ -1,115 +0,0 @@
-# @configure_input@
-# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-# @configure_input@
-
-SHELL = /bin/sh
-
-#### Start of system configuration section. ####
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-# If you use gcc, you should either run the fixincludes script that
-# comes with it or else use gcc with the -traditional option. Otherwise
-# ioctl calls will be compiled incorrectly on some systems.
-CC = @CC@
-AR = ar
-
-# set make command
-@SET_MAKE@
-
-# Set RANLIB = echo if your system doesn't have or need ranlib.
-RANLIB = @RANLIB@
-
-# Use cp if you don't have install.
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-DEFS = @DEFS@
-LIBS = @LIBS@
-
-INCLUDES = -I@top_srcdir@ -I@top_srcdir@/include
-CFLAGS = @CFLAGS@ $(INCLUDES) $(DEFS)
-LDFLAGS = @LDFLAGS@
-
-MAKEINFO = makeinfo
-TEXI2DVI = texi2dvi
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-# Where to install the executables.
-bindir = $(exec_prefix)/bin
-
-# Where to put the include header
-includedir = $(prefix)/include
-
-# Where to put the Info files
-infodir = $(prefix)/info
-
-# Where to put the library file
-libdir = $(prefix)/lib
-
-# Where to put the manual pages.
-mandir = $(prefix)/man
-
-#### End of system configuration section. ####
-#CC = gcc
-#CFLAGS = -g -pg -Wall -m486 -DMEMCHECK -DTESTCODE -DCOPYDELETE -I/usr/local/include
-#CFLAGS = -O3 -Wall -m486 -DTESTCODE -DCOPYDELETE -I../ -I../include -I/usr/local/include
-#LDFLAGS = -L/usr/local/lib
-#LIBS = -ldmalloc
-#LIBS = -lefence
-#LIBS = -lc_p
-OBJS = ttfdump.o
-
-all: ttfdump
-
-ttfdump:${OBJS} ../libttf/libttf.a
- ${CC} ${CFLAGS} -o $@ ${OBJS} ../libttf/libttf.a ${LIBS}
-
-test:ttfdump
- -./ttfdump times.ttf times.txt
- @echo There should be no differences found:
- diff times.txt times.ok
-
-depend:
- co RCS/*
- makedepend *.c *.h
- rcsclean
-clean:
- rm -f *.o *~ core gmon.out times.txt ttfdump logfile
-.PHONY: clean
-
-distclean: clean
- rm -f tags TAGS Makefile
-
-.PHONY: distclean
-
-check: test
-
-install: ttfdump
- $(INSTALL_PROGRAM) ttfdump $(bindir)/ttfdump
- strip $(bindir)/ttfdump || true
- chmod 775 $(bindir)/ttfdump
- $(INSTALL_DATA) ../docs/ttfdump.1 $(mandir)/man1/ttfdump.1
- chmod 664 $(mandir)/man1/ttfdump.1
- @-rm -f $(mandir)/cat1/ttfdump.1
- @echo Installed files...
- ls -l $(bindir)/ttfdump $(mandir)/man1/ttfdump.1
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
-])
diff --git a/Build/source/texk/xdv2pdf/ChangeLog b/Build/source/texk/xdv2pdf/ChangeLog
index 080253a1726..fc094da6b99 100644
--- a/Build/source/texk/xdv2pdf/ChangeLog
+++ b/Build/source/texk/xdv2pdf/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Adapt to TL2009 build system.
+
2009-03-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* T1Wrap.m, xdv2pdf.cpp: Use again config.h, not c-auto.h.
diff --git a/Build/source/texk/xdv2pdf/Makefile.am b/Build/source/texk/xdv2pdf/Makefile.am
index 0f39234077f..0866637d675 100644
--- a/Build/source/texk/xdv2pdf/Makefile.am
+++ b/Build/source/texk/xdv2pdf/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory texk/dtl/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -35,11 +39,3 @@ xdv2pdf_LDADD = $(KPATHSEA_LIBS)
EXTRA_DIST = LICENSE.txt
-## Eventually delete these files
-##
-EXTRA_DIST += \
- Makefile.in.orig \
- acconfig.h.dist \
- acconfig.h.in \
- configure.in.orig
-
diff --git a/Build/source/texk/xdv2pdf/Makefile.in b/Build/source/texk/xdv2pdf/Makefile.in
index cc83783089b..ef16d03e52f 100644
--- a/Build/source/texk/xdv2pdf/Makefile.in
+++ b/Build/source/texk/xdv2pdf/Makefile.in
@@ -275,8 +275,7 @@ xdv2pdf_SOURCES = \
EXTRA_xdv2pdf_SOURCES = appleGlyphNames.c
xdv2pdf_LDFLAGS = -framework Carbon -framework QuickTime
xdv2pdf_LDADD = $(KPATHSEA_LIBS)
-EXTRA_DIST = LICENSE.txt Makefile.in.orig acconfig.h.dist \
- acconfig.h.in configure.in.orig
+EXTRA_DIST = LICENSE.txt
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
diff --git a/Build/source/texk/xdv2pdf/Makefile.in.orig b/Build/source/texk/xdv2pdf/Makefile.in.orig
deleted file mode 100644
index 1b1183e6562..00000000000
--- a/Build/source/texk/xdv2pdf/Makefile.in.orig
+++ /dev/null
@@ -1,80 +0,0 @@
-# @configure_input@
-
-kpse_include ../make/paths.mk
-kpse_include ../make/common.mk
-kpse_include ../make/programs.mk
-
-CXX = c++
-OBJC = cc
-CXXLD = $(CXX)
-cxx_link_command = $(CXXLD) -o $@ $(LDFLAGS)
-kpathsea_cxx_link = $(LIBTOOL) --mode=link $(cxx_link_command)
-
-ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) -I. -I$(srcdir)
-ALL_OBJCFLAGS = @DEFS@ $(XXOBJCFLAGS) -I. -I$(srcdir)
-
-.SUFFIXES: .cpp .o .m
-.cpp.o:
- $(CXX) $(ALL_CXXFLAGS) -c $<
-.m.o:
- $(OBJC) $(ALL_OBJCFLAGS) -c $<
-
-FRAMEWORKS = \
- -framework Carbon \
- -framework QuickTime
-
-FRAMEWORKS_t1w = -framework Cocoa
-LIBS_t1w = # -lm
-
-program = xdv2pdf
-t1wrap = T1Wrap
-programs = $(program) $(t1wrap)
-default all: $(programs)
-
-objects=xdv2pdf_main.o xdv2pdf.o xdv2pdf_specials.o
-
-objects_t1w=T1Wrap.o SimplePSInterpreter.o
-
-$(objects): Makefile
-$(objects_t1m): Makefile
-
-$(program): $(objects) $(kpathsea) $(ALL_LIBS_DEP)
- $(kpathsea_cxx_link) $(objects) $(FRAMEWORKS) $(LOADLIBES)
-
-$(t1wrap): $(objects_t1w)
- $(kpathsea_cxx_link) $(objects_t1w) $(FRAMEWORKS_t1w) $(LOADLIBES)
-
-T1Wrap.o: $(srcdir)/T1Wrap.m
- $(OBJC) $(ALL_OBJCFLAGS) -c $<
-
-SimplePSInterpreter.o: $(srcdir)/SimplePSInterpreter.m
- $(OBJC) $(ALL_OBJCFLAGS) -c $<
-
-kpse_include ../make/tkpathsea.mk
-
-install: install-exec install-data
-uninstall: uninstall-exec uninstall-data
-
-distclean::
- $(RM) c-auto.h
-
-install-exec:
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
- $(INSTALL) $(t1wrap) $(bindir)
-
-uninstall-exec:
- cd $(bindir); rm -f $(programs)
-
-install-data:
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
-
-uninstall-data:
-
-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/xdv2pdf/acconfig.h.dist b/Build/source/texk/xdv2pdf/acconfig.h.dist
deleted file mode 100644
index ee49123b348..00000000000
--- a/Build/source/texk/xdv2pdf/acconfig.h.dist
+++ /dev/null
@@ -1,37 +0,0 @@
-#define VERSION 0
-
-#define PACKAGE "package"
-
-/* define if you have kpathsea */
-#undef HAVE_KPATHSEA
-
-/* define if your zlib has the compress2 function */
-#undef HAVE_ZLIB_COMPRESS2
-
-/* define if you have zlib and its headers */
-#undef HAVE_ZLIB
-
-/* define if you have xbasename() in your libkpathsea instead of basename() */
-#undef HAVE_XBASENAME
-
-/* define if kpathsea understands TrueType (TTF) formats */
-#undef HAVE_TTF_FORMATS
-
-/* define if struct tm has tm_gmtoff as a member */
-#undef HAVE_TM_GMTOFF
-
-/* define if <time.h> has timezone as an external variable */
-#undef HAVE_TIMEZONE
-
-/* define if kpathsea supports type1 and vf formats */
-#undef HAVE_KPSE_FORMATS
-
-/* define if you have libpng */
-#undef HAVE_LIBPNG
-
-/* Define if kpathsea understands Omega (OFM/OVF) formats */
-#undef HAVE_OMEGA_FORMATS
-
-
-
-
diff --git a/Build/source/texk/xdv2pdf/acconfig.h.in b/Build/source/texk/xdv2pdf/acconfig.h.in
deleted file mode 100644
index e81beaf36c9..00000000000
--- a/Build/source/texk/xdv2pdf/acconfig.h.in
+++ /dev/null
@@ -1,45 +0,0 @@
-
-/* Local variables defined by MAW */
-#ifndef _CONFIG_H
-
-#define VERSION 0
-
-#define PACKAGE "package"
-
-/* HAVE_TIMEZONE - Define if <time.h> has timezone as an external variable */
-#undef HAVE_TIMEZONE
-
-/* HAVE_TM_GMTOFF - Define if struct tm has tm_gmtoff as a member */
-#undef HAVE_TM_GMTOFF
-
-/* HAVE_KPATHSEA - Define if you have kpathsea */
-#define HAVE_KPATHSEA
-
-/* HAVE_XBASENAME - Define if you have xbasename() in your libkpathsea instead of basename() */
-#undef HAVE_XBASENAME
-
-/* HAVE_ZLIB - Define if you have zlib and its headers */
-#undef HAVE_ZLIB
-/* HAVE_ZLIB_COMPRESS2 - Define if your zlib has the compress2 function */
-#undef HAVE_ZLIB_COMPRESS2
-
-/* HAVE_KPSE_FORMATS - Define if you have a
- version of kpathsea with type1 and vf formats */
-#define HAVE_KPSE_FORMATS
-
-/* HAVE_OMEGA_FORMATS - Define if you have a
- version of kpathsea that understands Omega (OFM/OVF) formats */
-#define HAVE_OMEGA_FORMATS
-
-/* HAVE_TTF_FORMATS - Define if you have a
- version of kpathsea that understands TrueType (TTF) formats */
-#define HAVE_TTF_FORMATS
-
-/* HAVE_LIBPNG - Define if you have libpng */
-#undef HAVE_LIBPNG
-
-/* HAVE_SYSTEM - Define if you have the system() command */
-#undef HAVE_SYSTEM
-
-
-#endif /* _CONFIG_H */
diff --git a/Build/source/texk/xdv2pdf/configure.in.orig b/Build/source/texk/xdv2pdf/configure.in.orig
deleted file mode 100644
index 5e89a2cd668..00000000000
--- a/Build/source/texk/xdv2pdf/configure.in.orig
+++ /dev/null
@@ -1,66 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(xdv2pdf.cpp)
-
-define([_version_],"0.998")
-
-VERSION=_version_
-AC_SUBST(VERSION)
-AC_DEFINE(VERSION, _version_, [package version])
-AC_DEFINE(PACKAGE, "xdv2pdf", [package name])
-
-AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
-
-dnl Disable maintainer portions of included makefile fragments
-MAINT='#'
-AC_SUBST(MAINT)
-
-dnl First, check if we're configuring on Mac OS X -- can't build elsewhere
-
-sinclude(../web2c/xetexdir/tests.ac)
-
-AC_HAS_CARBON
-if test "x$has_carbon" = xno; then
- with_xdv2pdf=no
- exit
-fi
-
-AC_HAS_QUICKTIME
-if test "x$has_quicktime" = xno; then
- with_xdv2pdf=no
- exit
-fi
-
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_CPP
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-
-AC_DEFINE([KPATHSEA], 1, [define if you have kpathsea])
-AC_DEFINE([HAVE_KPATHSEA], 1, [define if you have kpathsea])
-AC_DEFINE([HAVE_KPSE_FORMATS], 1, [define if kpathsea supports type1 and vf formats])
-
-TTF_OPT=''
-AC_SUBST(TTF_OPT)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-AC_STRUCT_TM
-
-AC_C_BIGENDIAN
-
-dnl Checks for library functions.
-AC_FUNC_MEMCMP
-AC_CHECK_FUNCS(strspn system)
-AC_CHECK_LIB(m, main)
-
-KPSE_CONFIG_FILES([Makefile])
-
-AC_OUTPUT
diff --git a/Build/source/texk/xdvik/Makefile.in.orig b/Build/source/texk/xdvik/Makefile.in.orig
deleted file mode 100644
index 96f0b6014ee..00000000000
--- a/Build/source/texk/xdvik/Makefile.in.orig
+++ /dev/null
@@ -1,243 +0,0 @@
-# @configure_input@
-# Makefile for xdvik
-#
-
-kpse_include ../make/paths.mk
-kpse_include ../make/common.mk
-### hack to prevent linking with kpathsea by default
-kpathsea=
-kpse_include ../make/programs.mk
-kpse_include ../make/cross.mk
-
-all_subdirs = gui tests
-
-CPP = @CPP@
-
-# Make `#include <X11/...>' and `-lX...' work.
-# This matches web2c (needed only for Metafont).
-x_cppflags=@X_CFLAGS@ @iconv_includes@
-x_ldflags=@X_LIBS@ @x_linker_options@ @iconv_libpath@
-x_pre_libs=@X_PRE_LIBS@
-x_extra_libs=@X_EXTRA_LIBS@ @iconv_libs@
-x_tool_libs=@x_tool_libs@
-x_xmu_lib=@x_xmu_lib@
-x_xpm_libs=@x_xpm_libs@
-# -lXp and -lXext
-x_ext_lib=@x_ext_lib@
-
-LDLIBT1=@LDLIBT1@
-LIBT1CPPFLAGS=@LIBT1CPPFLAGS@
-LIBT1DEP=@LIBT1DEP@
-LIBT1DIR=../../libs/t1lib
-LIBTYPE1DIR=$(LIBT1DIR)/../type1
-LIBT1SRCDIR=$(srcdir)/$(LIBT1DIR)
-
-# additional flags for kpathsea
-LDLIBKPATHSEA=@LDLIBKPATHSEA@
-LIBKPATHSEACPPFLAGS=@LIBKPATHSEACPPFLAGS@
-LIBKPATHSEADEP=@LIBKPATHSEADEP@
-
-# Follow the library order used in X11R6 itself.
-# It seems that on Cygwin, libXaw needs _XpmReadFileToPixmap, so we put
-# x_xpm_libs after the tool_libs -- but before -lX11, since on MacOSX it
-# uses XGrabServer and XUngrabServer, which would otherwise be
-# unresolved with static libraries.
-# Xmu needs to come before Xt and after the toolkit libs.
-x_link = $(LDLIBT1) $(LDLIBKPATHSEA) $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt $(x_pre_libs) $(x_ext_lib) $(x_xpm_libs) -lX11 $(x_extra_libs)
-
-TESTS=./tests/run_tests
-TESTS_DEP=$(TESTS)
-
-# various xdvik GUI elements
-LIBGUI=./gui/libgui.a
-LIBGUIDEP=$(LIBGUI)
-
-
-# Extra xdvi-specific compiler options.
-# ps_def = @PS_DEF@ -DXSERVER_INFO -DNEW_MENU_CREATION
-# ps_def = @PS_DEF@ -DRGB_ANTI_ALIASING
-ps_def = @PS_DEF@
-prog_cflags = @XTRA_WARN_CFLAGS@ $(LIBT1CPPFLAGS) $(LIBKPATHSEACPPFLAGS) $(ps_def) \
--I$(srcdir)/gui $(x_cppflags)
-
-# Note: to be able to use one depend.mk file for both Motif/Xaw (which
-# is needed since only maintainers are supposed to invoke `make depend')
-# we include *all* object files and have tests for #ifdef MOTIF/XAW inside
-# the files.
-objects = \
- browser.o \
- dl_list.o \
- dvi-draw.o \
- dvi-init.o \
- dvisel.o \
- encodings.o \
- events.o \
- exit-handlers.o \
- filehist.o \
- font-open.o \
- gf.o \
- string_list.o \
- hypertex.o \
- image-magick.o \
- main.o \
- mime.o \
- my-snprintf.o \
- my-vsnprintf.o \
- pagehist.o \
- pk.o \
- print-internal.o \
- psdps.o \
- psgs.o \
- psheader.o \
- psnews.o \
- read-mapfile.o \
- search-internal.o \
- special.o \
- string-utils.o \
- tfmload.o \
- util.o \
- vf.o \
- xdvi.o \
- xserver-info.o \
- x_util.o
-
-# t1mapper or its man page are currently not being installed, since they
-# aren't needed on most current (teTeX) systems
-perlprog = t1mapper
-manpage = xdvi
-
-default all: libguibuild @final_exec_name@ $(manpage).1
-
-$(LIBGUI):
- cd gui; $(MAKE) $(makeargs) libgui.a
-
-$(TESTS):
- cd tests; $(MAKE) $(makeargs)
-
-### we need this additional target so that libgui is always checked to be up-to-date ...
-libguibuild:
- cd gui; $(MAKE) $(makeargs) libgui.a
-
-test:
- cd tests; $(MAKE) $(makeargs) test
-
-test_verbose:
- cd tests; $(MAKE) $(makeargs) test_verbose
-
-@final_exec_name@: $(LIBKPATHSEADEP) $(objects) $(LIBT1DEP) $(LIBGUIDEP)
- $(kpathsea_link) $(objects) $(LIBGUI) $(x_link) $(LOADLIBES)
-
-squeeze.o: squeeze.c
- $(build_compile) -c $<
-squeeze: squeeze.o
- $(build_link_command) squeeze.o
-
-psheader.c: psheader.txt squeeze
- ./squeeze $(srcdir)/psheader.txt $@
-
-$(manpage).1: xdvi.1.in sedscript
- sed -f sedscript <$(srcdir)/xdvi.1.in >$@
-
-sedscript: mksedscript c-auto.h
- $(SHELL) $(srcdir)/mksedscript $(srcdir) pkpath sizes vfpath \
- figpath headerpath $(DEFS) $(prog_cflags) >$@
-
-install: install-exec install-data
-uninstall: uninstall-exec uninstall-data
-
-install-exec: @final_exec_name@
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- $(INSTALL_LIBTOOL_PROG) @final_exec_name@ $(bindir)
- $(INSTALL_SCRIPT) xdvi-sh $(scriptdir)/@wrapper_script@
- rm -f $(scriptdir)/o@wrapper_script@
- ln -s @wrapper_script@ $(scriptdir)/o@wrapper_script@
-
-uninstall-exec:
- for p in @final_exec_name@; do rm -f $(bindir)/$$p; done
- for p in @wrapper_script@ o@wrapper_script@; do rm -f $(scriptdir)/$$p; done
-
-install-data: $(manpage).1 pixmaps/toolbar.xpm pixmaps/toolbar2.xpm
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/xdvi/pixmaps
- $(INSTALL_DATA) $(manpage).1 $(man1dir)/$(manpage).$(manext)
- rm -f $(man1dir)/o$(manpage).$(manext)
- ln -s $(manpage).$(manext) $(man1dir)/o$(manpage).$(manext)
- $(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/xdvi/XDvi
- $(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm $(texmf)/xdvi/pixmaps
- if \
- grep 'original xdvi.cfg --' $(texmf)/xdvi/xdvi.cfg >/dev/null 2>&1 \
- || test ! -r $(texmf)/xdvi/xdvi.cfg; \
- then \
- $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg $(texmf)/xdvi/xdvi.cfg; \
- else \
- true; \
- fi
-
-uninstall-data:
- rm -f $(man1dir)/$(manpage).$(manext) \
- $(texmf)/xdvi/pixmaps/toolbar.xpm $(texmf)/xdvi/pixmaps/toolbar2.xpm \
- $(texmf)/xdvi/XDvi
- if \
- head -n 1 $(texmf)/xdvi/xdvi.cfg | grep 'original xdvi.cfg --' >/dev/null 2>&1 \
- || test ! -r $(texmf)/xdvi/xdvi.cfg; \
- then \
- rm -f $(texmf)/xdvi/xdvi.cfg; \
- else \
- true; \
- fi
- rmdir $(texmf)/xdvi/pixmaps
-
-distname = xdvik
-program_files = *.1.in *.ac xdvi.icon xdvi.FAQ psheader.txt mksedscript \
- MOTIF
-version_files = xdvi.c
-
-pre-dist-$(distname):
-post-dist-$(distname):
- cd $(top_distdir); rm -f xdvik/psheader.c
-
-kpse_include ../make/dist.mk
-kpse_include ../make/config.mk
-
-info dvi check:
-
-kpse_include ../make/clean.mk
-
-mostlyclean::
- test ! -r gui/Makefile || test ! -r tests/Makefile \
- || for d in $(all_subdirs); do (cd $$d && $(MAKE) $@); done
-clean::
- test ! -r gui/Makefile || test ! -r tests/Makefile \
- || for d in $(all_subdirs); do (cd $$d && $(MAKE) $@); done
-distclean::
- test ! -r gui/Makefile || test ! -r tests/Makefile \
- || for d in $(all_subdirs); do (cd $$d && $(MAKE) $@); done
-extraclean::
- test ! -r gui/Makefile || test ! -r tests/Makefile \
- || for d in $(all_subdirs); do (cd $$d && $(MAKE) $@); done
-maintainer-clean::
- test ! -r gui/Makefile || test ! -r tests/Makefile \
- || for d in $(all_subdirs); do (cd $$d && $(MAKE) $@); done
-
-depend::
- test ! -r gui/Makefile || test ! -r tests/Makefile \
- || for d in $(all_subdirs); do (cd $$d && $(MAKE) $@); done
-
-clean::
- rm -f $(manpage).1 *.flc @final_exec_name@
-
-distclean::
- rm -f psheader.c sedscript $(manpage).1 *.flc *~ @final_exec_name@ xdvi-sh
- test -f $(LIBTYPE1DIR)/Makefile && { cd $(LIBTYPE1DIR); $(MAKE) distclean; } || true
- test -f $(LIBT1DIR)/Makefile && { cd $(LIBT1DIR); $(MAKE) distclean; } || true
-
-$(LIBT1DIR)/libt1.a:
- cd $(LIBT1DIR); $(MAKE) $(makeargs) libt1.a
-
-$(LIBTYPE1DIR)/libtype1.a:
- cd $(LIBTYPE1DIR); $(MAKE) $(makeargs) libtype1.a
-
-
-kpse_include ../make/tkpathsea.mk
-kpse_include ../make/rdepend.mk
-kpse_include depend.mk
diff --git a/Build/source/texk/xdvik/configure.in.orig b/Build/source/texk/xdvik/configure.in.orig
deleted file mode 100644
index 4925e9c1f30..00000000000
--- a/Build/source/texk/xdvik/configure.in.orig
+++ /dev/null
@@ -1,311 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT(xdvi.c)
-AC_PREREQ(2.59)
-
-AC_CONFIG_HEADER([c-auto.h:c-auto.in], [date >stamp-auto])
-
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_PROG_LN_S
-AC_PROG_RANLIB
-
-dnl allow for --program-suffix
-AC_ARG_PROGRAM
-
-sinclude(../kpathsea/withenable.ac)
-sinclude(../../withenable.ac)
-sinclude(kpathsea.ac)
-
-if test "x$with_mktexpk_default" = "xno"; then
- AC_MSG_WARN(Xdvik doesn't implement the --without-mktexpk-default option!)
-fi
-
-if test "x$with_mktexmf_default" = "xno"; then
- AC_MSG_WARN(Xdvik doesn't implement the --without-mktexmf-default option!)
-fi
-
-if test "x$with_mktextfm_default" = "xno"; then
- AC_MSG_WARN(Xdvik doesn't implement the --without-mktextfm-default option!)
-fi
-
-if test "x$with_mkocp_default" = "xno"; then
- AC_MSG_WARN(Xdvik doesn't implement the --without-mkocp-default option!)
-fi
-
-if test "x$with_mkofm_default" = "xno"; then
- AC_MSG_WARN(Xdvik doesn't implement the --without-mkofm-default option!)
-fi
-
-AC_FUNC_VFORK
-AC_FUNC_VPRINTF
-dnl begin additions SU, 2000/03/07
-dnl AC_FUNC_VSNPRINTF
-XDVI_FUNC_WORKING_VSNPRINTF
-AC_FUNC_MEMICMP
-dnl AC_FUNC_REALPATH
-AC_FUNC_ALLOCA
-AC_C_STRINGIZE
-dnl end additions SU
-AC_FUNC_MEMCMP
-AC_HEADER_SYS_WAIT
-AC_TYPE_SIGNAL
-AC_C_BIGENDIAN
-dnl Put here by Thomas Esser for teTeX. This causes some tests to be run
-dnl twice by the kps version.
-AC_PATH_XTRA
-AC_TYPE_SIZE_T
-
-dnl XDVI checks by Paul Vojta
-XDVI_FUNC_SETSID_IN_VFORK
-XDVI_CC_CONCAT
-XDVI_C_BITMAP_TYPE
-XDVI_SYS_STREAMS
-XDVI_SYS_SUNOS_4
-XDVI_SYS_OLD_LINUX
-XDVI_FUNC_POLL
-
-dnl SU: added flags to turn on gcc warnings, taken from gnome/compiler-flags.m4 and put into aclocal.m4
-COMPILER_WARNINGS
-
-dnl SU: for `--allow-multiple-definition' linker flag on Cygwin
-XDVI_LINKER_MULTIPLE_DEFNS
-
-AC_CHECK_HEADERS(stdint.h inttypes.h)
-AC_CHECK_TYPE(uint32_t, unsigned long)
-
-dnl These were probably missing from the test-set?
-dnl On the other hand, they are not used already, why start now? -janl
-dnl AC_TYPE_OFF_T
-dnl AC_HEADER_TIME
-
-AC_CHECK_FUNCS(mkstemp memcpy strerror waitpid sigaction strchr setenv ulltostr \
- fchdir getcwd getpwnam getuid getpwuid \
- iconv nl_langinfo \
- lstat ftruncate snprintf vsnprintf realpath)
-
-dnl <sys/bsdtypes.h> is for ISC 4.0, to define fd_set in psgs.c.
-dnl regex.h is needed for regexp support in DVI search.
-AC_CHECK_HEADERS(netdb.h sys/bsdtypes.h sys/param.h unistd.h sys/fcntl.h regex.h iconv.h langinfo.h)
-
-cppflags_save=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-AC_CHECK_HEADERS(X11/Intrinsic.h X11/Xosdefs.h X11/xpm.h Xm/XpmP.h)
-CPPFLAGS=$cppflags_save
-
-dnl For editres, we need to check both the header and define a linker option.
-cppflags_save=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-AC_CHECK_HEADERS(X11/Xmu/Editres.h X11/Xmu/Xmu.h, x_xmu_lib=-lXmu, x_xmu_lib=,
-[
-#ifdef HAVE_X11_INTRINSIC_H
-# include <X11/Intrinsic.h>
-#endif
-])
-AC_SUBST(x_xmu_lib)
-CPPFLAGS=$cppflags_save
-
-dnl For the bitmap size. -- I think this is in XDVI_C_BITMAP_TYPE now -janl
-dnl AC_CHECK_SIZEOF(long)
-
-sinclude(../kpathsea/xt.ac)
-sinclude(withenable.ac)
-sinclude(../../libs/t1lib/withenable.ac)
-sinclude(../../libs/t1lib/t1lib.ac)
-
-dnl check for Xaw version
-XDVI_OLD_XAW
-
-dnl nl_langinfo checks
-AC_MSG_CHECKING(if nl_langinfo(CODESET) is working)
-AC_TRY_LINK([#include <langinfo.h>], [char* cs = nl_langinfo(CODESET);],
- [AC_DEFINE([HAVE_WORKING_NL_LANGINFO_CODESET], 1,
- [Define if the CODESET argument to nl_langinfo works.])
- AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)]
-)
-
-dnl First, check for libXp and libXext:
-if test -z "$x_ext_lib"; then # allow envvar override
- if test -n "$x_libraries"; then
- XLFLAG="-L$x_libraries"
- else
- XLFLAG=
- fi
- AC_CHECK_LIB(Xp, XpQueryVersion,
- x_ext_lib="-lXp -lXext", :, -lXext -lX11 $X_EXTRA_LIBS $XLFLAG)
-fi
-dnl
-dnl If libXp not found, try libXext only:
-dnl
-if test -z "$x_ext_lib"; then # previous test unsuccessful, or envvar override
- if test -n "$x_libraries"; then
- XLFLAG="-L$x_libraries"
- else
- XLFLAG=
- fi
- AC_CHECK_LIB(Xext, XextCreateExtension,
- x_ext_lib=-lXext, :, -lX11 $X_EXTRA_LIBS $XLFLAG)
-fi
-AC_SUBST(x_ext_lib)
-
-dnl For --with-x-toolkit. Must be Xaw at least. If no --with-x-toolkit is given,
-dnl we try to check if Motif is available, and if yes, use it; else,
-dnl we use Xaw (--with-x-toolkit=xaw can be used to override this default).
-
-dnl Check whether -lXpm can be used
-XDVI_FIND_XPM
-
-dnl Check which X toolkit to use
-prog_extension="xaw"
-motif_include=
-motif_libdir=
-AC_ARG_WITH([motif-include],
-[ --with-motif-include=DIR
- Specify the location of Motif include files],
-[motif_include="$withval"])
-AC_ARG_WITH([motif-libdir],
-[ --with-motif-libdir=DIR
- Specify the location of Motif libraries],
-[motif_libdir="$withval"])
-
-if test "x$with_xdvi_x_toolkit" = xxaw3d; then
- prog_extension="xaw3d"
- x_tool_libs="-lXaw3d"
-elif test "x$with_xdvi_x_toolkit" = xneXtaw; then
- prog_extension="nextaw"
- x_tool_libs="-lneXtaw"
-elif test "x$with_xdvi_x_toolkit" = xmotif; then
-dnl Motif with no fallback
-dnl XDVI_FIND_MOTIF also defines $prog_extension, AC_DEFINE(toolkit) and $x_tool_libs
- XDVI_FIND_MOTIF(none, "$motif_include", "$motif_libdir")
-elif test "x$with_xdvi_x_toolkit" = xxaw; then
- prog_extension="xaw"
- AC_DEFINE([XAW], 1, [Define to use the Xaw toolkit.])
- x_tool_libs="-lXaw"
-else
-dnl Motif with xaw as fallback
-dnl XDVI_FIND_MOTIF also defines $prog_extension, AC_DEFINE(toolkit) and $x_tool_libs
- XDVI_FIND_MOTIF(Xaw, "$motif_include", "$motif_libdir")
-fi
-AC_SUBST(x_tool_libs)
-
-AC_ARG_WITH([iconv-libdir],
-[ --with-iconv-libdir=DIR
- Specify the location of iconv library (librecode.so)],
-[if test XXX"$withval" != "XXX"; then
- iconv_libpath="-L$withval"
- iconv_libs="-lrecode"
-else
- iconv_libpath=
- iconv_libs=
-fi], [
-dnl On non-Linux systems, -liconv is needed. Check for both iconv_open and libiconv_open.
-iconv_libpath=
-iconv_libs=
-AC_CHECK_LIB(iconv, iconv_open, iconv_libs=-liconv,
- AC_CHECK_LIB(iconv, libiconv_open, iconv_libs=-liconv,iconv_libs=,)
- ,)
-])
-if test XXX"$iconv_libs" != "XXX"; then
- AC_DEFINE(HAVE_ICONV)
-fi
-AC_SUBST(iconv_libpath)
-AC_SUBST(iconv_libs)
-
-AC_ARG_WITH([iconv-include],
-[ --with-iconv-include=DIR
- Specify the location of iconv header (iconv.h)],
-[if test XXX"$withval" != "XXX"; then
- iconv_includes="-I$withval"
-fi],[
-iconv_includes=
-])
-AC_SUBST(iconv_includes)
-
-XDVI_ICONV_CHAR_PPTR_TYPE
-
-dnl We try to perform the $program_transform_name replacement already
-dnl here, and AC_SUBST the final names into the Makefile; this makes
-dnl the compilation commands more readable and causes less problems with
-dnl backtick magic inside other commands.
-dnl
-dnl For some reason, the doubling of $$ and \\ must be reverted here:
-my_program_transform_name=`echo $program_transform_name | sed 's,\\$\\$,$,g' | sed 's,\\\\\\\\,\\\\,g'`
-exec_name="xdvi-$prog_extension"
-final_exec_name=`echo $exec_name | sed "$my_program_transform_name"`
-dnl OBSOLETE?? exec_link=`echo xdvi.bin | sed "$my_program_transform_name"`
-wrapper_script=`echo xdvi | sed "$my_program_transform_name"`
-AC_SUBST(exec_name)
-AC_SUBST(final_exec_name)
-dnl OBSOLETE?? AC_SUBST(exec_link)
-AC_SUBST(wrapper_script)
-
-dnl
-dnl Tests for different application setup features follow.
-dnl
-
-dnl For --with-ps.
-test -z "$PS_DEF" && PS_DEF=-DPS_GS
-test "$PS_DEF" = no && PS_DEF=
-AC_SUBST(PS_DEF)dnl
-dnl
-dnl If we're on Solaris and we want DPS, then add the extra compilation stuff
-dnl to get it.
-if echo "$PS_DEF" | grep PS_DPS >/dev/null; then
- if test "`(uname) 2>/dev/null`" = SunOS \
- && uname -r | grep '^5' >/dev/null; then
- AC_MSG_RESULT(adding DPS includes and libraries for Solaris)
- X_CFLAGS="$X_CFLAGS -I/usr/openwin/include/X11"
- AC_CHECK_LIB(sunmath, isinf, ac_sunmath=-lsunmath, ac_sunmath="")
- X_LIBS="$X_LIBS -R/usr/openwin/lib /usr/openwin/lib/libdps.so $ac_sunmath"
- dnl We only need isinf and ieeefp.h to work around a Solaris bug in
- dnl -ldps; see psdps.c. isinf is in -lsunmath.
- AC_CHECK_FUNCS(isinf)
- AC_CHECK_HEADERS(ieeefp.h)
- else
- dnl SunOS 4.x is simpler.
- AC_MSG_RESULT(adding DPS includes and libraries for SunOS 4.x)
- X_LIBS="$X_LIBS -ldps"
- fi
-elif echo "$PS_DEF" | grep PS_NEWS >/dev/null; then
- AC_MSG_RESULT(adding NeWS libraries)
- X_LIBS="$X_LIBS -lxview -lcps -lolgx -lxvps"
-fi
-
-XDVI_ARG_STRING([default-dvips-path],
-[ --with-default-dvips-path=CMD
- Use CMD as default DVI to PS converter],
-[DEFAULT_DVIPS_PATH], ["dvips"],
-[Define to point to the default command to use for printing (optional).])
-
-XDVI_ARG_STRING([default-ps2pdf-path],
-[ --with-default-ps2pdf-path=CMD
- Use CMD as default PS to PDF converter],
-[DEFAULT_PS2PDF_PATH], ["ps2pdf"],
-[Define to point to the default command to use for printing (optional).])
-
-dnl ImageMagick support
-PS_DEF="$PS_DEF $MAGICK_DEF"
-if echo "$PS_DEF" | grep MAGICK >/dev/null; then
- AC_MSG_RESULT(adding ImageMagick libraries)
- X_EXTRA_LIBS="$X_EXTRA_LIBS `Magick-config --libs`"
-fi
-
-# needed for web2c later than 7.3.4:
-AC_CHECK_LIB(m, main)
-AC_C_CONST()
-
-# If you're cross-compiling, these macros set up the variables in
-# ../make/cross.mk: BUILDCC, BUILDCFLAGS, BUILDCCLD etc. These are
-# near the end so people have some chance of seeing them.
-KPSE_CROSS_BUILD_VAR(CC, cc)
-KPSE_CROSS_BUILD_VAR(CFLAGS, $(BUILDXCFLAGS))
-KPSE_CROSS_BUILD_VAR(CPPFLAGS, $(BUILDXCPPFLAGS))
-KPSE_CROSS_BUILD_VAR(LDFLAGS, $(BUILDXLDFLAGS))
-KPSE_CROSS_BUILD_VAR(CCLD, $(BUILDCC))
-
-KPSE_CONFIG_FILES([Makefile gui/Makefile tests/Makefile])
-AC_CONFIG_FILES([xdvi-sh])
-AC_OUTPUT
diff --git a/Build/source/texk/xdvik/kpathsea.ac.orig b/Build/source/texk/xdvik/kpathsea.ac.orig
deleted file mode 100644
index d59113f1219..00000000000
--- a/Build/source/texk/xdvik/kpathsea.ac.orig
+++ /dev/null
@@ -1,58 +0,0 @@
-dnl Check if we want to compile against an installed kpathsea library
-
-EXTRA_LIBKPATHSEA_INCLUDE=
-EXTRA_LIBKPATHSEA_LIBDIR=
-
-if test "$with_system_kpathsea" = yes; then
- if test "x$with_kpathsea_libdir" != x; then
- EXTRA_LIBKPATHSEA_LIBDIR="-L$with_kpathsea_libdir"
- fi
- if test "x$with_kpathsea_include" != x; then
- EXTRA_LIBKPATHSEA_INCLUDE="-I$with_kpathsea_include"
- fi
-fi
-
-if test "$with_system_kpathsea" = yes; then
- OLD_LDFLAGS=$LDFLAGS
- OLD_CPP=$CPP
- OLD_CPPFLAGS=$CPPFLAGS
- OLD_LIBS=$LIBS
-
- LDFLAGS="$LDFLAGS $EXTRA_LIBKPATHSEA_LIBDIR"
- CPP="$CPP $EXTRA_LIBKPATHSEA_INCLUDE"
- CPPFLAGS="$EXTRA_LIBKPATHSEA_INCLUDE"
-
- AC_MSG_CHECKING(whether kpathsea defines kpse_enc_format)
- AC_TRY_COMPILE([#include "kpathsea/kpathsea.h"
- ], [kpse_file_format_type mytype = kpse_enc_format;
- ], have_good_kpathsea=yes, have_good_kpathsea=no)
- if test $have_good_kpathsea = no; then
- AC_MSG_RESULT(no)
- AC_MSG_WARN(kpathsea library is not recent enough; will compile my own)
- with_system_kpathsea=no
- else
- AC_MSG_RESULT(yes)
- fi
-
- LDFLAGS=$OLD_LDFLAGS
- CPP=$OLD_CPP
- CPPFLAGS=$OLD_CPPFLAGS
- LIBS=$OLD_LIBS
-fi
-
-if test "$with_system_kpathsea" = yes; then
- LIBKPATHSEACPPFLAGS="$EXTRA_LIBKPATHSEA_INCLUDE"
- LDLIBKPATHSEA="$EXTRA_LIBKPATHSEA_LIBDIR -lkpathsea"
- LIBKPATHSEADEP=
- using_system_kpathsea=yes
-else
- LIBKPATHSEACPPFLAGS='-I$(kpathsea_parent)'
- LDLIBKPATHSEA='$(kpathsea_dir)/libkpathsea.la'
- LIBKPATHSEADEP='$(kpathsea_dir)/libkpathsea.la'
- using_system_kpathsea=no
-fi
-
-
-AC_SUBST(LIBKPATHSEACPPFLAGS)
-AC_SUBST(LDLIBKPATHSEA)
-AC_SUBST(LIBKPATHSEADEP)
diff --git a/Build/source/texk/xdvipdfmx/ChangeLog.TL b/Build/source/texk/xdvipdfmx/ChangeLog.TL
index 8b219260c22..63465352cc1 100644
--- a/Build/source/texk/xdvipdfmx/ChangeLog.TL
+++ b/Build/source/texk/xdvipdfmx/ChangeLog.TL
@@ -1,6 +1,10 @@
ChangeLog.TL: Changes for xdvipdfmx (teTeX / TeX Live)
======================================================
+2009-05-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Adapt to TL2009 build system.
+
2009-05-25 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac, src/Makefile.am: Do not use CPPFLAGS for
required -I flags, leave it for the user.
diff --git a/Build/source/texk/xdvipdfmx/Makefile.am b/Build/source/texk/xdvipdfmx/Makefile.am
index 74acde13f6b..df1f61b4b1e 100644
--- a/Build/source/texk/xdvipdfmx/Makefile.am
+++ b/Build/source/texk/xdvipdfmx/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory texk/dtl/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -21,7 +25,3 @@ EXTRA_DIST = \
dist-hook:
rm -rf `find $(distdir) -name .svn`
-## Eventually delete these files
-##
-EXTRA_DIST += Makefile.am.orig configure.in.orig
-
diff --git a/Build/source/texk/xdvipdfmx/Makefile.am.orig b/Build/source/texk/xdvipdfmx/Makefile.am.orig
deleted file mode 100644
index 4e989542e83..00000000000
--- a/Build/source/texk/xdvipdfmx/Makefile.am.orig
+++ /dev/null
@@ -1,5 +0,0 @@
-# SUBDIRS = data src
-
-# skip the data subdir; we rely on dvipdfmx to provide those files
-SUBDIRS = src
-ACLOCAL_AMFLAGS = -I m4
diff --git a/Build/source/texk/xdvipdfmx/Makefile.in b/Build/source/texk/xdvipdfmx/Makefile.in
index e523b09a62f..948a5afa2f6 100644
--- a/Build/source/texk/xdvipdfmx/Makefile.in
+++ b/Build/source/texk/xdvipdfmx/Makefile.in
@@ -254,9 +254,18 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
@build_TRUE@SUBDIRS = src
-EXTRA_DIST = BUGS ChangeLog.TL contrib data doc index.html \
- style_base.css style_dflt.css style_ie.css style_plain.css \
- Makefile.am.orig configure.in.orig
+EXTRA_DIST = \
+ BUGS \
+ ChangeLog.TL \
+ contrib \
+ data \
+ doc \
+ index.html \
+ style_base.css \
+ style_dflt.css \
+ style_ie.css \
+ style_plain.css
+
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/Build/source/texk/xdvipdfmx/configure.in.orig b/Build/source/texk/xdvipdfmx/configure.in.orig
deleted file mode 100644
index 0f9f4a615bb..00000000000
--- a/Build/source/texk/xdvipdfmx/configure.in.orig
+++ /dev/null
@@ -1,181 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(src/dvipdfmx.c)
-AM_INIT_AUTOMAKE(xdvipdfmx, 0.7.3)
-AM_CONFIG_HEADER(config.h)
-AM_MAINTAINER_MODE
-
-dnl Checks for programs.
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PROG_LIBTOOL
-
-AC_SYS_LARGEFILE
-AC_FUNC_FSEEKO
-
-# Building inside teTeX or TeX Live?
-AC_ARG_ENABLE(tetex-build, [ --enable-tetex-build build as part of a teTeX installation])
-
-
-dnl Check for kpathsea library. (required)
-if test "x$enable_tetex_build" = xyes; then
- # In teTeX and TeX Live, LDFLAGS is passed by texk/Makefile and
- # reserved for the user. Therefore we need another variable for the
- # loader flags to find the local kpathsea. We use xdvipdfmx_LDFLAGS
- # since Automake already sets that up in the link command.
- xdvipdfmx_LDFLAGS=
- AC_SUBST(xdvipdfmx_LDFLAGS)
-
- if test ! -d $srcdir/../../texk/kpathsea; then
- AC_MSG_ERROR([
-=========================================
-
-You specified --enable-tetex-build, but I can't find the kpathsea
-directory. I expected it to be in $srcdir/../../texk/kpathsea.
-
-=========================================])
- fi
- CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/../../texk -I\$(top_srcdir)/../../texk"
- xdvipdfmx_LDFLAGS="-L\$(top_builddir)/../../texk/kpathsea/.libs"
-
- AM_CONDITIONAL(TDS_VERSION_11, true)
- AC_DEFINE([__TDS_VERSION__], 0x200406L)
-else
- dnl Don't bother going further if we don't have kpse installed.
- AC_ARG_WITH(kpathsea,
- [ --with-kpathsea=DIR use kpathsea include/library files from DIR], [
- if test -d "$withval"; then
- CPPFLAGS="$CPPFLAGS -I$withval/include"
- LDFLAGS="$LDFLAGS -L$withval/lib"
- fi
- ], [
- if test -d "$prefix"; then
- CPPFLAGS="$CPPFLAGS -I$prefix/include"
- LDFLAGS="$LDFLAGS -L$prefix/lib"
- else
- CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include"
- LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib"
- fi
- ])
-
- AC_CHECK_LIB(kpathsea, kpse_find_file, [LIBS="-lkpathsea $LIBS"],
- AC_MSG_ERROR([kpathsea library not found
-This version of xdvipdfmx requires the kpathsea library and its headers. If
-you know where it is you might try setting the LDFLAGS environment variable
-with -L pointing to the directory containing libkpathsea.a.
- ])
- )
-
- dnl Check kpathsea support for required formats and funcs.
- CHO_CHECK_KPSE_SUPPORT([xdvipdfmx])
-
- dnl Check for TDS version kpathsea library supports.
- CHO_CHECK_KPSE_TDS_VERSION
-
- dnl Check for libfreetype, required for xdvipdfmx features
- CHO_CHECK_LIBFREETYPE([xdvipdfmx])
-fi
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-AC_CHECK_HEADERS(stdint.h inttypes.h sys/types.h)
-
-dnl Checks for library functions.
-AC_FUNC_MEMCMP
-AC_CHECK_FUNCS(open close system getenv mkstemp basename)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-MAW_EXT_TIMEZONE
-MAW_TZ_HAS_TM_GMTOFF
-
-AC_C_CONST
-AC_C_INLINE
-AC_TYPE_SIZE_T
-AC_STRUCT_TM
-AC_STRUCT_TIMEZONE
-AC_C_BIGENDIAN
-
-AC_CHECK_SIZEOF(char)
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-
-
-dnl Check for additonal libraries.
-
-JFK_HAS_APP_SERVICES
-if test "x$have_app_services" = xno; then
- CHO_HAS_LIBFONTCONFIG
-fi
-
-# check that it's valid to define XETEX and possibly XETEX_MAC
-if test "x$have_app_services" = xyes; then
- AC_DEFINE([XETEX], [], [Define if part of a teTeX/TeX live build.])
- AC_DEFINE([XETEX_MAC], [], [Define if part of a teTeX/TeX live build for Mac OS X.])
-elif test "x$have_libfontconfig" = xyes; then
- AC_DEFINE([XETEX])
-else
- AC_MSG_ERROR([fontconfig library or ApplicationServices framework not found.
-This version of xdvipdfmx requires either ApplicationServices (on Mac OS X)
-or the fontconfig library (on other platforms) to be available, otherwise it
-cannot support XeTeX output using standard system-installed fonts.
- ])
-fi
-
-if test "x$enable_tetex_build" = xyes; then
- # Get these common libraries from the sources, too.
- # Seems like it would be simpler to treat kpathsea this way too, but
- # we're just starting from what lcdf-typetools did.
- sinclude(../../libs/zlib/withenable.ac)
- sinclude(../../libs/zlib/zlib.ac)
-
- sinclude(../../libs/libpng/withenable.ac)
- sinclude(../../libs/libpng/libpng.ac)
-
- sinclude(../../libs/freetype2/withenable.ac)
- sinclude(../../libs/freetype2/freetype2.ac)
-
- # yes, we have zlib and png.
- AC_DEFINE(HAVE_ZLIB)
- AC_DEFINE(HAVE_LIBPNG)
- AC_DEFINE([HAVE_FREETYPE2], [], [Define if you have freetype2 and its headers])
-
- # You must define HAVE_ZLIB_COMPRESS2 to enable '-z' option for controlling
- # zlib compression level, but zlib.ac included above does not do this test.
- # We assume zlib always has compress2() here although that's not always true.
- AC_DEFINE([HAVE_ZLIB_COMPRESS2], 1)
-
- # tetex/tex live build; this always has kpathsea, xbasename, etc.,
- # as we're building from current sources. Do this stuff at the end so
- # other configure tests don't try to link with kpathsea (which doesn't
- # exist at configure time).
- LIBS="-lkpathsea -lm $LIBS"
- xdvipdfmx_LDFLAGS="$xdvipdfmx_LDFLAGS $FONTCONFIGLDFLAGS"
- AC_SUBST(xdvipdfmx_LDFLAGS)
- AC_MSG_NOTICE([tetex build enabled, LIBS now: $LIBS])
-else
- CHO_HAS_LIBPAPER
- CHO_HAS_ZLIB
- CHO_HAS_LIBPNG
-
-dnl these variables are defined in the tetex case and used in src/Makefile.am.
-dnl just let them be empty.
- AC_SUBST(LIBPNGCPPFLAGS)
- AC_SUBST(LDLIBPNG)
- AC_SUBST(LIBPNGDEP)
- AC_SUBST(ZLIBCPPFLAGS)
- AC_SUBST(LDZLIB)
- AC_SUBST(ZLIBDEP)
- AC_SUBST(FREETYPE2CPPFLAGS)
- AC_SUBST(LDFREETYPE2)
- AC_SUBST(FREETYPE2DEP)
- AC_SUBST(dvipdfmx_LDFLAGS)
- AC_SUBST(xdvipdfmx_LDFLAGS)
-fi
-
-AC_CONFIG_FILES([Makefile data/Makefile src/Makefile])
-AC_OUTPUT
-
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index ffc38539cec..d6877341834 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -1461,7 +1461,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-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