diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-06-18 11:56:23 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-06-18 11:56:23 +0000 |
| commit | 081d7946faa61fc306f13b99d8e6af921d1af111 (patch) | |
| tree | f2febc9b4dd87f26e62fdad37390e7e1d49ddb1b | |
| parent | 508bffe4408ab137d9057b15075c94e1578b619d (diff) | |
texk/*/: Drop the obsolete ACLOCAL_AMFLAGS
git-svn-id: svn://tug.org/texlive/trunk@34287 c570f23f-e606-0410-a88d-b1316a301751
82 files changed, 368 insertions, 174 deletions
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index 74bffabb36f..d3a30cee3cb 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/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/texk/README b/Build/source/texk/README index fe5cb67cbf5..9457bcfbe7a 100644 --- a/Build/source/texk/README +++ b/Build/source/texk/README @@ -71,7 +71,7 @@ kpathsea - maintained here, by us lacheck - checked 25apr11 http://mirror.ctan.org/support/lacheck/lacheck-1.26.tar.gz -lcdf-typetools 2.100 - checked 9jan14 +lcdf-typetools 2.101 - checked 17jun14 http://www.lcdf.org/type/lcdf-typetools-2.100.tar.gz makeindexk - maintained here, by us diff --git a/Build/source/texk/aclocal.m4 b/Build/source/texk/aclocal.m4 index f7a4791f29b..95c3663409d 100644 --- a/Build/source/texk/aclocal.m4 +++ b/Build/source/texk/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/texk/afm2pl/ChangeLog b/Build/source/texk/afm2pl/ChangeLog index b85a04a2e1a..f47e7bc065c 100644 --- a/Build/source/texk/afm2pl/ChangeLog +++ b/Build/source/texk/afm2pl/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2013-06-23 Siep Kroonenberg <siepo@cybercomm.nl> Incorporated patches for the man page from Eric S. Raymond diff --git a/Build/source/texk/afm2pl/Makefile.am b/Build/source/texk/afm2pl/Makefile.am index 426f752a1b7..66fdf31049c 100644 --- a/Build/source/texk/afm2pl/Makefile.am +++ b/Build/source/texk/afm2pl/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory texk/afm2pl/ ## -## Copyright (C) 2009-2012 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 - AM_CPPFLAGS = $(KPATHSEA_INCLUDES) AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/afm2pl/Makefile.in b/Build/source/texk/afm2pl/Makefile.in index 0a46e2f1d04..d658322970d 100644 --- a/Build/source/texk/afm2pl/Makefile.in +++ b/Build/source/texk/afm2pl/Makefile.in @@ -528,7 +528,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 AM_CPPFLAGS = $(KPATHSEA_INCLUDES) AM_CFLAGS = $(WARNING_CFLAGS) afm2pl_SOURCES = afm2pl.c diff --git a/Build/source/texk/bibtex-x/ChangeLog b/Build/source/texk/bibtex-x/ChangeLog index 51cee581693..5dfccedb0d7 100644 --- a/Build/source/texk/bibtex-x/ChangeLog +++ b/Build/source/texk/bibtex-x/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2013-03-19 Peter Breitenlohner <peb@mppmu.mpg.de> Merge bibtex8/ and bibtexu/ into bibtex-x (extended). diff --git a/Build/source/texk/bibtex-x/Makefile.am b/Build/source/texk/bibtex-x/Makefile.am index 7287388dfe8..db27327c44e 100644 --- a/Build/source/texk/bibtex-x/Makefile.am +++ b/Build/source/texk/bibtex-x/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory texk/bibtex-x/ ## -## 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 - AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/bibtex-x/Makefile.in b/Build/source/texk/bibtex-x/Makefile.in index cce4fc0b265..86136310035 100644 --- a/Build/source/texk/bibtex-x/Makefile.in +++ b/Build/source/texk/bibtex-x/Makefile.in @@ -575,7 +575,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) common_sources = \ diff --git a/Build/source/texk/chktex/ChangeLog b/Build/source/texk/chktex/ChangeLog index 51e44cc9a32..5b91dcb88c1 100644 --- a/Build/source/texk/chktex/ChangeLog +++ b/Build/source/texk/chktex/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/texk/chktex/Makefile.am b/Build/source/texk/chktex/Makefile.am index d1f9fa32157..7974930e702 100644 --- a/Build/source/texk/chktex/Makefile.am +++ b/Build/source/texk/chktex/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/chktex/ ## -## Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2010-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 chktex source tree. ## ## With current automake (1.10.2) 'make distcheck' fails when diff --git a/Build/source/texk/chktex/Makefile.in b/Build/source/texk/chktex/Makefile.in index e7ce55b78d9..3d7a3f7df29 100644 --- a/Build/source/texk/chktex/Makefile.in +++ b/Build/source/texk/chktex/Makefile.in @@ -564,7 +564,6 @@ top_srcdir = @top_srcdir@ # Adapted for TeX Live from chktex/Makefile.in # #************************************************************************ -ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(CHKTEX_TREE) $(CHKTEX_TREE)-PATCHES regex/COPYING.LIB \ regex/README $(top_builddir)/../../build-aux/relpath $(TESTS) AM_CPPFLAGS = $(REGEX_INCLUDES) $(KPATHSEA_INCLUDES) -DKPATHSEA diff --git a/Build/source/texk/cjkutils/ChangeLog b/Build/source/texk/cjkutils/ChangeLog index 482caa2e993..6876b25452a 100644 --- a/Build/source/texk/cjkutils/ChangeLog +++ b/Build/source/texk/cjkutils/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: Drop KPSE_COMPILER_WARNIGS, use KPSE_COND_WIN32. diff --git a/Build/source/texk/cjkutils/Makefile.am b/Build/source/texk/cjkutils/Makefile.am index 4ef526b7e55..444633ad907 100644 --- a/Build/source/texk/cjkutils/Makefile.am +++ b/Build/source/texk/cjkutils/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory texk/cjkutils/ ## -## 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 cjk/utils source tree. EXTRA_DIST = $(CJKUTILS_TREE) ## Patches applied to the original source tree diff --git a/Build/source/texk/cjkutils/Makefile.in b/Build/source/texk/cjkutils/Makefile.in index b7987480406..791ccfc5849 100644 --- a/Build/source/texk/cjkutils/Makefile.in +++ b/Build/source/texk/cjkutils/Makefile.in @@ -577,7 +577,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 = $(CJKUTILS_TREE) $(CJKUTILS_TREE)-PATCHES $(CWEB_TEX) \ $(CWEB_DVI) $(TESTS) tests/bg5conv.tex tests/bg5conv.cjk \ tests/cefconv.tex tests/cefconv.cjk tests/cef5conv.tex \ diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 9f99ce0727c..a8349f4ccd0 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/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 texk 2014. +# Generated by GNU Autoconf 2.69 for TeX Live texk 2015/dev. # # Report bugs to <peb@mppmu.mpg.de>. # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='TeX Live texk' PACKAGE_TARNAME='tex-live-texk' -PACKAGE_VERSION='2014' -PACKAGE_STRING='TeX Live texk 2014' +PACKAGE_VERSION='2015/dev' +PACKAGE_STRING='TeX Live texk 2015/dev' PACKAGE_BUGREPORT='peb@mppmu.mpg.de' 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 @@ -1422,7 +1428,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 texk 2014 to adapt to many kinds of systems. +\`configure' configures TeX Live texk 2015/dev to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1492,7 +1498,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of TeX Live texk 2014:";; + short | recursive ) echo "Configuration of TeX Live texk 2015/dev:";; esac cat <<\_ACEOF @@ -1673,6 +1679,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 @@ -1784,7 +1797,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -TeX Live texk configure 2014 +TeX Live texk configure 2015/dev generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1885,7 +1898,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 texk $as_me 2014, which was +It was created by TeX Live texk $as_me 2015/dev, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4965,6 +4978,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 @@ -5908,7 +5995,7 @@ fi # Define the identity of the package. PACKAGE='tex-live-texk' - VERSION='2014' + VERSION='2015/dev' cat >>confdefs.h <<_ACEOF @@ -7061,7 +7148,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 texk $as_me 2014, which was +This file was extended by TeX Live texk $as_me 2015/dev, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7118,7 +7205,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 texk config.status 2014 +TeX Live texk config.status 2015/dev configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/texk/detex/ChangeLog b/Build/source/texk/detex/ChangeLog index 570c4237139..e79d8f06db5 100644 --- a/Build/source/texk/detex/ChangeLog +++ b/Build/source/texk/detex/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2013-01-29 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Allow subdir-objects. diff --git a/Build/source/texk/detex/Makefile.am b/Build/source/texk/detex/Makefile.am index 45f02f63ef9..2fb4130da40 100644 --- a/Build/source/texk/detex/Makefile.am +++ b/Build/source/texk/detex/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory texk/detex/ ## -## 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 detex source tree. EXTRA_DIST = $(DETEX_TREE) ## Patches applied to the original source tree diff --git a/Build/source/texk/detex/Makefile.in b/Build/source/texk/detex/Makefile.in index 881716f8d72..cedd0eed423 100644 --- a/Build/source/texk/detex/Makefile.in +++ b/Build/source/texk/detex/Makefile.in @@ -544,7 +544,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 = $(DETEX_TREE) $(DETEX_TREE)-PATCHES test.lout test.tex \ test.tout AM_CPPFLAGS = -I$(top_srcdir)/$(DETEX_TREE) $(KPATHSEA_INCLUDES) -DNO_MALLOC_DECL -DKPATHSEA -Dlint diff --git a/Build/source/texk/devnag/ChangeLog b/Build/source/texk/devnag/ChangeLog index 3d379d165e3..c8a9594973b 100644 --- a/Build/source/texk/devnag/ChangeLog +++ b/Build/source/texk/devnag/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2014-04-21 Karl Berry <karl@tug.org> * Makefile.am (DISTCLEANFILES): use += the second time. diff --git a/Build/source/texk/devnag/Makefile.am b/Build/source/texk/devnag/Makefile.am index 4bda0d5ddf7..e8ba13e6bc0 100644 --- a/Build/source/texk/devnag/Makefile.am +++ b/Build/source/texk/devnag/Makefile.am @@ -3,8 +3,6 @@ ## Copyright 2009-2014 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## -ACLOCAL_AMFLAGS = -I ../../m4 - AM_CFLAGS = $(WARNING_CFLAGS) bin_PROGRAMS = devnag diff --git a/Build/source/texk/devnag/Makefile.in b/Build/source/texk/devnag/Makefile.in index 98a39b4f6e5..2790c916bdf 100644 --- a/Build/source/texk/devnag/Makefile.in +++ b/Build/source/texk/devnag/Makefile.in @@ -469,7 +469,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 AM_CFLAGS = $(WARNING_CFLAGS) devnag_SOURCES = src/devnag.c DISTCLEANFILES = config.force captions.dn examples.dn *.tex diff --git a/Build/source/texk/dtl/ChangeLog b/Build/source/texk/dtl/ChangeLog index 3809266be41..d35277ea336 100644 --- a/Build/source/texk/dtl/ChangeLog +++ b/Build/source/texk/dtl/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2013-06-28 Peter Breitenlohner <peb@mppmu.mpg.de> * dt2dv.c, dv2dt.c: First include <config.h>. diff --git a/Build/source/texk/dtl/Makefile.am b/Build/source/texk/dtl/Makefile.am index 3380e268bcb..9215b7df5bd 100644 --- a/Build/source/texk/dtl/Makefile.am +++ b/Build/source/texk/dtl/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory texk/dtl/ ## -## Copyright (C) 2009-2012 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 - AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/dtl/Makefile.in b/Build/source/texk/dtl/Makefile.in index 50dc5e15839..331ed94a791 100644 --- a/Build/source/texk/dtl/Makefile.in +++ b/Build/source/texk/dtl/Makefile.in @@ -533,7 +533,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) dt2dv_SOURCES = dt2dv.c dtl.h diff --git a/Build/source/texk/dvi2tty/ChangeLog b/Build/source/texk/dvi2tty/ChangeLog index f198d58abf4..915214e1ac3 100644 --- a/Build/source/texk/dvi2tty/ChangeLog +++ b/Build/source/texk/dvi2tty/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2013-01-29 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Allow subdir-objects. diff --git a/Build/source/texk/dvi2tty/Makefile.am b/Build/source/texk/dvi2tty/Makefile.am index 2d4413fe6d9..a9470e8a80f 100644 --- a/Build/source/texk/dvi2tty/Makefile.am +++ b/Build/source/texk/dvi2tty/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory texk/dvi2tty/ ## -## 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 dvi2tty source tree. ## EXTRA_DIST = $(DVI2TTY_TREE) diff --git a/Build/source/texk/dvi2tty/Makefile.in b/Build/source/texk/dvi2tty/Makefile.in index c94dc80d5dc..cfcb7170002 100644 --- a/Build/source/texk/dvi2tty/Makefile.in +++ b/Build/source/texk/dvi2tty/Makefile.in @@ -539,7 +539,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 = $(DVI2TTY_TREE) $(DVI2TTY_TREE)-PATCHES $(TESTS) \ ligtest.dis ligtest.tty test.tty testc.tty tests.tty testu.tty AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) -DKPATHSEA diff --git a/Build/source/texk/dvidvi/ChangeLog b/Build/source/texk/dvidvi/ChangeLog index d8dccbbf9d4..82c0e908f5a 100644 --- a/Build/source/texk/dvidvi/ChangeLog +++ b/Build/source/texk/dvidvi/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2013-06-28 Peter Breitenlohner <peb@mppmu.mpg.de> * dvidvi.c: First include <config.h>. diff --git a/Build/source/texk/dvidvi/Makefile.am b/Build/source/texk/dvidvi/Makefile.am index 73881629b74..6fe3991ee98 100644 --- a/Build/source/texk/dvidvi/Makefile.am +++ b/Build/source/texk/dvidvi/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory texk/dvidvi/ ## -## Copyright (C) 2009-2012 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 - AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA -DUNIX AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/dvidvi/Makefile.in b/Build/source/texk/dvidvi/Makefile.in index 87584b9848c..3f63267a2b1 100644 --- a/Build/source/texk/dvidvi/Makefile.in +++ b/Build/source/texk/dvidvi/Makefile.in @@ -526,7 +526,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA -DUNIX AM_CFLAGS = $(WARNING_CFLAGS) dvidvi_SOURCES = dvidvi.c diff --git a/Build/source/texk/dviljk/ChangeLog b/Build/source/texk/dviljk/ChangeLog index b9a2f8af8e3..227ce0a945e 100644 --- a/Build/source/texk/dviljk/ChangeLog +++ b/Build/source/texk/dviljk/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/texk/dviljk/Makefile.am b/Build/source/texk/dviljk/Makefile.am index 03adfa73e44..498dc1d8546 100644 --- a/Build/source/texk/dviljk/Makefile.am +++ b/Build/source/texk/dviljk/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory texk/dviljk/ ## -## 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 - AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/dviljk/Makefile.in b/Build/source/texk/dviljk/Makefile.in index 0ce75f43ca4..407ed2bd9ee 100644 --- a/Build/source/texk/dviljk/Makefile.in +++ b/Build/source/texk/dviljk/Makefile.in @@ -438,7 +438,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) noinst_LIBRARIES = libdvilj.a diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 8ad1f1bcb51..f929e91e9e0 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2014-05-22 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * dvipdfmx.c: disable warnings in the case of -q option. diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am index beb6ffb70c7..b671ce4cd59 100644 --- a/Build/source/texk/dvipdfm-x/Makefile.am +++ b/Build/source/texk/dvipdfm-x/Makefile.am @@ -3,8 +3,6 @@ ## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## -ACLOCAL_AMFLAGS = -I ../../m4 - bin_PROGRAMS = if DVIPDFMX bin_PROGRAMS += dvipdfmx diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in index 9a70d82dffb..10f00810487 100644 --- a/Build/source/texk/dvipdfm-x/Makefile.in +++ b/Build/source/texk/dvipdfm-x/Makefile.in @@ -634,7 +634,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 @DVIPDFMX_TRUE@@WIN32_FALSE@dist_bin_SCRIPTS = dvipdft EXTRA_LIBRARIES = libutil.a AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(LIBPAPER_INCLUDES) diff --git a/Build/source/texk/dvipos/ChangeLog b/Build/source/texk/dvipos/ChangeLog index 2d417d99d85..06576e3d7ed 100644 --- a/Build/source/texk/dvipos/ChangeLog +++ b/Build/source/texk/dvipos/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2013-07-02 Peter Breitenlohner <peb@mppmu.mpg.de> * tfm.c: First include <kpathsea/kpathsea.h> via "utils.h". diff --git a/Build/source/texk/dvipos/Makefile.am b/Build/source/texk/dvipos/Makefile.am index 669740c1918..6a61ee2a5a2 100644 --- a/Build/source/texk/dvipos/Makefile.am +++ b/Build/source/texk/dvipos/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory texk/dvipos/ ## -## Copyright (C) 2009-2012 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 - AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/dvipos/Makefile.in b/Build/source/texk/dvipos/Makefile.in index 7ac21f96819..399df75609f 100644 --- a/Build/source/texk/dvipos/Makefile.in +++ b/Build/source/texk/dvipos/Makefile.in @@ -354,7 +354,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) dvipos_SOURCES = \ diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog index ae88e8f1b5f..2abc1cc80ac 100644 --- a/Build/source/texk/dvisvgm/ChangeLog +++ b/Build/source/texk/dvisvgm/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2014-04-29 Peter Breitenlohner <peb@mppmu.mpg.de> * Imported release 1.6. diff --git a/Build/source/texk/dvisvgm/Makefile.am b/Build/source/texk/dvisvgm/Makefile.am index b1eabc821ef..6c35a6ce3b8 100644 --- a/Build/source/texk/dvisvgm/Makefile.am +++ b/Build/source/texk/dvisvgm/Makefile.am @@ -10,8 +10,6 @@ # #************************************************************************ ## -ACLOCAL_AMFLAGS = -I ../../m4 - ## We want to re-distribute the whole original dvisvgm source tree. ## EXTRA_DIST = $(DVISVGM_TREE) diff --git a/Build/source/texk/dvisvgm/Makefile.in b/Build/source/texk/dvisvgm/Makefile.in index 43c603fc83e..53bf2579461 100644 --- a/Build/source/texk/dvisvgm/Makefile.in +++ b/Build/source/texk/dvisvgm/Makefile.in @@ -652,7 +652,6 @@ top_srcdir = @top_srcdir@ # Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> # #************************************************************************ -ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(DVISVGM_TREE) $(DVISVGM_TREE)-PATCHES $(TESTS) AM_CPPFLAGS = -I$(top_srcdir)/$(DVISVGM_TREE)/src $(KPATHSEA_INCLUDES) \ $(POTRACE_INCLUDES) $(FREETYPE2_INCLUDES) $(ZLIB_INCLUDES) \ diff --git a/Build/source/texk/gsftopk/ChangeLog b/Build/source/texk/gsftopk/ChangeLog index a17b93c3819..e7cd02f0e09 100644 --- a/Build/source/texk/gsftopk/ChangeLog +++ b/Build/source/texk/gsftopk/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2013-06-28 Peter Breitenlohner <peb@mppmu.mpg.de> * gsftopk.c: Replace bzero(s, l) => memset(s, 0, l). diff --git a/Build/source/texk/gsftopk/Makefile.am b/Build/source/texk/gsftopk/Makefile.am index 7bbbeaa0936..234ee810647 100644 --- a/Build/source/texk/gsftopk/Makefile.am +++ b/Build/source/texk/gsftopk/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory texk/gsftopk/ ## -## 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 - AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA -Dlint AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/gsftopk/Makefile.in b/Build/source/texk/gsftopk/Makefile.in index a269755a458..56d3a60818c 100644 --- a/Build/source/texk/gsftopk/Makefile.in +++ b/Build/source/texk/gsftopk/Makefile.in @@ -357,7 +357,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA -Dlint AM_CFLAGS = $(WARNING_CFLAGS) gsftopk_SOURCES = \ diff --git a/Build/source/texk/lacheck/ChangeLog b/Build/source/texk/lacheck/ChangeLog index 3dbb8a3fe1a..4f2a81c4339 100644 --- a/Build/source/texk/lacheck/ChangeLog +++ b/Build/source/texk/lacheck/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2013-01-29 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am, configure.ac: Allow subdir-objects. diff --git a/Build/source/texk/lacheck/Makefile.am b/Build/source/texk/lacheck/Makefile.am index fc3d07a1907..8adc0ee6c44 100644 --- a/Build/source/texk/lacheck/Makefile.am +++ b/Build/source/texk/lacheck/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory texk/lacheck/ ## -## 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 lacheck source tree. EXTRA_DIST = $(LACHECK_TREE) ## Patches applied to the original source tree diff --git a/Build/source/texk/lacheck/Makefile.in b/Build/source/texk/lacheck/Makefile.in index 577602b1880..38bdc5e4c6f 100644 --- a/Build/source/texk/lacheck/Makefile.in +++ b/Build/source/texk/lacheck/Makefile.in @@ -539,7 +539,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 = $(LACHECK_TREE) $(LACHECK_TREE)-PATCHES AM_CFLAGS = $(WARNING_CFLAGS) lacheck_SOURCES = @LACHECK_TREE@/lacheck.l diff --git a/Build/source/texk/makeindexk/ChangeLog b/Build/source/texk/makeindexk/ChangeLog index e8ddd5fee3b..7fd091ce39e 100644 --- a/Build/source/texk/makeindexk/ChangeLog +++ b/Build/source/texk/makeindexk/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/texk/makeindexk/Makefile.am b/Build/source/texk/makeindexk/Makefile.am index 4580372e209..2d194634627 100644 --- a/Build/source/texk/makeindexk/Makefile.am +++ b/Build/source/texk/makeindexk/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory texk/makeindexk/ ## -## Copyright (C) 2009-2012 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 - AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/makeindexk/Makefile.in b/Build/source/texk/makeindexk/Makefile.in index 372c23f588d..d1df37f1597 100644 --- a/Build/source/texk/makeindexk/Makefile.in +++ b/Build/source/texk/makeindexk/Makefile.in @@ -538,7 +538,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) @WIN32_FALSE@dist_bin_SCRIPTS = mkindex diff --git a/Build/source/texk/makeindexk/configure b/Build/source/texk/makeindexk/configure index 525e479d64f..58ff450545f 100755 --- a/Build/source/texk/makeindexk/configure +++ b/Build/source/texk/makeindexk/configure @@ -12911,7 +12911,7 @@ ac_config_headers="$ac_config_headers c-auto.h:c-auto.in" -$as_echo "#define TEX_LIVE_VERSION \"2014\"" >>confdefs.h +$as_echo "#define TEX_LIVE_VERSION \"2015/dev\"" >>confdefs.h for ac_header in ctype.h types.h locale.h diff --git a/Build/source/texk/makejvf/ChangeLog b/Build/source/texk/makejvf/ChangeLog index f9b738317f6..62d029606e7 100644 --- a/Build/source/texk/makejvf/ChangeLog +++ b/Build/source/texk/makejvf/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2013-12-11 Peter Breitenlohner <peb@mppmu.mpg.de> * tests/min10.tfm, tests/tmin10.vf: Update from Master. diff --git a/Build/source/texk/makejvf/Makefile.am b/Build/source/texk/makejvf/Makefile.am index db13189c9ea..40ff0431201 100644 --- a/Build/source/texk/makejvf/Makefile.am +++ b/Build/source/texk/makejvf/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory texk/makejvfk/ ## -## Copyright (C) 2010, 2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2010-2014 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## -ACLOCAL_AMFLAGS = -I ../../m4 - AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/makejvf/Makefile.in b/Build/source/texk/makejvf/Makefile.in index 9d5ef8b423a..09ec74c4972 100644 --- a/Build/source/texk/makejvf/Makefile.in +++ b/Build/source/texk/makejvf/Makefile.in @@ -531,7 +531,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) AM_CFLAGS = $(WARNING_CFLAGS) makejvf_SOURCES = \ diff --git a/Build/source/texk/mendexk/ChangeLog b/Build/source/texk/mendexk/ChangeLog index 7782fc84f0c..f5dc6dbee3e 100644 --- a/Build/source/texk/mendexk/ChangeLog +++ b/Build/source/texk/mendexk/ChangeLog @@ -1,3 +1,9 @@ +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + * configure.ac: Check for C99 variadic macros. + * fwrite.c: Better handling of snprintf(). + 2014-05-13 Peter Breitenlohner <peb@mppmu.mpg.de> * fread.c (copy_multibyte_char): Avoid ambiguous operation. diff --git a/Build/source/texk/mendexk/Makefile.am b/Build/source/texk/mendexk/Makefile.am index b9b4add0044..69d1ae0a6a3 100644 --- a/Build/source/texk/mendexk/Makefile.am +++ b/Build/source/texk/mendexk/Makefile.am @@ -3,8 +3,6 @@ ## Copyright (C) 2010-2014 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## -ACLOCAL_AMFLAGS = -I ../../m4 - AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/mendexk/Makefile.in b/Build/source/texk/mendexk/Makefile.in index 3b0027d4b46..7690edaa4b9 100644 --- a/Build/source/texk/mendexk/Makefile.in +++ b/Build/source/texk/mendexk/Makefile.in @@ -534,7 +534,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) AM_CFLAGS = $(WARNING_CFLAGS) mendex_SOURCES = \ diff --git a/Build/source/texk/mendexk/c-auto.in b/Build/source/texk/mendexk/c-auto.in index 6f34cd18961..b8852321593 100644 --- a/Build/source/texk/mendexk/c-auto.in +++ b/Build/source/texk/mendexk/c-auto.in @@ -105,6 +105,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have C99 variadic macros. */ +#undef HAVE___VA_ARGS__ + /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #undef LT_OBJDIR diff --git a/Build/source/texk/mendexk/configure b/Build/source/texk/mendexk/configure index 13ed4d842d2..f0d03a1e1d6 100755 --- a/Build/source/texk/mendexk/configure +++ b/Build/source/texk/mendexk/configure @@ -12912,6 +12912,41 @@ fi ac_config_headers="$ac_config_headers c-auto.h:c-auto.in" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if C99 variadic macros are supported" >&5 +$as_echo_n "checking if C99 variadic macros are supported... " >&6; } +if ${kpse_cv_have___VA_ARGS__+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <stdio.h> +#define foo(format, ...) printf(format, __VA_ARGS__) +int +main () +{ +foo("%s\n", "Hi, there"); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_have___VA_ARGS__=yes +else + kpse_cv_have___VA_ARGS__=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have___VA_ARGS__" >&5 +$as_echo "$kpse_cv_have___VA_ARGS__" >&6; } +case $kpse_cv_have___VA_ARGS__ in #( + yes) : + +$as_echo "#define HAVE___VA_ARGS__ 1" >>confdefs.h + ;; #( + *) : + ;; +esac + kpse_save_CPPFLAGS=$CPPFLAGS kpse_save_LIBS=$LIBS diff --git a/Build/source/texk/mendexk/configure.ac b/Build/source/texk/mendexk/configure.ac index ebb9f00b24e..63d76c1a2a3 100644 --- a/Build/source/texk/mendexk/configure.ac +++ b/Build/source/texk/mendexk/configure.ac @@ -17,6 +17,17 @@ KPSE_COMMON([mendexk], [no-define]) AC_CONFIG_HEADERS([c-auto.h:c-auto.in]) +AC_CACHE_CHECK([if C99 variadic macros are supported], + [kpse_cv_have___VA_ARGS__], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> +#define foo(format, ...) printf(format, __VA_ARGS__)]], + [[foo("%s\n", "Hi, there");]])], + [kpse_cv_have___VA_ARGS__=yes], + [kpse_cv_have___VA_ARGS__=no])]) +AS_CASE([$kpse_cv_have___VA_ARGS__], + [yes], [AC_DEFINE([HAVE___VA_ARGS__], 1, + [Define to 1 if you have C99 variadic macros.])]) + KPSE_KPATHSEA_FLAGS KPSE_PTEXENC_FLAGS diff --git a/Build/source/texk/mendexk/fwrite.c b/Build/source/texk/mendexk/fwrite.c index 80e7b77cbba..81030e7e94a 100644 --- a/Build/source/texk/mendexk/fwrite.c +++ b/Build/source/texk/mendexk/fwrite.c @@ -17,13 +17,39 @@ static int range_check(struct index ind, int count, char *lbuff); static void linecheck(char *lbuff, char *tmpbuff); static void crcheck(char *lbuff, FILE *fp); -/* OS X defines snprintf() as macro that chokes on using TAIL_LEN */ -#ifdef __APPLE__ -#undef snprintf -#endif - #define BUFFERLEN 4096 -#define TAIL_LEN(x) ((x)+strlen(x)), (BUFFERLEN-strlen(x)) + +#ifdef HAVE___VA_ARGS__ +/* Use C99 variadic macros if they are supported. */ +#define SPRINTF(buf, ...) \ + snprintf(buf, sizeof(buf), __VA_ARGS__) +#define SAPPENDF(buf, ...) \ + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), __VA_ARGS__) +#else +/* Alternatively use static inline functions (all buffers have size BUFFERLEN). */ +static inline int SPRINTF(char *buf, const char *format, ...) +{ + va_list argptr; + int n; + + va_start(argptr, format); + n = vsnprintf(buf, BUFFERLEN, format, argptr); + va_end(argptr); + + return n; +} +static inline int SAPPENDF(char *buf, const char *format, ...) +{ + va_list argptr; + int n; + + va_start(argptr, format); + n = vsnprintf(buf + strlen(buf), BUFFERLEN - strlen(buf), format, argptr); + va_end(argptr); + + return n; +} +#endif static void fprint_euc_char(FILE *fp, const char a, const char b) { @@ -127,7 +153,7 @@ void indwrite(char *filename, struct index *ind, int pagenum) fprintf(fp,"%s%s%s",lethead_prefix,symhead_negative,lethead_suffix); } } - snprintf(lbuff,BUFFERLEN,"%s%s",item_0,ind[i].idx[0]); + SPRINTF(lbuff,"%s%s",item_0,ind[i].idx[0]); } else if (alphabet(ind[i].dic[0][0])) { if (lethead_flag>0) { @@ -136,7 +162,7 @@ void indwrite(char *filename, struct index *ind, int pagenum) else if (lethead_flag<0) { fprintf(fp,"%s%c%s",lethead_prefix,ind[i].dic[0][0]+32,lethead_suffix); } - snprintf(lbuff,BUFFERLEN,"%s%s",item_0,ind[i].idx[0]); + SPRINTF(lbuff,"%s%s",item_0,ind[i].idx[0]); } else if (japanese(ind[i].dic[0])) { if (lethead_flag) { @@ -153,7 +179,7 @@ void indwrite(char *filename, struct index *ind, int pagenum) } fputs(lethead_suffix,fp); } - snprintf(lbuff,BUFFERLEN,"%s%s",item_0,ind[i].idx[0]); + SPRINTF(lbuff,"%s%s",item_0,ind[i].idx[0]); for (hpoint=0;hpoint<(strlen(datama)/2);hpoint++) { if ((unsigned char)ind[i].dic[0][1]<(unsigned char)datama[hpoint*2+1]) { break; @@ -162,18 +188,18 @@ void indwrite(char *filename, struct index *ind, int pagenum) } switch (ind[i].words) { case 1: - snprintf(TAIL_LEN(lbuff),"%s",delim_0); + SAPPENDF(lbuff,"%s",delim_0); break; case 2: - snprintf(TAIL_LEN(lbuff),"%s%s",item_x1,ind[i].idx[1]); - snprintf(TAIL_LEN(lbuff),"%s",delim_1); + SAPPENDF(lbuff,"%s%s",item_x1,ind[i].idx[1]); + SAPPENDF(lbuff,"%s",delim_1); break; case 3: - snprintf(TAIL_LEN(lbuff),"%s%s",item_x1,ind[i].idx[1]); - snprintf(TAIL_LEN(lbuff),"%s%s",item_x2,ind[i].idx[2]); - snprintf(TAIL_LEN(lbuff),"%s",delim_2); + SAPPENDF(lbuff,"%s%s",item_x1,ind[i].idx[1]); + SAPPENDF(lbuff,"%s%s",item_x2,ind[i].idx[2]); + SAPPENDF(lbuff,"%s",delim_2); break; default: @@ -229,41 +255,41 @@ void indwrite(char *filename, struct index *ind, int pagenum) switch (ind[i].words) { case 1: - snprintf(TAIL_LEN(lbuff),"%s%s%s",item_0,ind[i].idx[0],delim_0); + SAPPENDF(lbuff,"%s%s%s",item_0,ind[i].idx[0],delim_0); break; case 2: if (strcmp(ind[i-1].idx[0],ind[i].idx[0])!=0 || strcmp(ind[i-1].dic[0],ind[i].dic[0])!=0) { - snprintf(TAIL_LEN(lbuff),"%s%s%s",item_0,ind[i].idx[0],item_x1); + SAPPENDF(lbuff,"%s%s%s",item_0,ind[i].idx[0],item_x1); } else { if (ind[i-1].words==1) { - snprintf(TAIL_LEN(lbuff),"%s",item_01); + SAPPENDF(lbuff,"%s",item_01); } else { - snprintf(TAIL_LEN(lbuff),"%s",item_1); + SAPPENDF(lbuff,"%s",item_1); } } - snprintf(TAIL_LEN(lbuff),"%s",ind[i].idx[1]); - snprintf(TAIL_LEN(lbuff),"%s",delim_1); + SAPPENDF(lbuff,"%s",ind[i].idx[1]); + SAPPENDF(lbuff,"%s",delim_1); break; case 3: if (strcmp(ind[i-1].idx[0],ind[i].idx[0])!=0 || strcmp(ind[i-1].dic[0],ind[i].dic[0])!=0) { - snprintf(TAIL_LEN(lbuff),"%s%s",item_0,ind[i].idx[0]); - snprintf(TAIL_LEN(lbuff),"%s%s%s",item_x1,ind[i].idx[1],item_x2); + SAPPENDF(lbuff,"%s%s",item_0,ind[i].idx[0]); + SAPPENDF(lbuff,"%s%s%s",item_x1,ind[i].idx[1],item_x2); } else if (ind[i-1].words==1) { - snprintf(TAIL_LEN(lbuff),"%s%s%s",item_01,ind[i].idx[1],item_x2); + SAPPENDF(lbuff,"%s%s%s",item_01,ind[i].idx[1],item_x2); } else if (strcmp(ind[i-1].idx[1],ind[i].idx[1])!=0 || strcmp(ind[i-1].dic[1],ind[i].dic[1])!=0) { - if (ind[i-1].words==2) snprintf(TAIL_LEN(lbuff),"%s%s%s",item_1,ind[i].idx[1],item_12); - else snprintf(TAIL_LEN(lbuff),"%s%s%s",item_1,ind[i].idx[1],item_x2); + if (ind[i-1].words==2) SAPPENDF(lbuff,"%s%s%s",item_1,ind[i].idx[1],item_12); + else SAPPENDF(lbuff,"%s%s%s",item_1,ind[i].idx[1],item_x2); } else { - snprintf(TAIL_LEN(lbuff),"%s",item_2); + SAPPENDF(lbuff,"%s",item_2); } - snprintf(TAIL_LEN(lbuff),"%s%s",ind[i].idx[2],delim_2); + SAPPENDF(lbuff,"%s%s",ind[i].idx[2],delim_2); break; default: @@ -300,25 +326,25 @@ static void printpage(struct index *ind, FILE *fp, int num, char *lbuff) || ind[num].p[j].enc[0]==range_close) ind[num].p[j].enc++; if (strlen(ind[num].p[j].enc)>0) { - snprintf(buff,BUFFERLEN,"%s%s%s",encap_prefix,ind[num].p[j].enc,encap_infix); + SPRINTF(buff,"%s%s%s",encap_prefix,ind[num].p[j].enc,encap_infix); } if (strlen(suffix_3p)>0 && (pnumconv(ind[num].p[cc].page,ind[num].p[cc].attr[0])-pnumconv(ind[num].p[j].page,ind[num].p[j].attr[0]))==2) { - snprintf(TAIL_LEN(buff),"%s%s",ind[num].p[j].page,suffix_3p); + SAPPENDF(buff,"%s%s",ind[num].p[j].page,suffix_3p); } else if (strlen(suffix_mp)>0 && (pnumconv(ind[num].p[cc].page,ind[num].p[cc].attr[0])-pnumconv(ind[num].p[j].page,ind[num].p[j].attr[0]))>=2) { - snprintf(TAIL_LEN(buff),"%s%s",ind[num].p[j].page,suffix_mp); + SAPPENDF(buff,"%s%s",ind[num].p[j].page,suffix_mp); } else if (strlen(suffix_2p)>0 && (pnumconv(ind[num].p[cc].page,ind[num].p[cc].attr[0])-pnumconv(ind[num].p[j].page,ind[num].p[j].attr[0]))==1) { - snprintf(TAIL_LEN(buff),"%s%s",ind[num].p[j].page,suffix_2p); + SAPPENDF(buff,"%s%s",ind[num].p[j].page,suffix_2p); } else { - snprintf(TAIL_LEN(buff),"%s%s",ind[num].p[j].page,delim_r); - snprintf(TAIL_LEN(buff),"%s",ind[num].p[cc].page); + SAPPENDF(buff,"%s%s",ind[num].p[j].page,delim_r); + SAPPENDF(buff,"%s",ind[num].p[cc].page); } - snprintf(TAIL_LEN(tmpbuff),"%s",buff); + SAPPENDF(tmpbuff,"%s",buff); buff[0]='\0'; if (strlen(ind[num].p[j].enc)>0) { - snprintf(TAIL_LEN(tmpbuff),"%s",encap_suffix); + SAPPENDF(tmpbuff,"%s",encap_suffix); } linecheck(lbuff,tmpbuff); j=cc; @@ -326,53 +352,53 @@ static void printpage(struct index *ind, FILE *fp, int num, char *lbuff) goto PRINT; } else { - snprintf(TAIL_LEN(tmpbuff),"%s",delim_n); + SAPPENDF(tmpbuff,"%s",delim_n); linecheck(lbuff,tmpbuff); } } else if (strlen(ind[num].p[j].enc)>0) { /* normal encap */ if (ind[num].p[j].enc[0]==range_close) { - snprintf(errbuff,BUFFERLEN,"Warning: Unmatched range closing operator \'%c\',",range_close); - for (i=0;i<ind[num].words;i++) snprintf(TAIL_LEN(errbuff),"%s.",ind[num].idx[i]); + SPRINTF(errbuff,"Warning: Unmatched range closing operator \'%c\',",range_close); + for (i=0;i<ind[num].words;i++) SAPPENDF(errbuff,"%s.",ind[num].idx[i]); warn_printf(efp, "%s\n", errbuff); ind[num].p[j].enc++; } if (strlen(ind[num].p[j].enc)>0) { - snprintf(TAIL_LEN(tmpbuff),"%s%s%s",encap_prefix,ind[num].p[j].enc,encap_infix); - snprintf(TAIL_LEN(tmpbuff),"%s%s%s",ind[num].p[j].page,encap_suffix,delim_n); + SAPPENDF(tmpbuff,"%s%s%s",encap_prefix,ind[num].p[j].enc,encap_infix); + SAPPENDF(tmpbuff,"%s%s%s",ind[num].p[j].page,encap_suffix,delim_n); linecheck(lbuff,tmpbuff); } else { - snprintf(TAIL_LEN(tmpbuff),"%s%s",ind[num].p[j].page,delim_n); + SAPPENDF(tmpbuff,"%s%s",ind[num].p[j].page,delim_n); linecheck(lbuff,tmpbuff); } } else { /* no encap */ - snprintf(TAIL_LEN(tmpbuff),"%s%s",ind[num].p[j].page,delim_n); + SAPPENDF(tmpbuff,"%s%s",ind[num].p[j].page,delim_n); linecheck(lbuff,tmpbuff); } } if (ind[num].p[j].enc[0]==range_open) { - snprintf(errbuff,BUFFERLEN,"Warning: Unmatched range opening operator \'%c\',",range_open); - for (k=0;k<ind[num].words;k++) snprintf(TAIL_LEN(errbuff),"%s.",ind[num].idx[k]); + SPRINTF(errbuff,"Warning: Unmatched range opening operator \'%c\',",range_open); + for (k=0;k<ind[num].words;k++) SAPPENDF(errbuff,"%s.",ind[num].idx[k]); warn_printf(efp, "%s\n", errbuff); ind[num].p[j].enc++; } else if (ind[num].p[j].enc[0]==range_close) { - snprintf(errbuff,BUFFERLEN,"Warning: Unmatched range closing operator \'%c\',",range_close); - for (k=0;k<ind[num].words;k++) snprintf(TAIL_LEN(errbuff),"%s.",ind[num].idx[k]); + SPRINTF(errbuff,"Warning: Unmatched range closing operator \'%c\',",range_close); + for (k=0;k<ind[num].words;k++) SAPPENDF(errbuff,"%s.",ind[num].idx[k]); warn_printf(efp, "%s\n", errbuff); ind[num].p[j].enc++; } if (strlen(ind[num].p[j].enc)>0) { - snprintf(TAIL_LEN(tmpbuff),"%s%s%s",encap_prefix,ind[num].p[j].enc,encap_infix); - snprintf(TAIL_LEN(tmpbuff),"%s%s",ind[num].p[j].page,encap_suffix); + SAPPENDF(tmpbuff,"%s%s%s",encap_prefix,ind[num].p[j].enc,encap_infix); + SAPPENDF(tmpbuff,"%s%s",ind[num].p[j].page,encap_suffix); } else { - snprintf(TAIL_LEN(tmpbuff),"%s",ind[num].p[j].page); + SAPPENDF(tmpbuff,"%s",ind[num].p[j].page); } linecheck(lbuff,tmpbuff); @@ -389,8 +415,8 @@ static int range_check(struct index ind, int count, char *lbuff) for (i=count;i<ind.num+1;i++) { if (ind.p[i].enc[0]==range_close) { - snprintf(errbuff,BUFFERLEN,"Warning: Unmatched range closing operator \'%c\',",range_close); - snprintf(TAIL_LEN(errbuff),"%s.",ind.idx[0]); + SPRINTF(errbuff,"Warning: Unmatched range closing operator \'%c\',",range_close); + SAPPENDF(errbuff,"%s.",ind.idx[0]); warn_printf(efp, "%s\n", errbuff); ind.p[i].enc++; } @@ -406,21 +432,21 @@ static int range_check(struct index ind, int count, char *lbuff) break; } else if (j!=i && ind.p[j].enc[0]==range_open) { - snprintf(errbuff,BUFFERLEN,"Warning: Unmatched range opening operator \'%c\',",range_open); - for (k=0;k<ind.words;k++) snprintf(TAIL_LEN(errbuff),"%s.",ind.idx[k]); + SPRINTF(errbuff,"Warning: Unmatched range opening operator \'%c\',",range_open); + for (k=0;k<ind.words;k++) SAPPENDF(errbuff,"%s.",ind.idx[k]); warn_printf(efp, "%s\n", errbuff); ind.p[j].enc++; } if (strlen(ind.p[j].enc)>0) { - snprintf(tmpbuff,BUFFERLEN,"%s%s%s",encap_prefix,ind.p[j].enc,encap_infix); - snprintf(TAIL_LEN(tmpbuff),"%s%s%s",ind.p[j].page,encap_suffix,delim_n); + SPRINTF(tmpbuff,"%s%s%s",encap_prefix,ind.p[j].enc,encap_infix); + SAPPENDF(tmpbuff,"%s%s%s",ind.p[j].page,encap_suffix,delim_n); linecheck(lbuff,tmpbuff); } } } if (j==ind.num+1) { - snprintf(errbuff,BUFFERLEN,"Warning: Unmatched range opening operator \'%c\',",range_open); - for (k=0;k<ind.words;k++) snprintf(TAIL_LEN(errbuff),"%s.",ind.idx[k]); + SPRINTF(errbuff,"Warning: Unmatched range opening operator \'%c\',",range_open); + for (k=0;k<ind.words;k++) SAPPENDF(errbuff,"%s.",ind.idx[k]); warn_printf(efp, "%s\n", errbuff); } i=j-1; @@ -452,12 +478,12 @@ static int range_check(struct index ind, int count, char *lbuff) static void linecheck(char *lbuff, char *tmpbuff) { if (line_length+strlen(tmpbuff)>line_max) { - snprintf(TAIL_LEN(lbuff),"\n%s%s",indent_space,tmpbuff); + SAPPENDF(lbuff,"\n%s%s",indent_space,tmpbuff); line_length=indent_length+strlen(tmpbuff); tmpbuff[0]='\0'; } else { - snprintf(TAIL_LEN(lbuff),"%s",tmpbuff); + SAPPENDF(lbuff,"%s",tmpbuff); line_length+=strlen(tmpbuff); tmpbuff[0]='\0'; } diff --git a/Build/source/texk/ps2pkm/ChangeLog b/Build/source/texk/ps2pkm/ChangeLog index 073f4c885a5..62337081c18 100644 --- a/Build/source/texk/ps2pkm/ChangeLog +++ b/Build/source/texk/ps2pkm/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2013-06-28 Peter Breitenlohner <peb@mppmu.mpg.de> * encoding.c, filenames.c, fontfcn.c, mag.c, pfb2pfa.c, pkout.c, diff --git a/Build/source/texk/ps2pkm/Makefile.am b/Build/source/texk/ps2pkm/Makefile.am index d912b2fa497..1b18c8ab556 100644 --- a/Build/source/texk/ps2pkm/Makefile.am +++ b/Build/source/texk/ps2pkm/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory texk/ps2pkm/ ## -## Copyright (C) 2009-2012 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 - bin_PROGRAMS = mag pfb2pfa pk2bm ps2pk AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA diff --git a/Build/source/texk/ps2pkm/Makefile.in b/Build/source/texk/ps2pkm/Makefile.in index f60d2121c77..baf7bf57527 100644 --- a/Build/source/texk/ps2pkm/Makefile.in +++ b/Build/source/texk/ps2pkm/Makefile.in @@ -553,7 +553,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA AM_CFLAGS = #$(WARNING_CFLAGS) LDADD = $(KPATHSEA_LIBS) diff --git a/Build/source/texk/seetexk/ChangeLog b/Build/source/texk/seetexk/ChangeLog index 6d1344631af..b0ba9981aaf 100644 --- a/Build/source/texk/seetexk/ChangeLog +++ b/Build/source/texk/seetexk/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2013-11-20 Peter Breitenlohner <peb@mppmu.mpg.de> * dviselect.c: Delay opening output until a page is selected. diff --git a/Build/source/texk/seetexk/Makefile.am b/Build/source/texk/seetexk/Makefile.am index 8944f138cfb..213fe2daeaa 100644 --- a/Build/source/texk/seetexk/Makefile.am +++ b/Build/source/texk/seetexk/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory texk/seetexk/ ## -## 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 - AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/seetexk/Makefile.in b/Build/source/texk/seetexk/Makefile.in index d9b8aaa0c44..2c52450a500 100644 --- a/Build/source/texk/seetexk/Makefile.in +++ b/Build/source/texk/seetexk/Makefile.in @@ -559,7 +559,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) noinst_LIBRARIES = libtex.a diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog index d12864df2be..32e6b4b5aa0 100644 --- a/Build/source/texk/tex4htk/ChangeLog +++ b/Build/source/texk/tex4htk/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/texk/tex4htk/Makefile.am b/Build/source/texk/tex4htk/Makefile.am index 4f3095c2b03..23bf73e4498 100644 --- a/Build/source/texk/tex4htk/Makefile.am +++ b/Build/source/texk/tex4htk/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory texk/tex4htk/ ## -## 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 distribute the whole java tree. EXTRA_DIST = java diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in index adad290ce72..a6da6413ec4 100644 --- a/Build/source/texk/tex4htk/Makefile.in +++ b/Build/source/texk/tex4htk/Makefile.in @@ -364,7 +364,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 = java $(top_builddir)/../../build-aux/relpath dbcontext \ dblatex dbmcontext dbmex dbmlatex dbmmex dbmtex dbmtexi \ dbmxelatex dbmxetex dbtex dbtexi dbxelatex dbxetex demo.tex \ diff --git a/Build/source/texk/texlive/ChangeLog b/Build/source/texk/texlive/ChangeLog index 3e2882b38a3..dd58da44659 100644 --- a/Build/source/texk/texlive/ChangeLog +++ b/Build/source/texk/texlive/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2013-12-19 Peter Breitenlohner <peb@mppmu.mpg.de> * ac/texlive.ac: New file for '--disable-linked-scripts'. diff --git a/Build/source/texk/texlive/Makefile.am b/Build/source/texk/texlive/Makefile.am index 1797a8ee168..3b617605028 100644 --- a/Build/source/texk/texlive/Makefile.am +++ b/Build/source/texk/texlive/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory texk/texlive/ ## -## 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 - SUBDIRS = tl_scripts if LINKED_SCRIPTS SUBDIRS += linked_scripts diff --git a/Build/source/texk/texlive/Makefile.in b/Build/source/texk/texlive/Makefile.in index 51e603d33a4..08cde43a943 100644 --- a/Build/source/texk/texlive/Makefile.in +++ b/Build/source/texk/texlive/Makefile.in @@ -486,7 +486,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 SUBDIRS = tl_scripts $(am__append_1) EXTRA_DIST = w32_wrapper $(TESTS) TESTS = tests/updmap-cmdline-test.pl diff --git a/Build/source/texk/texlive/configure b/Build/source/texk/texlive/configure index 03c3d48ff5e..3a2d6da9e44 100755 --- a/Build/source/texk/texlive/configure +++ b/Build/source/texk/texlive/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 Scripts 2014. +# Generated by GNU Autoconf 2.69 for TeX Live Scripts 2015/dev. # # Report bugs to <tex-k@tug.org>. # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='TeX Live Scripts' PACKAGE_TARNAME='tex-live-scripts' -PACKAGE_VERSION='2014' -PACKAGE_STRING='TeX Live Scripts 2014' +PACKAGE_VERSION='2015/dev' +PACKAGE_STRING='TeX Live Scripts 2015/dev' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1237,7 +1237,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 Scripts 2014 to adapt to many kinds of systems. +\`configure' configures TeX Live Scripts 2015/dev to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1304,7 +1304,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of TeX Live Scripts 2014:";; + short | recursive ) echo "Configuration of TeX Live Scripts 2015/dev:";; esac cat <<\_ACEOF @@ -1399,7 +1399,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -TeX Live Scripts configure 2014 +TeX Live Scripts configure 2015/dev generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1454,7 +1454,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 Scripts $as_me 2014, which was +It was created by TeX Live Scripts $as_me 2015/dev, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2321,7 +2321,7 @@ fi # Define the identity of the package. PACKAGE='tex-live-scripts' - VERSION='2014' + VERSION='2015/dev' cat >>confdefs.h <<_ACEOF @@ -4188,7 +4188,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 Scripts $as_me 2014, which was +This file was extended by TeX Live Scripts $as_me 2015/dev, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4245,7 +4245,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 Scripts config.status 2014 +TeX Live Scripts config.status 2015/dev configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/texk/ttf2pk2/ChangeLog b/Build/source/texk/ttf2pk2/ChangeLog index 65e89cd4a96..bac8f59a47d 100644 --- a/Build/source/texk/ttf2pk2/ChangeLog +++ b/Build/source/texk/ttf2pk2/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2013-08-06 Peter Breitenlohner <peb@mppmu.mpg.de> * tfmaux.c: Use mycalloc() to initialize header array (with 0). diff --git a/Build/source/texk/ttf2pk2/Makefile.am b/Build/source/texk/ttf2pk2/Makefile.am index 6335255aa06..f641b28aab5 100644 --- a/Build/source/texk/ttf2pk2/Makefile.am +++ b/Build/source/texk/ttf2pk2/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory texk/ttf2pk2/ ## -## Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## -ACLOCAL_AMFLAGS = -I ../../m4 - AM_CPPFLAGS = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) AM_CPPFLAGS += -DHAVE_LIBKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/ttf2pk2/Makefile.in b/Build/source/texk/ttf2pk2/Makefile.in index 8f86fd94cf9..df726197291 100644 --- a/Build/source/texk/ttf2pk2/Makefile.in +++ b/Build/source/texk/ttf2pk2/Makefile.in @@ -555,7 +555,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 AM_CPPFLAGS = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) \ $(FREETYPE2_INCLUDES) -DHAVE_LIBKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/ttfdump/ChangeLog b/Build/source/texk/ttfdump/ChangeLog index 830f911f30a..94e962aff4a 100644 --- a/Build/source/texk/ttfdump/ChangeLog +++ b/Build/source/texk/ttfdump/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2013-06-30 Peter Breitenlohner <peb@mppmu.mpg.de> * Include <config.h> first in all C files and never in headers. diff --git a/Build/source/texk/ttfdump/Makefile.am b/Build/source/texk/ttfdump/Makefile.am index 99cd12e6a6b..21750d8e35e 100644 --- a/Build/source/texk/ttfdump/Makefile.am +++ b/Build/source/texk/ttfdump/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory texk/ttfdump/ ## -## 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 - AM_CPPFLAGS = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/ttfdump/Makefile.in b/Build/source/texk/ttfdump/Makefile.in index 11d0d89e262..4840d104d28 100644 --- a/Build/source/texk/ttfdump/Makefile.in +++ b/Build/source/texk/ttfdump/Makefile.in @@ -555,7 +555,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 AM_CPPFLAGS = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) noinst_LIBRARIES = libttf.a |