summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2010-04-11 10:51:47 +0000
committerNorbert Preining <preining@logic.at>2010-04-11 10:51:47 +0000
commit412f83e27b51d4235fa69c5964263bdadb6b681f (patch)
tree5a5c98a9c7b0e0a7ecd731388dc951e4c544b80e /Build/source/texk
parent27ac36df62fb4d7f7c48fd26659067768f5e6fff (diff)
fixing building of ptex, and add ptrip.test so that build goes through
git-svn-id: svn://tug.org/texlive/trunk@17802 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/Makefile.in1
-rwxr-xr-xBuild/source/texk/configure22
-rwxr-xr-xBuild/source/texk/dvipng/configure15
-rw-r--r--Build/source/texk/web2c/Makefile.in535
-rw-r--r--Build/source/texk/web2c/aclocal.m44
-rw-r--r--Build/source/texk/web2c/ptexdir/am/ptex.am3
-rwxr-xr-xBuild/source/texk/web2c/ptexdir/ptrip.test61
-rw-r--r--Build/source/texk/web2c/web2c/Makefile.in13
-rw-r--r--Build/source/texk/web2c/web2c/aclocal.m46
-rwxr-xr-xBuild/source/texk/web2c/web2c/configure6
10 files changed, 533 insertions, 133 deletions
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in
index 134384a07b3..7071b6dfb17 100644
--- a/Build/source/texk/Makefile.in
+++ b/Build/source/texk/Makefile.in
@@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
$(top_srcdir)/../texk/lcdf-typetools/ac/withenable.ac \
$(top_srcdir)/../texk/lcdf-typetools/ac/lcdf-typetools.ac \
$(top_srcdir)/../texk/makeindexk/ac/withenable.ac \
+ $(top_srcdir)/../texk/makejvf/ac/withenable.ac \
$(top_srcdir)/../texk/mendexk/ac/withenable.ac \
$(top_srcdir)/../texk/musixflx/ac/withenable.ac \
$(top_srcdir)/../texk/ps2pkm/ac/withenable.ac \
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 609df1d675a..d69f255e94e 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -722,6 +722,7 @@ enable_t1testpage
enable_ttftotype42
enable_updmap
enable_makeindexk
+enable_makejvf
enable_mendexk
enable_musixflx
enable_ps2pkm
@@ -1511,6 +1512,7 @@ Optional Features:
--disable-auto-t1dotlessj disable running t1dotlessj from otftotfm
--disable-auto-updmap disable running updmap from otftotfm
--disable-makeindexk do not build the makeindexk package
+ --disable-makejvf do not build the makejvf package
--disable-mendexk do not build the mendexk package
--disable-musixflx do not build the musixflx package
--disable-ps2pkm do not build the ps2pkm package
@@ -3264,6 +3266,26 @@ test "x$enable_makeindexk" = xno || {
}
+# Check whether --enable-makejvf was given.
+if test "${enable_makejvf+set}" = set; then :
+ enableval=$enable_makejvf;
+fi
+case $enable_makejvf in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_makejvf=$enable_all_pkgs
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-makejvf=$enable_makejvf'" >&5
+$as_echo "$as_me: Assuming \`--enable-makejvf=$enable_makejvf'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-makejvf=$enable_makejvf'"
+ ;;
+esac
+
+test "x$enable_makejvf" = xno || {
+ need_kpathsea=yes
+}
+
## texk/mendexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/mendexk/
## configure options and TL libraries required for makeindexk
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index 582474e9998..bc8c5073c4d 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -2183,11 +2183,11 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
+ enum { N = $2 / 2 - 1 };
int
main ()
{
-static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 };
- 0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
+static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
test_array [0] = 0
;
@@ -2198,11 +2198,11 @@ if ac_fn_c_try_compile "$LINENO"; then :
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
+ enum { N = $2 / 2 - 1 };
int
main ()
{
-static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 };
- ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
+static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
< ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
test_array [0] = 0
@@ -13260,6 +13260,7 @@ int
main ()
{
char *data, *data2, *data3;
+ const char *cdata2;
int i, pagesize;
int fd, fd2;
@@ -13284,10 +13285,10 @@ main ()
fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
if (fd2 < 0)
return 4;
- data2 = "";
- if (write (fd2, data2, 1) != 1)
+ cdata2 = "";
+ if (write (fd2, cdata2, 1) != 1)
return 5;
- data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
+ data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
if (data2 == MAP_FAILED)
return 6;
for (i = 0; i < pagesize; ++i)
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 19e5377943f..8951deec43b 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35,22 +35,24 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEEXT) \
- mf-nowin$(EXEEXT) mpost$(EXEEXT) etex$(EXEEXT) pdftex$(EXEEXT) \
- ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) luatex$(EXEEXT) \
- xetex$(EXEEXT) $(am__EXEEXT_4) aleph$(EXEEXT)
+ mf-nowin$(EXEEXT) mpost$(EXEEXT) etex$(EXEEXT) ptex$(EXEEXT) \
+ pdftex$(EXEEXT) ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) \
+ luatex$(EXEEXT) xetex$(EXEEXT) $(am__EXEEXT_4) aleph$(EXEEXT)
bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \
$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
$(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) \
$(am__EXEEXT_13) $(am__EXEEXT_14) $(am__EXEEXT_15) \
- $(am__EXEEXT_16) synctex$(EXEEXT)
+ $(am__EXEEXT_16) $(am__EXEEXT_17) synctex$(EXEEXT)
noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT)
-check_PROGRAMS = $(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \
- $(am__EXEEXT_20) $(am__EXEEXT_21) md5main$(EXEEXT)
-TESTS = tangle.test $(am__EXEEXT_24) ctiedir/ctie.test \
+check_PROGRAMS = $(am__EXEEXT_18) $(am__EXEEXT_19) $(am__EXEEXT_20) \
+ $(am__EXEEXT_21) $(am__EXEEXT_22) $(am__EXEEXT_23) \
+ md5main$(EXEEXT)
+TESTS = tangle.test $(am__EXEEXT_26) ctiedir/ctie.test \
cwebdir/cweave.test tiedir/tie.test $(am__append_4) \
$(am__append_10) $(am__append_13) $(am__append_17) \
- $(am__append_38) $(am__append_39) libmd5/md5.test
+ $(am__append_21) $(am__append_42) $(am__append_43) \
+ libmd5/md5.test
DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
$(srcdir)/../../build-aux/config.guess \
$(srcdir)/../../build-aux/config.sub \
@@ -74,7 +76,7 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
$(srcdir)/pdftexdir/am/libpdftex.am \
$(srcdir)/pdftexdir/am/pdftex.am \
$(srcdir)/pdftexdir/am/pdftosrc.am \
- $(srcdir)/pdftexdir/am/ttf2afm.am \
+ $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/ptexdir/am/ptex.am \
$(srcdir)/synctexdir/am/synctex.am $(srcdir)/tangle-sh.in \
$(srcdir)/web2c-sh.in $(srcdir)/xetexdir/am/xetex.am \
$(top_srcdir)/configure \
@@ -103,29 +105,33 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
@ETEX_TRUE@am__append_17 = $(etex_tests)
@ETEX_TRUE@am__append_18 = dvitype pltotf tftopl
@ETEX_TRUE@am__append_19 = etrip.diffs
-@PDFTEX_TRUE@am__append_20 = pdftex ttf2afm pdftosrc
-@MINGW32_TRUE@am__append_21 = \
+@PTEX_TRUE@am__append_20 = ptex pbibtex pdvitype ptftopl ppltotf
+@PTEX_TRUE@am__append_21 = $(ptex_tests)
+@PTEX_TRUE@am__append_22 = pdvitype ppltotf ptftopl
+@PTEX_TRUE@am__append_23 = ptrip.diffs
+@PDFTEX_TRUE@am__append_24 = pdftex ttf2afm pdftosrc
+@MINGW32_TRUE@am__append_25 = \
@MINGW32_TRUE@ pdftexdir/regex/regex.c \
@MINGW32_TRUE@ pdftexdir/regex/regex.h
-@LUATEX_TRUE@am__append_22 = luatex
-@MINGW32_FALSE@am__append_23 = -DLUA_USE_POSIX
-@XETEX_TRUE@am__append_24 = xetex
-@XETEX_MACOSX_TRUE@am__append_25 = -DXETEX_MAC
-@XETEX_MACOSX_TRUE@am__append_26 = libxetexmm.a
-@XETEX_MACOSX_FALSE@am__append_27 = -DXETEX_OTHER $(XPDF_INCLUDES) \
+@LUATEX_TRUE@am__append_26 = luatex
+@MINGW32_FALSE@am__append_27 = -DLUA_USE_POSIX
+@XETEX_TRUE@am__append_28 = xetex
+@XETEX_MACOSX_TRUE@am__append_29 = -DXETEX_MAC
+@XETEX_MACOSX_TRUE@am__append_30 = libxetexmm.a
+@XETEX_MACOSX_FALSE@am__append_31 = -DXETEX_OTHER $(XPDF_INCLUDES) \
@XETEX_MACOSX_FALSE@ $(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES)
-@XETEX_MACOSX_FALSE@am__append_28 = $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
-@XETEX_MACOSX_FALSE@am__append_29 = $(XPDF_DEPEND) $(LIBPNG_DEPEND)
-@XETEX_GRAPHITE_TRUE@am__append_30 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
-@XETEX_GRAPHITE_TRUE@am__append_31 = $(GRAPHITE_LIBS)
-@XETEX_GRAPHITE_TRUE@am__append_32 = $(GRAPHITE_DEPEND)
-@XETEX_MACOSX_TRUE@am__append_33 = \
+@XETEX_MACOSX_FALSE@am__append_32 = $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
+@XETEX_MACOSX_FALSE@am__append_33 = $(XPDF_DEPEND) $(LIBPNG_DEPEND)
+@XETEX_GRAPHITE_TRUE@am__append_34 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
+@XETEX_GRAPHITE_TRUE@am__append_35 = $(GRAPHITE_LIBS)
+@XETEX_GRAPHITE_TRUE@am__append_36 = $(GRAPHITE_DEPEND)
+@XETEX_MACOSX_TRUE@am__append_37 = \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.cpp \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.h \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeX_mac.c
-@XETEX_MACOSX_FALSE@am__append_34 = \
+@XETEX_MACOSX_FALSE@am__append_38 = \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeX_pic.c \
@@ -142,38 +148,38 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
@XETEX_MACOSX_FALSE@ xetexdir/pngimage.c \
@XETEX_MACOSX_FALSE@ xetexdir/pngimage.h
-@XETEX_GRAPHITE_TRUE@am__append_35 = \
+@XETEX_GRAPHITE_TRUE@am__append_39 = \
@XETEX_GRAPHITE_TRUE@ xetexdir/XeTeXGrLayout.cpp \
@XETEX_GRAPHITE_TRUE@ xetexdir/XeTeXGrLayout.h
-@OTANGLE_TRUE@am__append_36 = $(omegaware_tools)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_37 = $(omegaware_font_tools)
-@OTANGLE_TRUE@am__append_38 = $(OTANGLE_tests)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_39 = $(OMFONTS_tests)
-@OTANGLE_TRUE@am__append_40 = pltotf tftopl
-@ALEPH_TRUE@am__append_41 = aleph
-@TEX_SYNCTEX_TRUE@am__append_42 = -I$(srcdir)/synctexdir \
+@OTANGLE_TRUE@am__append_40 = $(omegaware_tools)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_41 = $(omegaware_font_tools)
+@OTANGLE_TRUE@am__append_42 = $(OTANGLE_tests)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_43 = $(OMFONTS_tests)
+@OTANGLE_TRUE@am__append_44 = pltotf tftopl
+@ALEPH_TRUE@am__append_45 = aleph
+@TEX_SYNCTEX_TRUE@am__append_46 = -I$(srcdir)/synctexdir \
@TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__
-@TEX_SYNCTEX_TRUE@am__append_43 = $(ZLIB_LIBS)
-@TEX_SYNCTEX_TRUE@am__append_44 = $(ZLIB_DEPEND)
-@TEX_SYNCTEX_TRUE@am__append_45 = \
+@TEX_SYNCTEX_TRUE@am__append_47 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_48 = $(ZLIB_DEPEND)
+@TEX_SYNCTEX_TRUE@am__append_49 = \
@TEX_SYNCTEX_TRUE@ synctex.c
-@ETEX_SYNCTEX_TRUE@am__append_46 = -I$(srcdir)/synctexdir \
+@ETEX_SYNCTEX_TRUE@am__append_50 = -I$(srcdir)/synctexdir \
@ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__
-@ETEX_SYNCTEX_TRUE@am__append_47 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_48 = $(ZLIB_DEPEND)
-@ETEX_SYNCTEX_TRUE@am__append_49 = \
+@ETEX_SYNCTEX_TRUE@am__append_51 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_52 = $(ZLIB_DEPEND)
+@ETEX_SYNCTEX_TRUE@am__append_53 = \
@ETEX_SYNCTEX_TRUE@ synctex-e.c
-@PDFTEX_SYNCTEX_TRUE@am__append_50 = -I$(srcdir)/synctexdir \
+@PDFTEX_SYNCTEX_TRUE@am__append_54 = -I$(srcdir)/synctexdir \
@PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__
-@PDFTEX_SYNCTEX_TRUE@am__append_51 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_55 = \
@PDFTEX_SYNCTEX_TRUE@ synctex-pdf.c
-@XETEX_SYNCTEX_TRUE@am__append_52 = -I$(srcdir)/synctexdir \
+@XETEX_SYNCTEX_TRUE@am__append_56 = -I$(srcdir)/synctexdir \
@XETEX_SYNCTEX_TRUE@ -D__SyncTeX__
-@XETEX_SYNCTEX_TRUE@am__append_53 = \
+@XETEX_SYNCTEX_TRUE@am__append_57 = \
@XETEX_SYNCTEX_TRUE@ synctex-xe.c
subdir = .
@@ -193,6 +199,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-lt-hack.m4 \
$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
$(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
$(top_srcdir)/../../m4/kpse-teckit-flags.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
@@ -548,22 +555,26 @@ am__EXEEXT_4 = $(am__EXEEXT_2) $(am__EXEEXT_3)
@MFN_TRUE@@MF_TRUE@am__EXEEXT_8 = mf-nowin$(EXEEXT)
@MP_TRUE@am__EXEEXT_9 = mpost$(EXEEXT)
@ETEX_TRUE@am__EXEEXT_10 = etex$(EXEEXT)
-@PDFTEX_TRUE@am__EXEEXT_11 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
+@PTEX_TRUE@am__EXEEXT_11 = ptex$(EXEEXT) pbibtex$(EXEEXT) \
+@PTEX_TRUE@ pdvitype$(EXEEXT) ptftopl$(EXEEXT) ppltotf$(EXEEXT)
+@PDFTEX_TRUE@am__EXEEXT_12 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
@PDFTEX_TRUE@ pdftosrc$(EXEEXT)
-@LUATEX_TRUE@am__EXEEXT_12 = luatex$(EXEEXT)
-@XETEX_TRUE@am__EXEEXT_13 = xetex$(EXEEXT)
-@OTANGLE_TRUE@am__EXEEXT_14 = $(am__EXEEXT_2)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__EXEEXT_15 = $(am__EXEEXT_3)
-@ALEPH_TRUE@am__EXEEXT_16 = aleph$(EXEEXT)
+@LUATEX_TRUE@am__EXEEXT_13 = luatex$(EXEEXT)
+@XETEX_TRUE@am__EXEEXT_14 = xetex$(EXEEXT)
+@OTANGLE_TRUE@am__EXEEXT_15 = $(am__EXEEXT_2)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__EXEEXT_16 = $(am__EXEEXT_3)
+@ALEPH_TRUE@am__EXEEXT_17 = aleph$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
"$(DESTDIR)$(man5dir)"
-@TEX_TRUE@am__EXEEXT_17 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@TEX_TRUE@am__EXEEXT_18 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
@TEX_TRUE@ tftopl$(EXEEXT)
-@MF_TRUE@am__EXEEXT_18 = gftype$(EXEEXT) tftopl$(EXEEXT)
-@MP_TRUE@am__EXEEXT_19 = pltotf$(EXEEXT) tftopl$(EXEEXT)
-@ETEX_TRUE@am__EXEEXT_20 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@MF_TRUE@am__EXEEXT_19 = gftype$(EXEEXT) tftopl$(EXEEXT)
+@MP_TRUE@am__EXEEXT_20 = pltotf$(EXEEXT) tftopl$(EXEEXT)
+@ETEX_TRUE@am__EXEEXT_21 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
@ETEX_TRUE@ tftopl$(EXEEXT)
-@OTANGLE_TRUE@am__EXEEXT_21 = pltotf$(EXEEXT) tftopl$(EXEEXT)
+@PTEX_TRUE@am__EXEEXT_22 = pdvitype$(EXEEXT) ppltotf$(EXEEXT) \
+@PTEX_TRUE@ ptftopl$(EXEEXT)
+@OTANGLE_TRUE@am__EXEEXT_23 = pltotf$(EXEEXT) tftopl$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am_aleph_OBJECTS = aleph-aleph.$(OBJEXT) aleph-alephbis.$(OBJEXT)
am__objects_12 = aleph-alephini.$(OBJEXT) aleph-aleph0.$(OBJEXT)
@@ -714,6 +725,10 @@ nodist_patgen_OBJECTS = patgen.$(OBJEXT)
patgen_OBJECTS = $(nodist_patgen_OBJECTS)
patgen_LDADD = $(LDADD)
patgen_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
+nodist_pbibtex_OBJECTS = pbibtex.$(OBJEXT)
+pbibtex_OBJECTS = $(nodist_pbibtex_OBJECTS)
+pbibtex_DEPENDENCIES = $(pproglib) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2)
am__dist_pdftex_SOURCES_DIST = synctexdir/synctex.h \
synctexdir/synctex-common.h synctexdir/synctex-pdftex.h
dist_pdftex_OBJECTS =
@@ -732,6 +747,10 @@ pdftosrc_OBJECTS = $(am_pdftosrc_OBJECTS)
pdftosrc_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftosrc_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+nodist_pdvitype_OBJECTS = pdvitype-pdvitype.$(OBJEXT)
+pdvitype_OBJECTS = $(nodist_pdvitype_OBJECTS)
+pdvitype_DEPENDENCIES = $(pproglib) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2)
nodist_pktogf_OBJECTS = pktogf.$(OBJEXT)
pktogf_OBJECTS = $(nodist_pktogf_OBJECTS)
pktogf_LDADD = $(LDADD)
@@ -748,6 +767,23 @@ nodist_pooltype_OBJECTS = pooltype.$(OBJEXT)
pooltype_OBJECTS = $(nodist_pooltype_OBJECTS)
pooltype_LDADD = $(LDADD)
pooltype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
+nodist_ppltotf_OBJECTS = ppltotf-ppltotf.$(OBJEXT)
+ppltotf_OBJECTS = $(nodist_ppltotf_OBJECTS)
+ppltotf_DEPENDENCIES = $(pproglib) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2)
+am__objects_18 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
+nodist_ptex_OBJECTS = $(am__objects_18) ptex-ptex-pool.$(OBJEXT) \
+ ptex-ptexextra.$(OBJEXT) ptex-kanji.$(OBJEXT)
+ptex_OBJECTS = $(nodist_ptex_OBJECTS)
+ptex_DEPENDENCIES = $(pproglib) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+ptex_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(ptex_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+nodist_ptftopl_OBJECTS = ptftopl.$(OBJEXT)
+ptftopl_OBJECTS = $(nodist_ptftopl_OBJECTS)
+ptftopl_DEPENDENCIES = $(pproglib) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2)
am_synctex_OBJECTS = synctex-synctex_main.$(OBJEXT) \
synctex-synctex_parser.$(OBJEXT) \
synctex-synctex_parser_utils.$(OBJEXT)
@@ -766,10 +802,10 @@ tangleboot_LDADD = $(LDADD)
am__dist_tex_SOURCES_DIST = synctexdir/synctex.h \
synctexdir/synctex-common.h synctexdir/synctex-tex.h
dist_tex_OBJECTS =
-am__objects_18 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
-@TEX_SYNCTEX_TRUE@am__objects_19 = tex-synctex.$(OBJEXT)
-nodist_tex_OBJECTS = $(am__objects_18) tex-tex-pool.$(OBJEXT) \
- tex-texextra.$(OBJEXT) $(am__objects_19)
+am__objects_19 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
+@TEX_SYNCTEX_TRUE@am__objects_20 = tex-synctex.$(OBJEXT)
+nodist_tex_OBJECTS = $(am__objects_19) tex-tex-pool.$(OBJEXT) \
+ tex-texextra.$(OBJEXT) $(am__objects_20)
tex_OBJECTS = $(dist_tex_OBJECTS) $(nodist_tex_OBJECTS)
@TEX_SYNCTEX_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
@@ -809,10 +845,10 @@ weave_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
am__dist_xetex_SOURCES_DIST = synctexdir/synctex.h \
synctexdir/synctex-common.h synctexdir/synctex-xetex.h
dist_xetex_OBJECTS =
-am__objects_20 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
-@XETEX_SYNCTEX_TRUE@am__objects_21 = xetex-synctex-xe.$(OBJEXT)
-nodist_xetex_OBJECTS = $(am__objects_20) xetex-xetex_pool.$(OBJEXT) \
- xetex-xetexextra.$(OBJEXT) $(am__objects_21)
+am__objects_21 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
+@XETEX_SYNCTEX_TRUE@am__objects_22 = xetex-synctex-xe.$(OBJEXT)
+nodist_xetex_OBJECTS = $(am__objects_21) xetex-xetex_pool.$(OBJEXT) \
+ xetex-xetexextra.$(OBJEXT) $(am__objects_22)
xetex_OBJECTS = $(dist_xetex_OBJECTS) $(nodist_xetex_OBJECTS)
@XETEX_MACOSX_FALSE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) \
@XETEX_MACOSX_FALSE@ $(am__DEPENDENCIES_1) \
@@ -870,18 +906,21 @@ SOURCES = $(libff_a_SOURCES) $(liblua51_a_SOURCES) \
$(nodist_ofm2opl_SOURCES) $(nodist_opl2ofm_SOURCES) \
$(nodist_otangle_SOURCES) $(nodist_ovf2ovp_SOURCES) \
$(nodist_ovp2ovf_SOURCES) $(nodist_patgen_SOURCES) \
- $(dist_pdftex_SOURCES) $(nodist_pdftex_SOURCES) \
- $(nodist_EXTRA_pdftex_SOURCES) $(pdftosrc_SOURCES) \
- $(nodist_EXTRA_pdftosrc_SOURCES) $(nodist_pktogf_SOURCES) \
+ $(nodist_pbibtex_SOURCES) $(dist_pdftex_SOURCES) \
+ $(nodist_pdftex_SOURCES) $(nodist_EXTRA_pdftex_SOURCES) \
+ $(pdftosrc_SOURCES) $(nodist_EXTRA_pdftosrc_SOURCES) \
+ $(nodist_pdvitype_SOURCES) $(nodist_pktogf_SOURCES) \
$(nodist_pktype_SOURCES) $(nodist_pltotf_SOURCES) \
- $(nodist_pooltype_SOURCES) $(synctex_SOURCES) \
- $(nodist_tangle_SOURCES) $(nodist_tangleboot_SOURCES) \
- $(dist_tex_SOURCES) $(nodist_tex_SOURCES) \
- $(nodist_tftopl_SOURCES) $(nodist_tie_SOURCES) \
- $(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES) \
- $(nodist_vftovp_SOURCES) $(nodist_vptovf_SOURCES) \
- $(nodist_weave_SOURCES) $(dist_xetex_SOURCES) \
- $(nodist_xetex_SOURCES) $(nodist_EXTRA_xetex_SOURCES)
+ $(nodist_pooltype_SOURCES) $(nodist_ppltotf_SOURCES) \
+ $(nodist_ptex_SOURCES) $(nodist_ptftopl_SOURCES) \
+ $(synctex_SOURCES) $(nodist_tangle_SOURCES) \
+ $(nodist_tangleboot_SOURCES) $(dist_tex_SOURCES) \
+ $(nodist_tex_SOURCES) $(nodist_tftopl_SOURCES) \
+ $(nodist_tie_SOURCES) $(ttf2afm_SOURCES) \
+ $(EXTRA_ttf2afm_SOURCES) $(nodist_vftovp_SOURCES) \
+ $(nodist_vptovf_SOURCES) $(nodist_weave_SOURCES) \
+ $(dist_xetex_SOURCES) $(nodist_xetex_SOURCES) \
+ $(nodist_EXTRA_xetex_SOURCES)
DIST_SOURCES = $(libff_a_SOURCES) $(liblua51_a_SOURCES) \
$(libluamisc_a_SOURCES) $(EXTRA_libluamisc_a_SOURCES) \
$(libluasocket_a_SOURCES) $(libluatex_a_SOURCES) \
@@ -935,13 +974,13 @@ ETAGS = etags
CTAGS = ctags
am__tty_colors = \
red=; grn=; lgn=; blu=; std=
-am__EXEEXT_22 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
+am__EXEEXT_24 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
gftopk.test gftype.test mft.test patgen.test pktogf.test \
pktype.test pltotf.test pooltype.test tftopl.test vftovp.test \
vptovf.test weave.test
-am__EXEEXT_23 = $(am__EXEEXT_22) tests/bibtex-openout-test.pl \
+am__EXEEXT_25 = $(am__EXEEXT_24) tests/bibtex-openout-test.pl \
tests/bibtex-longline-test.pl tests/bibtex-mem.test
-@WEB_TRUE@am__EXEEXT_24 = $(am__EXEEXT_23)
+@WEB_TRUE@am__EXEEXT_26 = $(am__EXEEXT_25)
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
@@ -1079,6 +1118,9 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PTEXENC_DEPEND = @PTEXENC_DEPEND@
+PTEXENC_INCLUDES = @PTEXENC_INCLUDES@
+PTEXENC_LIBS = @PTEXENC_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
@@ -1181,7 +1223,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
version = $(WEB2CVERSION)
-SUBDIRS = doc lib man web2c . window omegafonts otps
+SUBDIRS = doc lib man web2c . window omegafonts otps ptexdir/lib
proglib = lib/lib.a
dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
nodist_man_MANS = ctiedir/ctie.1 tiedir/tie.1
@@ -1243,7 +1285,18 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h triptrap-sh \
etexdir/etrip/etrip3.in etexdir/etrip/etripin.log \
etexdir/etrip/etripman.tex etexdir/etrip/texmf.cnf \
etexdir/etrip/trip2.in etexdir/etex.mak etexdir/etex.mk \
- $(pdftex_ch_srcs) pdftexdir/pdftex.defines pdftexdir/pdftex.h \
+ $(ptex_web_srcs) $(ptex_ch_srcs) ptexdir/ptexextra.in \
+ lib/texmfmp.c tmf-pool.h ptexdir/ChangeLog ptexdir/INSTALL \
+ ptexdir/README ptexdir/ptex_gen.tex $(ptex_tests) \
+ ptexdir/ptrip/ptrip.diffs ptexdir/ptrip/ptrip.fot \
+ ptexdir/ptrip/ptrip.log ptexdir/ptrip/ptrip.out \
+ ptexdir/ptrip/ptrip.pl ptexdir/ptrip/ptrip.tex \
+ ptexdir/ptrip/ptrip.typ ptexdir/ptrip/ptrip1.in \
+ ptexdir/ptrip/ptrip2.in ptexdir/ptrip/ptrip3.in \
+ ptexdir/ptrip/ptripin.log ptexdir/ptrip/ptripman.tex \
+ ptexdir/ptrip/texmf.cnf ptexdir/ptrip/trip2.in \
+ ptexdir/ptex.mak ptexdir/ptex.mk $(pdftex_ch_srcs) \
+ pdftexdir/pdftex.defines pdftexdir/pdftex.h \
pdftexdir/pdftexextra.in pdftexdir/ChangeLog pdftexdir/NEWS \
pdftexdir/README pdftexdir/change-files.txt \
pdftexdir/pdftex.mak pdftexdir/pdftex.mk \
@@ -1414,6 +1467,8 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
memio-tangle mp-tangle psout-tangle svgout-tangle tfmin-tangle \
$(nodist_etex_SOURCES) etex.web etex.ch etex-web2c etex.p \
etex.pool etex-tangle etexdir/etex.version etrip.diffs \
+ $(nodist_ptex_SOURCES) ptex.web ptex.ch ptex-web2c ptex.p \
+ ptex.pool ptex-tangle ptexdir/ptex.version ptrip.diffs \
$(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c pdftex.p \
pdftex.pool pdftex-tangle pdftexdir/pdftex.version \
$(nodist_libluatex_a_SOURCES) $(nodist_xetex_SOURCES) \
@@ -1432,7 +1487,7 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
aleph.web aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle
CLEANFILES =
TRIPTRAP = $(am__append_6) $(am__append_9) $(am__append_15) \
- $(am__append_19)
+ $(am__append_19) $(am__append_23)
web2c = $(SHELL) ./web2c-sh $@
makecpool = web2c/makecpool
@@ -1516,18 +1571,18 @@ cweave_CFLAGS = $(WARNING_CFLAGS)
nodist_tie_SOURCES = tie.c
tie_CPPFLAGS = -DNOT_WEB2C
tie_CFLAGS = $(WARNING_CFLAGS)
-tex_CPPFLAGS = $(am__append_42)
+tex_CPPFLAGS = $(am__append_46)
tex_CFLAGS = $(WARNING_CFLAGS)
# With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_43)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_47)
# TeX C sources
tex_c_h = texini.c tex0.c texcoerce.h texd.h
-nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c $(am__append_45)
+nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c $(am__append_49)
# We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_44)
+tex_prereq = texd.h $(am__append_48)
tex_ch_srcs = \
tex.web \
tex.ch \
@@ -1590,19 +1645,19 @@ svgout_c_h = mplibsvg.h mpsvgout.h svgout.c
tfmin_c_h = mptfmin.h tfmin.c
libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
mplibdir/memio.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(am__append_46)
+etex_CPPFLAGS = $(am__append_50)
etex_CFLAGS = $(WARNING_CFLAGS)
# With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_47)
+etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_51)
# e-TeX C sources
etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexextra.c \
- etexdir/etexextra.h $(am__append_49)
+ etexdir/etexextra.h $(am__append_53)
# We must create etexd.h before building the etex_OBJECTS.
-etex_prereq = etexd.h $(am__append_48)
+etex_prereq = etexd.h $(am__append_52)
etex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -1620,6 +1675,51 @@ etex_ch_srcs = \
# e-TeX Tests
#
etex_tests = etexdir/etrip.test
+ptex_CPPFLAGS = $(PTEXENC_INCLUDES)
+ptex_CFLAGS = $(WARNING_CFLAGS)
+
+# With --enable-ipc, pTeX may need to link with -lsocket.
+ptex_LDADD = $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ipc_socketlibs)
+pbibtex_LDADD = $(pproglib) $(PTEXENC_LIBS) $(LDADD)
+ptftopl_LDADD = $(pproglib) $(PTEXENC_LIBS) $(LDADD)
+ppltotf_LDADD = $(pproglib) $(PTEXENC_LIBS) $(LDADD)
+pdvitype_LDADD = $(pproglib) $(PTEXENC_LIBS) $(LDADD)
+pproglib = ptexdir/lib/lib.a
+
+# pTeX C sources
+ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
+nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c ptexextra.c ptexdir/ptexextra.h ptexdir/kanji.c ptexdir/kanji.h
+
+# We must create ptexd.h before building the ptex_OBJECTS.
+ptex_prereq = ptexd.h
+ptex_web_srcs = \
+ tex.web \
+ tex.ch
+
+ptex_ch_srcs = \
+ $(ptex_ch_synctex) \
+ ptexdir/ptex-base.ch \
+ ptexdir/ptex-include.ch \
+ tex-binpool.ch
+
+
+### pBibTeX
+nodist_pbibtex_SOURCES = pbibtex.c pbibtex.h
+
+### pDVItype
+nodist_pdvitype_SOURCES = pdvitype.c pdvitype.h
+pdvitype_CPPFLAGS = -DDHEX_CHAR_CODE
+
+### pTFtoPL
+nodist_ptftopl_SOURCES = ptftopl.c ptftopl.h
+
+### pPLtoTF
+nodist_ppltotf_SOURCES = ppltotf.c ppltotf.h
+ppltotf_CPPFLAGS = -DPRESERVE_PUTC
+
+# pTeX Tests
+#
+ptex_tests = ptexdir/ptrip.test
pdftex_cppflags = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) \
$(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 \
-I$(srcdir)/pdftexdir
@@ -1633,7 +1733,7 @@ pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) \
# Force Automake to use CXXLD for linking
nodist_EXTRA_pdftex_SOURCES = dummy.cxx
pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_50)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_54)
pdftex_CFLAGS = $(WARNING_CFLAGS)
pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
@@ -1642,7 +1742,7 @@ pdftex_LDADD = libpdftex.a $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs)
pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c pdftexextra.c \
- pdftexdir/pdftexextra.h $(am__append_51)
+ pdftexdir/pdftexextra.h $(am__append_55)
pdftex_ch_srcs = \
pdftexdir/pdftex.web \
pdftexdir/tex.ch0 \
@@ -1664,7 +1764,7 @@ libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \
pdftexdir/writejbig2.h pdftexdir/writejpg.c \
pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \
pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \
- $(am__append_21) pdftexdir/inc-epdf.h pdftexdir/inc-extra.h
+ $(am__append_25) pdftexdir/inc-epdf.h pdftexdir/inc-extra.h
EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \
pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \
pdftexdir/regex/regex_internal.h pdftexdir/regex/regexec.c
@@ -1699,7 +1799,7 @@ luatex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluatex.a \
$(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(XPDF_DEPEND) \
$(OBSDCOMPAT_DEPEND) libmd5.a libmplib.a
luatex_SOURCES = luatexdir/luatex_svnversion.h luatexdir/luatex.c luatexdir/luatex.h
-liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_23)
+liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_27)
liblua51_a_CFLAGS = # $(WARNING_CFLAGS)
liblua51_a_SOURCES = \
luatexdir/lua51/lapi.c \
@@ -2129,24 +2229,24 @@ libluatex_a_SOURCES = \
# Force Automake to use CXXLD for linking
nodist_EXTRA_xetex_SOURCES = dummy.cxx
-libxetex = libxetex.a $(am__append_26)
+libxetex = libxetex.a $(am__append_30)
xetex_cppflags = -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
- $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_25) \
- $(am__append_27) $(am__append_30) $(ZLIB_INCLUDES)
-xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_28) \
- $(am__append_31) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
+ $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_29) \
+ $(am__append_31) $(am__append_34) $(ZLIB_INCLUDES)
+xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_32) \
+ $(am__append_35) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
- $(TECKIT_DEPEND) $(am__append_29) $(am__append_32) \
+ $(TECKIT_DEPEND) $(am__append_33) $(am__append_36) \
$(FREETYPE2_DEPEND) $(ZLIB_DEPEND)
@XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_52)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_56)
xetex_CFLAGS = # $(WARNING_CFLAGS)
xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
xetex_prereq = $(libxetex)
xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h
nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c xetexextra.c \
- xetexdir/xetexextra.h $(am__append_53)
+ xetexdir/xetexextra.h $(am__append_57)
xetex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -2174,8 +2274,8 @@ libxetex_a_SOURCES = xetexdir/MathTable.h xetexdir/FontTableCache.cpp \
xetexdir/XeTeXOTMath.h xetexdir/XeTeX_ext.c \
xetexdir/XeTeX_ext.h xetexdir/XeTeXswap.h xetexdir/cmaps.cpp \
xetexdir/cmaps.h xetexdir/sfnt.h xetexdir/trans.c \
- xetexdir/trans.h xetexdir/xetex.h $(am__append_33) \
- $(am__append_34) $(am__append_35)
+ xetexdir/trans.h xetexdir/xetex.h $(am__append_37) \
+ $(am__append_38) $(am__append_39)
# We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
libxetex_prereq = xetexd.h $(xetex_dependencies)
@@ -2354,7 +2454,7 @@ all: c-auto.h ff-config.h
.SUFFIXES: .c .cc .cin .cpp .cxx .h .hin .lo .o .obj .p .pin
am--refresh:
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/liblua51.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/liblua51.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -2601,12 +2701,18 @@ ovp2ovf$(EXEEXT): $(ovp2ovf_OBJECTS) $(ovp2ovf_DEPENDENCIES)
patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES)
@rm -f patgen$(EXEEXT)
$(LINK) $(patgen_OBJECTS) $(patgen_LDADD) $(LIBS)
+pbibtex$(EXEEXT): $(pbibtex_OBJECTS) $(pbibtex_DEPENDENCIES)
+ @rm -f pbibtex$(EXEEXT)
+ $(LINK) $(pbibtex_OBJECTS) $(pbibtex_LDADD) $(LIBS)
pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES)
@rm -f pdftex$(EXEEXT)
$(pdftex_LINK) $(pdftex_OBJECTS) $(pdftex_LDADD) $(LIBS)
pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES)
@rm -f pdftosrc$(EXEEXT)
$(pdftosrc_LINK) $(pdftosrc_OBJECTS) $(pdftosrc_LDADD) $(LIBS)
+pdvitype$(EXEEXT): $(pdvitype_OBJECTS) $(pdvitype_DEPENDENCIES)
+ @rm -f pdvitype$(EXEEXT)
+ $(LINK) $(pdvitype_OBJECTS) $(pdvitype_LDADD) $(LIBS)
pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES)
@rm -f pktogf$(EXEEXT)
$(LINK) $(pktogf_OBJECTS) $(pktogf_LDADD) $(LIBS)
@@ -2619,6 +2725,15 @@ pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES)
pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES)
@rm -f pooltype$(EXEEXT)
$(LINK) $(pooltype_OBJECTS) $(pooltype_LDADD) $(LIBS)
+ppltotf$(EXEEXT): $(ppltotf_OBJECTS) $(ppltotf_DEPENDENCIES)
+ @rm -f ppltotf$(EXEEXT)
+ $(LINK) $(ppltotf_OBJECTS) $(ppltotf_LDADD) $(LIBS)
+ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES)
+ @rm -f ptex$(EXEEXT)
+ $(ptex_LINK) $(ptex_OBJECTS) $(ptex_LDADD) $(LIBS)
+ptftopl$(EXEEXT): $(ptftopl_OBJECTS) $(ptftopl_DEPENDENCIES)
+ @rm -f ptftopl$(EXEEXT)
+ $(LINK) $(ptftopl_OBJECTS) $(ptftopl_LDADD) $(LIBS)
synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES)
@rm -f synctex$(EXEEXT)
$(synctex_LINK) $(synctex_OBJECTS) $(synctex_LDADD) $(LIBS)
@@ -2985,6 +3100,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ovf2ovp.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ovp2ovf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/patgen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pbibtex.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftex-dummy.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftex-pdftex-pool.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftex-pdftex0.Po@am__quote@
@@ -2993,10 +3109,18 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftex-synctex-pdf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftosrc-dummy.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftosrc-pdftosrc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdvitype-pdvitype.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pktogf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pktype.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pltotf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pooltype.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppltotf-ppltotf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-kanji.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptex-pool.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptex0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptexextra.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptexini.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptftopl.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synctex-synctex_main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synctex-synctex_parser.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synctex-synctex_parser_utils.Po@am__quote@
@@ -7200,6 +7324,104 @@ pdftex-synctex-pdf.obj: synctex-pdf.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(pdftex_CFLAGS) $(CFLAGS) -c -o pdftex-synctex-pdf.obj `if test -f 'synctex-pdf.c'; then $(CYGPATH_W) 'synctex-pdf.c'; else $(CYGPATH_W) '$(srcdir)/synctex-pdf.c'; fi`
+pdvitype-pdvitype.o: pdvitype.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdvitype-pdvitype.o -MD -MP -MF $(DEPDIR)/pdvitype-pdvitype.Tpo -c -o pdvitype-pdvitype.o `test -f 'pdvitype.c' || echo '$(srcdir)/'`pdvitype.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pdvitype-pdvitype.Tpo $(DEPDIR)/pdvitype-pdvitype.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pdvitype.c' object='pdvitype-pdvitype.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdvitype-pdvitype.o `test -f 'pdvitype.c' || echo '$(srcdir)/'`pdvitype.c
+
+pdvitype-pdvitype.obj: pdvitype.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdvitype-pdvitype.obj -MD -MP -MF $(DEPDIR)/pdvitype-pdvitype.Tpo -c -o pdvitype-pdvitype.obj `if test -f 'pdvitype.c'; then $(CYGPATH_W) 'pdvitype.c'; else $(CYGPATH_W) '$(srcdir)/pdvitype.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pdvitype-pdvitype.Tpo $(DEPDIR)/pdvitype-pdvitype.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pdvitype.c' object='pdvitype-pdvitype.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdvitype-pdvitype.obj `if test -f 'pdvitype.c'; then $(CYGPATH_W) 'pdvitype.c'; else $(CYGPATH_W) '$(srcdir)/pdvitype.c'; fi`
+
+ppltotf-ppltotf.o: ppltotf.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppltotf-ppltotf.o -MD -MP -MF $(DEPDIR)/ppltotf-ppltotf.Tpo -c -o ppltotf-ppltotf.o `test -f 'ppltotf.c' || echo '$(srcdir)/'`ppltotf.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ppltotf-ppltotf.Tpo $(DEPDIR)/ppltotf-ppltotf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ppltotf.c' object='ppltotf-ppltotf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppltotf-ppltotf.o `test -f 'ppltotf.c' || echo '$(srcdir)/'`ppltotf.c
+
+ppltotf-ppltotf.obj: ppltotf.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppltotf-ppltotf.obj -MD -MP -MF $(DEPDIR)/ppltotf-ppltotf.Tpo -c -o ppltotf-ppltotf.obj `if test -f 'ppltotf.c'; then $(CYGPATH_W) 'ppltotf.c'; else $(CYGPATH_W) '$(srcdir)/ppltotf.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ppltotf-ppltotf.Tpo $(DEPDIR)/ppltotf-ppltotf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ppltotf.c' object='ppltotf-ppltotf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppltotf-ppltotf.obj `if test -f 'ppltotf.c'; then $(CYGPATH_W) 'ppltotf.c'; else $(CYGPATH_W) '$(srcdir)/ppltotf.c'; fi`
+
+ptex-ptexini.o: ptexini.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -MT ptex-ptexini.o -MD -MP -MF $(DEPDIR)/ptex-ptexini.Tpo -c -o ptex-ptexini.o `test -f 'ptexini.c' || echo '$(srcdir)/'`ptexini.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptexini.Tpo $(DEPDIR)/ptex-ptexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptexini.c' object='ptex-ptexini.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -c -o ptex-ptexini.o `test -f 'ptexini.c' || echo '$(srcdir)/'`ptexini.c
+
+ptex-ptexini.obj: ptexini.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -MT ptex-ptexini.obj -MD -MP -MF $(DEPDIR)/ptex-ptexini.Tpo -c -o ptex-ptexini.obj `if test -f 'ptexini.c'; then $(CYGPATH_W) 'ptexini.c'; else $(CYGPATH_W) '$(srcdir)/ptexini.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptexini.Tpo $(DEPDIR)/ptex-ptexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptexini.c' object='ptex-ptexini.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -c -o ptex-ptexini.obj `if test -f 'ptexini.c'; then $(CYGPATH_W) 'ptexini.c'; else $(CYGPATH_W) '$(srcdir)/ptexini.c'; fi`
+
+ptex-ptex0.o: ptex0.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -MT ptex-ptex0.o -MD -MP -MF $(DEPDIR)/ptex-ptex0.Tpo -c -o ptex-ptex0.o `test -f 'ptex0.c' || echo '$(srcdir)/'`ptex0.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptex0.Tpo $(DEPDIR)/ptex-ptex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptex0.c' object='ptex-ptex0.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -c -o ptex-ptex0.o `test -f 'ptex0.c' || echo '$(srcdir)/'`ptex0.c
+
+ptex-ptex0.obj: ptex0.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -MT ptex-ptex0.obj -MD -MP -MF $(DEPDIR)/ptex-ptex0.Tpo -c -o ptex-ptex0.obj `if test -f 'ptex0.c'; then $(CYGPATH_W) 'ptex0.c'; else $(CYGPATH_W) '$(srcdir)/ptex0.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptex0.Tpo $(DEPDIR)/ptex-ptex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptex0.c' object='ptex-ptex0.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -c -o ptex-ptex0.obj `if test -f 'ptex0.c'; then $(CYGPATH_W) 'ptex0.c'; else $(CYGPATH_W) '$(srcdir)/ptex0.c'; fi`
+
+ptex-ptex-pool.o: ptex-pool.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -MT ptex-ptex-pool.o -MD -MP -MF $(DEPDIR)/ptex-ptex-pool.Tpo -c -o ptex-ptex-pool.o `test -f 'ptex-pool.c' || echo '$(srcdir)/'`ptex-pool.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptex-pool.Tpo $(DEPDIR)/ptex-ptex-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptex-pool.c' object='ptex-ptex-pool.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -c -o ptex-ptex-pool.o `test -f 'ptex-pool.c' || echo '$(srcdir)/'`ptex-pool.c
+
+ptex-ptex-pool.obj: ptex-pool.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -MT ptex-ptex-pool.obj -MD -MP -MF $(DEPDIR)/ptex-ptex-pool.Tpo -c -o ptex-ptex-pool.obj `if test -f 'ptex-pool.c'; then $(CYGPATH_W) 'ptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/ptex-pool.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptex-pool.Tpo $(DEPDIR)/ptex-ptex-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptex-pool.c' object='ptex-ptex-pool.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -c -o ptex-ptex-pool.obj `if test -f 'ptex-pool.c'; then $(CYGPATH_W) 'ptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/ptex-pool.c'; fi`
+
+ptex-ptexextra.o: ptexextra.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -MT ptex-ptexextra.o -MD -MP -MF $(DEPDIR)/ptex-ptexextra.Tpo -c -o ptex-ptexextra.o `test -f 'ptexextra.c' || echo '$(srcdir)/'`ptexextra.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptexextra.Tpo $(DEPDIR)/ptex-ptexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptexextra.c' object='ptex-ptexextra.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -c -o ptex-ptexextra.o `test -f 'ptexextra.c' || echo '$(srcdir)/'`ptexextra.c
+
+ptex-ptexextra.obj: ptexextra.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -MT ptex-ptexextra.obj -MD -MP -MF $(DEPDIR)/ptex-ptexextra.Tpo -c -o ptex-ptexextra.obj `if test -f 'ptexextra.c'; then $(CYGPATH_W) 'ptexextra.c'; else $(CYGPATH_W) '$(srcdir)/ptexextra.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptexextra.Tpo $(DEPDIR)/ptex-ptexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptexextra.c' object='ptex-ptexextra.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -c -o ptex-ptexextra.obj `if test -f 'ptexextra.c'; then $(CYGPATH_W) 'ptexextra.c'; else $(CYGPATH_W) '$(srcdir)/ptexextra.c'; fi`
+
+ptex-kanji.o: ptexdir/kanji.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -MT ptex-kanji.o -MD -MP -MF $(DEPDIR)/ptex-kanji.Tpo -c -o ptex-kanji.o `test -f 'ptexdir/kanji.c' || echo '$(srcdir)/'`ptexdir/kanji.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-kanji.Tpo $(DEPDIR)/ptex-kanji.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptexdir/kanji.c' object='ptex-kanji.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -c -o ptex-kanji.o `test -f 'ptexdir/kanji.c' || echo '$(srcdir)/'`ptexdir/kanji.c
+
+ptex-kanji.obj: ptexdir/kanji.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -MT ptex-kanji.obj -MD -MP -MF $(DEPDIR)/ptex-kanji.Tpo -c -o ptex-kanji.obj `if test -f 'ptexdir/kanji.c'; then $(CYGPATH_W) 'ptexdir/kanji.c'; else $(CYGPATH_W) '$(srcdir)/ptexdir/kanji.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-kanji.Tpo $(DEPDIR)/ptex-kanji.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptexdir/kanji.c' object='ptex-kanji.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(ptex_CFLAGS) $(CFLAGS) -c -o ptex-kanji.obj `if test -f 'ptexdir/kanji.c'; then $(CYGPATH_W) 'ptexdir/kanji.c'; else $(CYGPATH_W) '$(srcdir)/ptexdir/kanji.c'; fi`
+
synctex-synctex_main.o: synctexdir/synctex_main.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(synctex_CPPFLAGS) $(CPPFLAGS) $(synctex_CFLAGS) $(CFLAGS) -MT synctex-synctex_main.o -MD -MP -MF $(DEPDIR)/synctex-synctex_main.Tpo -c -o synctex-synctex_main.o `test -f 'synctexdir/synctex_main.c' || echo '$(srcdir)/'`synctexdir/synctex_main.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/synctex-synctex_main.Tpo $(DEPDIR)/synctex-synctex_main.Po
@@ -7873,7 +8095,7 @@ uninstall-man5:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -7898,7 +8120,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -8170,7 +8392,8 @@ distdir: $(DISTFILES)
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-test -n "$(am__skip_mode_fix)" \
- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ || find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -8214,17 +8437,17 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
@@ -8781,6 +9004,98 @@ etrip-clean:
rm -f etrip.fot etrip.log etrip.dvi etrip.out etrip.typ
rm -f tripos.tex 8terminal.tex
rm -rf tfm
+# Rebuild $(pproglib)
+$(pproglib): $(KPATHSEA_DEPEND) ${srcdir}/ptexdir/lib/*.c
+ cd ptexdir/lib && $(MAKE) $(AM_MAKEFLAGS)
+$(ptex_OBJECTS): $(ptex_prereq)
+
+$(ptex_c_h): ptex-web2c
+ @$(web2c) ptex
+ptex-web2c: ptex.p $(web2c_texmf)
+ @$(web2c) ptex
+
+ptex-pool.c: ptex.pool ptexd.h $(makecpool_stamp)
+ $(makecpool) ptex >$@ || rm -f $@
+
+ptexextra.c: ptexdir/ptexextra.h lib/texmfmp.c ptexd.h
+ sed s/TEX-OR-MF-OR-MP/ptex/ $(srcdir)/lib/texmfmp.c >$@
+
+ptexdir/ptexextra.h: ptexdir/ptexextra.in ptexdir/ptex.version
+ sed s/PTEX-VERSION/`cat ptexdir/ptex.version`/ \
+ $(srcdir)/ptexdir/ptexextra.in >$@
+
+# Tangling pTeX
+ptex.p ptex.pool: ptex-tangle
+ @$(texmf_tangle) ptex ptex
+ptex-tangle: tangle$(EXEEXT) ptex.web ptex.ch tangle-sh
+ @$(texmf_tangle) ptex ptex
+
+# Extract ptex version
+ptexdir/ptex.version: ptexdir/ptex-base.ch
+ $(MKDIR_P) ptexdir/lib
+ grep "^@d TeX_banner=='This is pTeX" $(srcdir)/ptexdir/ptex-base.ch \
+ | sed "s/^.*-//;s/'.*$$//" >ptexdir/ptex.version
+
+# Generate ptex.web
+ptex.web: tie$(EXEEXT) $(ptex_web_srcs)
+ $(tie) -m ptex.web $(ptex_web_srcs)
+
+# Generate ptex.ch
+ptex.ch: tie$(EXEEXT) ptex.web $(ptex_ch_srcs)
+ $(tie) -c ptex.ch ptex.web $(ptex_ch_srcs)
+pbibtex.c pbibtex.h: pbibtex-web2c
+pbibtex.o: pbibtex.c $(srcdir)/ptexdir/kanji.h $(srcdir)/ptexdir/ptexhelp.h
+pbibtex-web2c: $(web2c_depend) web2c/cvtbib.sed pbibtex.p
+ $(web2c) pbibtex
+ echo timestamp >$@
+ touch pbibtex.c pbibtex.h
+pbibtex.p: tangle$(EXEEXT) pbibtex.web $(srcdir)/ptexdir/pbibtex.ch
+ $(tangle) pbibtex.web $(srcdir)/ptexdir/pbibtex.ch
+pbibtex.web: $(srcdir)/bibtex.web
+ cat $(srcdir)/bibtex.web > $@
+pdvitype.c pdvitype.h: pdvitype-web2c
+pdvitype.o: pdvitype.c $(srcdir)/ptexdir/kanji.h $(srcdir)/ptexdir/ptexhelp.h
+pdvitype-web2c: $(web2c_depend) pdvitype.p
+ $(web2c) pdvitype
+ echo timestamp >$@
+ touch pdvitype.c pdvitype.h
+pdvitype.p: tangle$(EXEEXT) pdvitype.web $(srcdir)/ptexdir/pdvitype.ch
+ $(tangle) pdvitype $(srcdir)/ptexdir/pdvitype
+pdvitype.web: $(srcdir)/dvitype.web
+ cat $(srcdir)/dvitype.web > $@
+ptftopl.c ptftopl.h: ptftopl-web2c
+ptftopl.o: ptftopl.c $(srcdir)/ptexdir/kanji.h $(srcdir)/ptexdir/ptexhelp.h
+ptftopl-web2c: $(web2c_depend) ptftopl.p
+ $(web2c) ptftopl
+ echo timestamp >$@
+ touch ptftopl.c ptftopl.h
+ptftopl.p: tangle$(EXEEXT) ptftopl.web $(srcdir)/ptexdir/ptftopl.ch
+ $(tangle) ptftopl.web $(srcdir)/ptexdir/ptftopl.ch
+ptftopl.web: tie$(EXEEXT) $(srcdir)/tftopl.web $(srcdir)/tftopl.ch
+ $(tie) -m ptftopl.web $(srcdir)/tftopl.web $(srcdir)/tftopl.ch
+ppltotf.c ppltotf.h: ppltotf-web2c
+pppltotf.o: pppltotf.c $(srcdir)/ptexdir/kanji.h $(srcdir)/ptexdir/ptexhelp.h
+ppltotf-web2c: $(web2c_depend) ppltotf.p
+ $(web2c) ppltotf
+ echo timestamp >$@
+ touch ppltotf.c ppltotf.h
+ppltotf.p: tangle$(EXEEXT) ppltotf.web $(srcdir)/ptexdir/ppltotf.ch
+ $(tangle) ppltotf.web $(srcdir)/ptexdir/ppltotf
+ppltotf.web: tie$(EXEEXT) $(srcdir)/pltotf.web $(srcdir)/pltotf.ch
+ $(tie) -m ppltotf.web $(srcdir)/pltotf.web $(srcdir)/pltotf.ch
+
+.PHONY: ptrip-clean
+clean-local:: ptrip-clean
+# ptrip.test
+ptrip-clean:
+ rm -f trip.tfm trip.pl trip.tex trip.fmt ctripin.fot ctripin.log
+ rm -f ctrip.fot ctrip.log trip.dvi ctrip.typ
+ rm -f xtripin.fot xtripin.log
+ rm -f xtrip.fot xtrip.log xtrip.typ
+ rm -f ptrip.tfm ptrip.pl ptrip.tex ptrip.fmt ptripin.fot ptripin.log
+ rm -f ptrip.fot ptrip.log ptrip.dvi ptrip.out ptrip.typ
+ rm -f tripos.tex 8terminal.tex
+ rm -rf tfm
# We must create libpdftex.a before building the pdftex_OBJECTS.
$(pdftex_OBJECTS): libpdftex.a
diff --git a/Build/source/texk/web2c/aclocal.m4 b/Build/source/texk/web2c/aclocal.m4
index 3102f64e437..024c9ddd468 100644
--- a/Build/source/texk/web2c/aclocal.m4
+++ b/Build/source/texk/web2c/aclocal.m4
@@ -598,7 +598,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
freebsd* | dragonfly*)
lt_cv_sys_dlopen_deplibs=yes
;;
- gnu* | linux* | k*bsd*-gnu)
+ gnu* | linux* | k*bsd*-gnu | kopensolaris*-gnu)
# GNU and its variants, using gnu ld.so (Glibc)
lt_cv_sys_dlopen_deplibs=yes
;;
@@ -618,7 +618,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
# at 6.2 and later dlopen does load deplibs.
lt_cv_sys_dlopen_deplibs=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
lt_cv_sys_dlopen_deplibs=yes
;;
openbsd*)
diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am
index 35f492e740e..b679e0596dc 100644
--- a/Build/source/texk/web2c/ptexdir/am/ptex.am
+++ b/Build/source/texk/web2c/ptexdir/am/ptex.am
@@ -88,8 +88,7 @@ pbibtex-web2c: $(web2c_depend) web2c/cvtbib.sed pbibtex.p
pbibtex.p: tangle$(EXEEXT) pbibtex.web $(srcdir)/ptexdir/pbibtex.ch
$(tangle) pbibtex.web $(srcdir)/ptexdir/pbibtex.ch
pbibtex.web: $(srcdir)/bibtex.web
- #cat $(srcdir)/bibtex.web > $@
- cat $(srcdir)/pbibtex.web > $@
+ cat $(srcdir)/bibtex.web > $@
### pDVItype
nodist_pdvitype_SOURCES = pdvitype.c pdvitype.h
diff --git a/Build/source/texk/web2c/ptexdir/ptrip.test b/Build/source/texk/web2c/ptexdir/ptrip.test
new file mode 100755
index 00000000000..d9a39d190f4
--- /dev/null
+++ b/Build/source/texk/web2c/ptexdir/ptrip.test
@@ -0,0 +1,61 @@
+#! /bin/sh
+
+# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+
+testdir=$srcdir/triptrap
+# ptestdir=$srcdir/ptexdir/ptrip
+
+TEXMFCNF=$testdir; export TEXMFCNF
+
+dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'"
+
+echo ">>> Running TRIP test for pTeX." >&2
+#echo ">>> See $etestdir/etrip.diffs for example of acceptable diffs." >&2
+
+rm -f trip.tfm trip.pl trip.tex trip.fmt trip.dvi \
+ ctripin.fot ctripin.log ctrip.fot ctrip.log ctrip.typ \
+ xtripin.fot xtripin.log xtrip.fot xtrip.log xtrip.typ \
+ etrip.tfm etrip.pl etrip.tex etrip.fmt etrip.dvi \
+ etripin.fot etripin.log etrip.fot etrip.log etrip.out etrip.typ \
+ tripos.tex 8terminal.tex
+rm -rf tfm
+
+is_OK=:
+
+set -x
+
+echo "*** TRIP test for pTeX ***."
+
+./pltotf $testdir/trip.pl trip.tfm || exit 1
+
+./tftopl ./trip.tfm trip.pl || exit 1
+
+diff $testdir/trip.pl trip.pl || is_OK=false
+
+# get same filename in log
+$LN_S $testdir/trip.tex .
+
+./ptex --progname=einitex --ini <$testdir/trip1.in >ctripin.fot
+mv trip.log ctripin.log || exit 1
+diff $testdir/tripin.log ctripin.log
+
+# May as well test non-ini second time through.
+./ptex --progname=etex <$testdir/trip2.in >ctrip.fot
+# pTeX outputs direction of boxes.
+cat trip.log | sed "s/, yoko direction//" | sed "s/yoko direction, //" > ctrip.log
+diff $testdir/trip.fot ctrip.fot
+
+# We use $DIFF instead of `diff' only for those files where there
+# might actually be legitimate numerical differences.
+$DIFF $DIFFFLAGS $testdir/trip.log ctrip.log
+
+eval ./dvitype $dvitype_args trip.dvi >ctrip.typ || exit 1
+$DIFF $DIFFFLAGS $testdir/trip.typ ctrip.typ
+
+$is_OK || {
+ echo ">>> There were some errors." >&2
+ exit 1
+}
+
+# pTeX doesn't support extended mode.
diff --git a/Build/source/texk/web2c/web2c/Makefile.in b/Build/source/texk/web2c/web2c/Makefile.in
index 2f7d19bbfd1..3f45a76ae1b 100644
--- a/Build/source/texk/web2c/web2c/Makefile.in
+++ b/Build/source/texk/web2c/web2c/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -504,7 +504,8 @@ distdir: $(DISTFILES)
fi; \
done
-test -n "$(am__skip_mode_fix)" \
- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ || find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -548,17 +549,17 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
diff --git a/Build/source/texk/web2c/web2c/aclocal.m4 b/Build/source/texk/web2c/web2c/aclocal.m4
index 9f5b37d0928..de2eee116a4 100644
--- a/Build/source/texk/web2c/web2c/aclocal.m4
+++ b/Build/source/texk/web2c/web2c/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/web2c/web2c/configure b/Build/source/texk/web2c/web2c/configure
index b935fef7182..f6f108bbde5 100755
--- a/Build/source/texk/web2c/web2c/configure
+++ b/Build/source/texk/web2c/web2c/configure
@@ -12748,9 +12748,9 @@ esac
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
-config_files="`echo $ac_config_files`"
-config_headers="`echo $ac_config_headers`"
-config_commands="`echo $ac_config_commands`"
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
_ACEOF