summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-06-18 12:12:36 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-06-18 12:12:36 +0000
commitf68f08979b055dd6b955335219cce08fbe64fca1 (patch)
treeb7bc1d1f2b5639ff19e85dfa1bd59dd25e492407
parent3e2864914687b1af9d1ce374ee11b3a799e9561a (diff)
utils/*/: Drop the obsolete ACLOCAL_AMFLAGS
git-svn-id: svn://tug.org/texlive/trunk@34292 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/utils/Makefile.in4
-rw-r--r--Build/source/utils/aclocal.m42
-rwxr-xr-xBuild/source/utils/configure107
-rw-r--r--Build/source/utils/ps2eps/ChangeLog4
-rw-r--r--Build/source/utils/ps2eps/Makefile.am4
-rw-r--r--Build/source/utils/ps2eps/Makefile.in1
-rw-r--r--Build/source/utils/t1utils/ChangeLog4
-rw-r--r--Build/source/utils/t1utils/Makefile.am4
-rw-r--r--Build/source/utils/t1utils/Makefile.in1
-rw-r--r--Build/source/utils/texdoctk/ChangeLog4
-rw-r--r--Build/source/utils/texdoctk/Makefile.am4
-rw-r--r--Build/source/utils/texdoctk/Makefile.in1
-rw-r--r--Build/source/utils/tpic2pdftex/ChangeLog4
-rw-r--r--Build/source/utils/tpic2pdftex/Makefile.am4
-rw-r--r--Build/source/utils/tpic2pdftex/Makefile.in1
-rw-r--r--Build/source/utils/vlna/ChangeLog4
-rw-r--r--Build/source/utils/vlna/Makefile.am4
-rw-r--r--Build/source/utils/vlna/Makefile.in1
-rw-r--r--Build/source/utils/xindy/ChangeLog4
-rw-r--r--Build/source/utils/xindy/Makefile.am4
-rw-r--r--Build/source/utils/xindy/Makefile.in1
-rw-r--r--Build/source/utils/xpdfopen/ChangeLog70
22 files changed, 203 insertions, 34 deletions
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index a1bf12ac2ca..52d5044b6e8 100644
--- a/Build/source/utils/Makefile.in
+++ b/Build/source/utils/Makefile.in
@@ -96,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../m4/kpse-cxx-hack.m4 \
$(top_srcdir)/../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../m4/kpse-gd-flags.m4 \
+ $(top_srcdir)/../m4/kpse-gmp-flags.m4 \
$(top_srcdir)/../m4/kpse-graphite2-flags.m4 \
$(top_srcdir)/../m4/kpse-harfbuzz-flags.m4 \
$(top_srcdir)/../m4/kpse-icu-flags.m4 \
@@ -104,6 +105,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../m4/kpse-libpng-flags.m4 \
$(top_srcdir)/../m4/kpse-lt-hack.m4 \
$(top_srcdir)/../m4/kpse-mktex.m4 \
+ $(top_srcdir)/../m4/kpse-mpfr-flags.m4 \
$(top_srcdir)/../m4/kpse-options.m4 \
$(top_srcdir)/../m4/kpse-pixman-flags.m4 \
$(top_srcdir)/../m4/kpse-pkgs.m4 \
@@ -176,6 +178,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../libs/zziplib/ac/withenable.ac \
$(top_srcdir)/../libs/xpdf/ac/withenable.ac \
$(top_srcdir)/../libs/poppler/ac/withenable.ac \
+ $(top_srcdir)/../libs/mpfr/ac/withenable.ac \
+ $(top_srcdir)/../libs/gmp/ac/withenable.ac \
$(top_srcdir)/../libs/cairo/ac/withenable.ac \
$(top_srcdir)/../libs/pixman/ac/withenable.ac \
$(top_srcdir)/../libs/potrace/ac/withenable.ac \
diff --git a/Build/source/utils/aclocal.m4 b/Build/source/utils/aclocal.m4
index f7a4791f29b..95c3663409d 100644
--- a/Build/source/utils/aclocal.m4
+++ b/Build/source/utils/aclocal.m4
@@ -1188,6 +1188,7 @@ m4_include([../m4/kpse-common.m4])
m4_include([../m4/kpse-cxx-hack.m4])
m4_include([../m4/kpse-freetype2-flags.m4])
m4_include([../m4/kpse-gd-flags.m4])
+m4_include([../m4/kpse-gmp-flags.m4])
m4_include([../m4/kpse-graphite2-flags.m4])
m4_include([../m4/kpse-harfbuzz-flags.m4])
m4_include([../m4/kpse-icu-flags.m4])
@@ -1196,6 +1197,7 @@ m4_include([../m4/kpse-libpaper-flags.m4])
m4_include([../m4/kpse-libpng-flags.m4])
m4_include([../m4/kpse-lt-hack.m4])
m4_include([../m4/kpse-mktex.m4])
+m4_include([../m4/kpse-mpfr-flags.m4])
m4_include([../m4/kpse-options.m4])
m4_include([../m4/kpse-pixman-flags.m4])
m4_include([../m4/kpse-pkgs.m4])
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index f6d40333199..7485fbc5498 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live utils 2014.
+# Generated by GNU Autoconf 2.69 for TeX Live utils 2015/dev.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='TeX Live utils'
PACKAGE_TARNAME='tex-live-utils'
-PACKAGE_VERSION='2014'
-PACKAGE_STRING='TeX Live utils 2014'
+PACKAGE_VERSION='2015/dev'
+PACKAGE_STRING='TeX Live utils 2015/dev'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -811,6 +811,12 @@ with_system_graphite2
with_system_zziplib
with_system_xpdf
with_system_poppler
+with_system_mpfr
+with_mpfr_includes
+with_mpfr_libdir
+with_system_gmp
+with_gmp_includes
+with_gmp_libdir
with_system_cairo
with_system_pixman
with_system_potrace
@@ -1401,7 +1407,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures TeX Live utils 2014 to adapt to many kinds of systems.
+\`configure' configures TeX Live utils 2015/dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1471,7 +1477,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of TeX Live utils 2014:";;
+ short | recursive ) echo "Configuration of TeX Live utils 2015/dev:";;
esac
cat <<\_ACEOF
@@ -1652,6 +1658,13 @@ Optional Packages:
xpdf library from TL (requires pkg-config)
--with-system-poppler use installed poppler headers and library (requires
pkg-config)
+ --with-system-mpfr use installed mpfr headers and library
+ --with-mpfr-includes=DIR
+ mpfr headers installed in DIR
+ --with-mpfr-libdir=DIR mpfr library installed in DIR
+ --with-system-gmp use installed gmp headers and library
+ --with-gmp-includes=DIR gmp headers installed in DIR
+ --with-gmp-libdir=DIR gmp library installed in DIR
--with-system-cairo use installed cairo headers and library (requires
pkg-config)
--with-system-pixman use installed pixman headers and library (requires
@@ -1763,7 +1776,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-TeX Live utils configure 2014
+TeX Live utils configure 2015/dev
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1864,7 +1877,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by TeX Live utils $as_me 2014, which was
+It was created by TeX Live utils $as_me 2015/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4944,6 +4957,80 @@ test "x$need_poppler" = xyes && {
need_zlib=yes
}
+## libs/mpfr/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/mpfr/
+## configure options and TL libraries required for mpfr
+
+# Check whether --with-system-mpfr was given.
+if test "${with_system_mpfr+set}" = set; then :
+ withval=$with_system_mpfr;
+fi
+
+# Check whether --with-mpfr-includes was given.
+if test "${with_mpfr_includes+set}" = set; then :
+ withval=$with_mpfr_includes;
+fi
+
+# Check whether --with-mpfr-libdir was given.
+if test "${with_mpfr_libdir+set}" = set; then :
+ withval=$with_mpfr_libdir;
+fi
+if test "x$with_system_mpfr" = x; then
+ if test -f $srcdir/../libs/mpfr/configure; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`mpfr' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`mpfr' headers and library from TL tree" >&6;}
+ with_system_mpfr=no
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`mpfr' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`mpfr' headers and library" >&6;}
+ with_system_mpfr=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-mpfr=$with_system_mpfr'"
+fi
+if test "x$with_system_mpfr" = xyes; then
+ if test "x$with_system_gmp" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`gmp' headers and library" >&5
+$as_echo "$as_me: -> installed \`gmp' headers and library" >&6;}
+ with_system_gmp=yes
+ ac_configure_args="$ac_configure_args '--with-system-gmp'"
+ elif test "x$with_system_gmp" != xyes; then
+ as_fn_error $? "Sorry, \`--with-system-mpfr' requires \`--with-system-gmp'" "$LINENO" 5
+ fi
+fi
+
+test "x$need_mpfr" = xyes && {
+ need_gmp=yes
+}
+
+## libs/gmp/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gmp/
+## configure options and TL libraries required for gmp
+
+# Check whether --with-system-gmp was given.
+if test "${with_system_gmp+set}" = set; then :
+ withval=$with_system_gmp;
+fi
+
+# Check whether --with-gmp-includes was given.
+if test "${with_gmp_includes+set}" = set; then :
+ withval=$with_gmp_includes;
+fi
+
+# Check whether --with-gmp-libdir was given.
+if test "${with_gmp_libdir+set}" = set; then :
+ withval=$with_gmp_libdir;
+fi
+if test "x$with_system_gmp" = x; then
+ if test -f $srcdir/../libs/gmp/configure; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`gmp' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`gmp' headers and library from TL tree" >&6;}
+ with_system_gmp=no
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`gmp' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`gmp' headers and library" >&6;}
+ with_system_gmp=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-gmp=$with_system_gmp'"
+fi
+
## libs/cairo/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/cairo/
## configure options and TL libraries required for cairo
@@ -5887,7 +5974,7 @@ fi
# Define the identity of the package.
PACKAGE='tex-live-utils'
- VERSION='2014'
+ VERSION='2015/dev'
cat >>confdefs.h <<_ACEOF
@@ -6872,7 +6959,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by TeX Live utils $as_me 2014, which was
+This file was extended by TeX Live utils $as_me 2015/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6929,7 +7016,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-TeX Live utils config.status 2014
+TeX Live utils config.status 2015/dev
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/utils/ps2eps/ChangeLog b/Build/source/utils/ps2eps/ChangeLog
index 01176676ab5..d64d9a4b7b0 100644
--- a/Build/source/utils/ps2eps/ChangeLog
+++ b/Build/source/utils/ps2eps/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS.
+
2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Moved Makefile fragments to ../../am/.
diff --git a/Build/source/utils/ps2eps/Makefile.am b/Build/source/utils/ps2eps/Makefile.am
index 84cdba07ce7..cf0995c4aa1 100644
--- a/Build/source/utils/ps2eps/Makefile.am
+++ b/Build/source/utils/ps2eps/Makefile.am
@@ -1,10 +1,8 @@
## Makefile.am for the TeX Live subdirectory utils/ps2eps/
##
-## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
-ACLOCAL_AMFLAGS = -I ../../m4
-
## We want to re-distribute the whole original ps2eps source tree.
EXTRA_DIST = $(PS2EPS_TREE)
## Patches applied to the original source tree
diff --git a/Build/source/utils/ps2eps/Makefile.in b/Build/source/utils/ps2eps/Makefile.in
index 211917e9ea0..45ae243a04b 100644
--- a/Build/source/utils/ps2eps/Makefile.in
+++ b/Build/source/utils/ps2eps/Makefile.in
@@ -477,7 +477,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST = $(PS2EPS_TREE) $(PS2EPS_TREE)-PATCHES \
$(top_builddir)/../../build-aux/relpath $(TESTS) \
tests/plot.pbm tests/plot.out
diff --git a/Build/source/utils/t1utils/ChangeLog b/Build/source/utils/t1utils/ChangeLog
index 607519d0ca4..85b1310c8f1 100644
--- a/Build/source/utils/t1utils/ChangeLog
+++ b/Build/source/utils/t1utils/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS.
+
2013-10-03 Peter Breitenlohner <peb@mppmu.mpg.de>
Import t1utils-1.38.
diff --git a/Build/source/utils/t1utils/Makefile.am b/Build/source/utils/t1utils/Makefile.am
index 9fbcaf9fef7..1fe50bb2a72 100644
--- a/Build/source/utils/t1utils/Makefile.am
+++ b/Build/source/utils/t1utils/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory utils/t1utils/
##
-## Copyright (C) 2008-2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2008-2014 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
#************************************************************************
@@ -9,8 +9,6 @@
#
#************************************************************************
##
-ACLOCAL_AMFLAGS = -I ../../m4
-
## We want to re-distribute the whole original t1utils source tree.
##
## With current automake (1.10.2) 'make distcheck' fails when
diff --git a/Build/source/utils/t1utils/Makefile.in b/Build/source/utils/t1utils/Makefile.in
index c71d262728e..b52035e6fa3 100644
--- a/Build/source/utils/t1utils/Makefile.in
+++ b/Build/source/utils/t1utils/Makefile.in
@@ -517,7 +517,6 @@ top_srcdir = @top_srcdir@
# Adapted for TeX Live from t1utils/Makefile.am
#
#************************************************************************
-ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST = $(T1UTILS_TREE) $(T1UTILS_TREE)-PATCHES $(TESTS) \
tests/Symbol.pfa tests/Symbol.pfb tests/Symbol.raw
AM_CPPFLAGS = -I$(top_srcdir)/$(T1UTILS_TREE)/include
diff --git a/Build/source/utils/texdoctk/ChangeLog b/Build/source/utils/texdoctk/ChangeLog
index 150ae366ad4..6feac3fa494 100644
--- a/Build/source/utils/texdoctk/ChangeLog
+++ b/Build/source/utils/texdoctk/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS.
+
2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Moved Makefile fragments to ../../am/.
diff --git a/Build/source/utils/texdoctk/Makefile.am b/Build/source/utils/texdoctk/Makefile.am
index 41da8a36950..7b8a4a7135a 100644
--- a/Build/source/utils/texdoctk/Makefile.am
+++ b/Build/source/utils/texdoctk/Makefile.am
@@ -2,11 +2,9 @@
## (In a separate directory because we hope that some day a new
## volunteer will appear to take over this program.)
##
-## Copyright (C) 2012, 2013 Karl Berry <tex-live@tug.org>
+## Copyright (C) 2012-2014 Karl Berry <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
-ACLOCAL_AMFLAGS = -I ../../m4
-
EXTRA_DIST =
perl_scripts = texdoctk
diff --git a/Build/source/utils/texdoctk/Makefile.in b/Build/source/utils/texdoctk/Makefile.in
index eb4a941833a..64d46ec0e02 100644
--- a/Build/source/utils/texdoctk/Makefile.in
+++ b/Build/source/utils/texdoctk/Makefile.in
@@ -258,7 +258,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST = $(top_builddir)/../../build-aux/relpath
perl_scripts = texdoctk
scriptsdir = texmf-dist/scripts/texdoctk
diff --git a/Build/source/utils/tpic2pdftex/ChangeLog b/Build/source/utils/tpic2pdftex/ChangeLog
index 2793fa32456..53bef594cad 100644
--- a/Build/source/utils/tpic2pdftex/ChangeLog
+++ b/Build/source/utils/tpic2pdftex/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS.
+
2013-09-30 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Use KPSE_COND_WIN32.
diff --git a/Build/source/utils/tpic2pdftex/Makefile.am b/Build/source/utils/tpic2pdftex/Makefile.am
index c3099484126..674c332db8b 100644
--- a/Build/source/utils/tpic2pdftex/Makefile.am
+++ b/Build/source/utils/tpic2pdftex/Makefile.am
@@ -1,10 +1,8 @@
## Makefile.am for the TeX Live subdirectory utils/tpic2pdftex/
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
-ACLOCAL_AMFLAGS = -I ../../m4
-
if !WIN32
bin_SCRIPTS = tpic2pdftex
man1_MANS = tpic2pdftex.1
diff --git a/Build/source/utils/tpic2pdftex/Makefile.in b/Build/source/utils/tpic2pdftex/Makefile.in
index ecf79332d1a..3d7f88ccd39 100644
--- a/Build/source/utils/tpic2pdftex/Makefile.in
+++ b/Build/source/utils/tpic2pdftex/Makefile.in
@@ -431,7 +431,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I ../../m4
@WIN32_FALSE@bin_SCRIPTS = tpic2pdftex
@WIN32_FALSE@man1_MANS = tpic2pdftex.1
EXTRA_DIST = tpic2pdftex tpic2pdftex.1 $(exp_files) $(pic_files)
diff --git a/Build/source/utils/vlna/ChangeLog b/Build/source/utils/vlna/ChangeLog
index 4a0e2ffcf2f..8e1d22d1240 100644
--- a/Build/source/utils/vlna/ChangeLog
+++ b/Build/source/utils/vlna/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS.
+
2012-12-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Use KPSE_BASIC to enable silent rules.
diff --git a/Build/source/utils/vlna/Makefile.am b/Build/source/utils/vlna/Makefile.am
index 2205fb662da..40f548bd2ac 100644
--- a/Build/source/utils/vlna/Makefile.am
+++ b/Build/source/utils/vlna/Makefile.am
@@ -1,10 +1,8 @@
## Makefile.am for the TeX Live subdirectory utils/vlna/
##
-## Copyright (C) 2008-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2008-2014 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
-ACLOCAL_AMFLAGS = -I ../../m4
-
## We want to re-distribute the whole original vlna source tree.
EXTRA_DIST = $(VLNA_TREE)
## Patches applied to the original source tree
diff --git a/Build/source/utils/vlna/Makefile.in b/Build/source/utils/vlna/Makefile.in
index 3056db2daeb..8638b7fb993 100644
--- a/Build/source/utils/vlna/Makefile.in
+++ b/Build/source/utils/vlna/Makefile.in
@@ -298,7 +298,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST = $(VLNA_TREE) $(VLNA_TREE)-PATCHES vlna.dvi vlna.tex \
vlna.idx vlna.scn
AM_CFLAGS = $(WARNING_CFLAGS)
diff --git a/Build/source/utils/xindy/ChangeLog b/Build/source/utils/xindy/ChangeLog
index 520b96bb37c..c712a090c53 100644
--- a/Build/source/utils/xindy/ChangeLog
+++ b/Build/source/utils/xindy/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS.
+
2014-04-28 Peter Breitenlohner <peb@mppmu.mpg.de>
Import xindy-2.5.0.
diff --git a/Build/source/utils/xindy/Makefile.am b/Build/source/utils/xindy/Makefile.am
index e21d951a7c0..01ce9ea2057 100644
--- a/Build/source/utils/xindy/Makefile.am
+++ b/Build/source/utils/xindy/Makefile.am
@@ -1,10 +1,8 @@
## Makefile.am for the TeX Live subdirectory utils/xindy/
##
-## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
-ACLOCAL_AMFLAGS = -I ../../m4
-
EXTRA_DIST = README-clisp
## We use the original xindy source tree.
diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in
index 75443e61239..991e414b7de 100644
--- a/Build/source/utils/xindy/Makefile.in
+++ b/Build/source/utils/xindy/Makefile.in
@@ -339,7 +339,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST = README-clisp $(XINDY_TREE)-PATCHES \
$(XINDY_TREE)/Makefile.am $(XINDY_TREE)/VERSION \
$(XINDY_TREE)/configure.ac $(XINDY_TREE)/m4 \
diff --git a/Build/source/utils/xpdfopen/ChangeLog b/Build/source/utils/xpdfopen/ChangeLog
new file mode 100644
index 00000000000..d8165653c14
--- /dev/null
+++ b/Build/source/utils/xpdfopen/ChangeLog
@@ -0,0 +1,70 @@
+2014-05-28 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import xpdfopen-0.86 (into versioned subdirectory).
+ * version.ac: New file defining the xpdfopen version.
+ * Makefile.am, configure.ac: Adapted.
+
+2014-05-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import xpdfopen-0.84.
+ * configure.ac: Adapted.
+
+2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Moved Makefile fragments to ../../am/.
+
+2012-12-15 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Use KPSE_BASIC to enable silent rules.
+
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
+2012-03-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * utils.c: Move extern decl from here ...
+ * utils.h: ... to here.
+
+2012-01-28 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import xpdfopen-0.83.
+ * configure.ac: Adapted.
+
+2011-05-28 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import xpdfopen-0.82.
+ * configure.ac: Adapted.
+
+2011-05-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import xpdfopen-0.81.
+ * configure.ac: Adapted.
+
+2009-08-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Avoid maximal compiler warnings.
+ * pdfopen.c: Use strdup'ed literal string (malloc+strcpy) to
+ initialize non-constant string.
+ * sendx.[ch]: Constify string args of all functions.
+ Consistently use wname for window name string param.
+ (close_channel): ANSI C function definition.
+
+
+2009-08-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (AM_CFLAGS), configure.ac: Enable compiler warnings.
+ * pdfopen.c (usage), pdfclose.c (usage): Declare as static.
+
+ * sendx.h (new): Declare prototypes for functions in sendx.c.
+ * Makefile.am (pdfopen_SOURCES, pdfclose_SOURCES): Add sendx.h.
+ * pdfopen.c, pdfclose.c, sendx.c: #include "sendx.h".
+
+ * sendx.c (GetRootWindow): Slightly reformulate to avoid compiler
+ warning (strict-aliasing rules).
+
+
+2009-05-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Adapt to TL2009 build system.
+