From 5903889d012518aa9dfd9cb58e6ca2186a675b49 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Wed, 18 Jun 2014 11:43:04 +0000 Subject: libs/*/: Drop the obsolete ACLOCAL_AMFLAGS git-svn-id: svn://tug.org/texlive/trunk@34283 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/Makefile.in | 4 + Build/source/libs/aclocal.m4 | 2 + Build/source/libs/cairo/Makefile.am | 4 +- Build/source/libs/configure | 125 ++++++++++++++++++++++++--- Build/source/libs/gd/ChangeLog | 4 + Build/source/libs/gd/Makefile.am | 4 +- Build/source/libs/gd/Makefile.in | 1 - Build/source/libs/graphite2/ChangeLog | 4 + Build/source/libs/graphite2/Makefile.am | 2 - Build/source/libs/graphite2/Makefile.in | 1 - Build/source/libs/icu/ChangeLog | 4 + Build/source/libs/icu/Makefile.am | 4 +- Build/source/libs/icu/Makefile.in | 1 - Build/source/libs/pixman/ChangeLog | 4 + Build/source/libs/pixman/Makefile.am | 7 +- Build/source/libs/pixman/Makefile.in | 2 +- Build/source/libs/pixman/aclocal.m4 | 1 + Build/source/libs/pixman/configure.ac | 7 +- Build/source/libs/pixman/include/Makefile.in | 1 + Build/source/libs/potrace/ChangeLog | 4 + Build/source/libs/potrace/Makefile.am | 4 +- Build/source/libs/potrace/Makefile.in | 1 - Build/source/libs/teckit/ChangeLog | 4 + Build/source/libs/teckit/Makefile.am | 4 +- Build/source/libs/teckit/Makefile.in | 1 - Build/source/libs/zlib/ChangeLog | 4 + Build/source/libs/zlib/Makefile.am | 6 +- Build/source/libs/zlib/Makefile.in | 1 - Build/source/libs/zziplib/Makefile.am | 6 +- 29 files changed, 168 insertions(+), 49 deletions(-) (limited to 'Build/source/libs') diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in index 99dd19c52b4..dd7ca4dcabe 100644 --- a/Build/source/libs/Makefile.in +++ b/Build/source/libs/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/libs/aclocal.m4 b/Build/source/libs/aclocal.m4 index f7a4791f29b..95c3663409d 100644 --- a/Build/source/libs/aclocal.m4 +++ b/Build/source/libs/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/libs/cairo/Makefile.am b/Build/source/libs/cairo/Makefile.am index 107e7380e10..ac7c89812af 100644 --- a/Build/source/libs/cairo/Makefile.am +++ b/Build/source/libs/cairo/Makefile.am @@ -1,13 +1,13 @@ ## Proxy Makefile.am to build cairo for TeX Live. ## ## Copyright (C) 2012 Taco Hoekwater -## Copyright (C) 2013 Peter Breitenlohner +## Copyright (C) 2013, 2014 Peter Breitenlohner ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, ## with or without modifications, as long as this notice is preserved. ## -## We want to re-distribute the whole original cairo source tree. +## We want to re-distribute the whole cairo source tree. ## EXTRA_DIST = $(CAIRO_TREE) diff --git a/Build/source/libs/configure b/Build/source/libs/configure index f75aeb4c3cb..7a0d53872f9 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/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 libs 2014. +# Generated by GNU Autoconf 2.69 for TeX Live libs 2015/dev. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='TeX Live libs' PACKAGE_TARNAME='tex-live-libs' -PACKAGE_VERSION='2014' -PACKAGE_STRING='TeX Live libs 2014' +PACKAGE_VERSION='2015/dev' +PACKAGE_STRING='TeX Live libs 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 @@ -860,6 +866,8 @@ graphite2 zziplib xpdf poppler +mpfr +gmp cairo pixman potrace @@ -1409,7 +1417,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 libs 2014 to adapt to many kinds of systems. +\`configure' configures TeX Live libs 2015/dev to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1479,7 +1487,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of TeX Live libs 2014:";; + short | recursive ) echo "Configuration of TeX Live libs 2015/dev:";; esac cat <<\_ACEOF @@ -1660,6 +1668,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 @@ -1771,7 +1786,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -TeX Live libs configure 2014 +TeX Live libs configure 2015/dev generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1872,7 +1887,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 libs $as_me 2014, which was +It was created by TeX Live libs $as_me 2015/dev, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4952,6 +4967,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 @@ -5895,7 +5984,7 @@ fi # Define the identity of the package. PACKAGE='tex-live-libs' - VERSION='2014' + VERSION='2015/dev' cat >>confdefs.h <<_ACEOF @@ -6287,6 +6376,22 @@ if test -x $srcdir/poppler/configure; then fi fi +if test -x $srcdir/mpfr/configure; then + test "x$with_system_mpfr" != xyes && test "x$need_mpfr" = xyes && MAKE_SUBDIRS="mpfr $MAKE_SUBDIRS" + CONF_SUBDIRS="mpfr $CONF_SUBDIRS" + if false; then + subdirs="$subdirs mpfr" + + fi +fi +if test -x $srcdir/gmp/configure; then + test "x$with_system_gmp" != xyes && test "x$need_gmp" = xyes && MAKE_SUBDIRS="gmp $MAKE_SUBDIRS" + CONF_SUBDIRS="gmp $CONF_SUBDIRS" + if false; then + subdirs="$subdirs gmp" + + fi +fi if test -x $srcdir/cairo/configure; then test "x$with_system_cairo" != xyes && test "x$need_cairo" = xyes && MAKE_SUBDIRS="cairo $MAKE_SUBDIRS" CONF_SUBDIRS="cairo $CONF_SUBDIRS" @@ -6944,7 +7049,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 libs $as_me 2014, which was +This file was extended by TeX Live libs $as_me 2015/dev, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7001,7 +7106,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 libs config.status 2014 +TeX Live libs config.status 2015/dev configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/libs/gd/ChangeLog b/Build/source/libs/gd/ChangeLog index 44fff19fcfe..99bed33199e 100644 --- a/Build/source/libs/gd/ChangeLog +++ b/Build/source/libs/gd/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2013-09-01 Peter Breitenlohner * configure.ac: Drop LT_INIT, not using Libtool. diff --git a/Build/source/libs/gd/Makefile.am b/Build/source/libs/gd/Makefile.am index 950925cce17..b134f98fbe6 100644 --- a/Build/source/libs/gd/Makefile.am +++ b/Build/source/libs/gd/Makefile.am @@ -1,13 +1,11 @@ ## Proxy Makefile.am to build libgd for TeX Live. ## -## Copyright (C) 2009-2013 Peter Breitenlohner +## Copyright (C) 2009-2014 Peter Breitenlohner ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, ## with or without modifications, as long as this notice is preserved. ## -ACLOCAL_AMFLAGS = -I ../../m4 - ## We want to re-distribute the whole original libgd source tree. ## EXTRA_DIST = $(GD_TREE) diff --git a/Build/source/libs/gd/Makefile.in b/Build/source/libs/gd/Makefile.in index ddc7dd14c34..54ac89be139 100644 --- a/Build/source/libs/gd/Makefile.in +++ b/Build/source/libs/gd/Makefile.in @@ -384,7 +384,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 = $(GD_TREE) $(GD_TREE)-PATCHES SUBDIRS = . include AM_CPPFLAGS = -I$(top_srcdir)/$(GD_TREE)/src $(am__append_1) \ diff --git a/Build/source/libs/graphite2/ChangeLog b/Build/source/libs/graphite2/ChangeLog index 7228f67a3dc..457912fb838 100644 --- a/Build/source/libs/graphite2/ChangeLog +++ b/Build/source/libs/graphite2/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2014-02-20 Peter Breitenlohner * Makefile.am (gr2test_CPPFLAGS): Add -DGRAPHITE2_STATIC for diff --git a/Build/source/libs/graphite2/Makefile.am b/Build/source/libs/graphite2/Makefile.am index 688cc2a0825..14c9bfdef96 100644 --- a/Build/source/libs/graphite2/Makefile.am +++ b/Build/source/libs/graphite2/Makefile.am @@ -6,8 +6,6 @@ ## gives unlimited permission to copy and/or distribute it, ## with or without modifications, as long as this notice is preserved. ## -ACLOCAL_AMFLAGS = -I ../../m4 - ## We want to re-distribute the whole original graphite2 source tree. ## EXTRA_DIST = $(GRAPHITE2_TREE) diff --git a/Build/source/libs/graphite2/Makefile.in b/Build/source/libs/graphite2/Makefile.in index 46ceb403806..7306fda9c3b 100644 --- a/Build/source/libs/graphite2/Makefile.in +++ b/Build/source/libs/graphite2/Makefile.in @@ -662,7 +662,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 = $(GRAPHITE2_TREE) $(GRAPHITE2_TREE)-PATCHES GRAPHITE2_SRC = $(GRAPHITE2_TREE)/src GRAPHITE2_INC = $(GRAPHITE2_TREE)/include diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog index e8d62949ffe..0ce874e6e55 100644 --- a/Build/source/libs/icu/ChangeLog +++ b/Build/source/libs/icu/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2014-04-03 Peter Breitenlohner Update icu-53.1 (release). diff --git a/Build/source/libs/icu/Makefile.am b/Build/source/libs/icu/Makefile.am index 1f014a3ad04..8809a72c996 100644 --- a/Build/source/libs/icu/Makefile.am +++ b/Build/source/libs/icu/Makefile.am @@ -1,13 +1,11 @@ ## Wrapper Makefile.am to build ICU for TeX Live. ## -## Copyright (C) 2009-2013 Peter Breitenlohner +## Copyright (C) 2009-2014 Peter Breitenlohner ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, ## with or without modifications, as long as this notice is preserved. ## -ACLOCAL_AMFLAGS = -I ../../m4 - ## We want to re-distribute the whole ICU source tree. EXTRA_DIST = $(ICU_TREE) diff --git a/Build/source/libs/icu/Makefile.in b/Build/source/libs/icu/Makefile.in index 56d84025b7e..b4ba838d541 100644 --- a/Build/source/libs/icu/Makefile.in +++ b/Build/source/libs/icu/Makefile.in @@ -548,7 +548,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 = $(ICU_TREE) $(ICU_TREE)-PATCHES SUBDIRS = . $(am__append_1) @cross_TRUE@ICU_NATIVE = icu-native/config/icucross.mk diff --git a/Build/source/libs/pixman/ChangeLog b/Build/source/libs/pixman/ChangeLog index 5a0036ef729..c710ab33ee0 100644 --- a/Build/source/libs/pixman/ChangeLog +++ b/Build/source/libs/pixman/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2013-11-18 Peter Breitenlohner Import pixman-0.32.4. diff --git a/Build/source/libs/pixman/Makefile.am b/Build/source/libs/pixman/Makefile.am index 45b9aceb549..84a1809852e 100644 --- a/Build/source/libs/pixman/Makefile.am +++ b/Build/source/libs/pixman/Makefile.am @@ -1,14 +1,13 @@ ## Proxy Makefile.am to build pixman for TeX Live. ## -## Copyright (C) 2012, 2013 Taco Hoekwater +## Copyright (C) 2012 Taco Hoekwater +## Copyright (C) 2012-2014 Peter Breitenlohner ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, ## with or without modifications, as long as this notice is preserved. ## -ACLOCAL_AMFLAGS = -I ../../m4 - -## We want to re-distribute the whole original pixman source tree. +## We want to re-distribute the whole pixman source tree. ## EXTRA_DIST = $(PIXMAN_TREE) diff --git a/Build/source/libs/pixman/Makefile.in b/Build/source/libs/pixman/Makefile.in index 98751569493..9a97f04175f 100644 --- a/Build/source/libs/pixman/Makefile.in +++ b/Build/source/libs/pixman/Makefile.in @@ -97,6 +97,7 @@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-lib-version.m4 \ + $(top_srcdir)/../../m4/kpse-size-max.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/version.ac $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -570,7 +571,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 = $(PIXMAN_TREE) $(PIXMAN_TREE)-PATCHES PIXMAN_SRC = $(PIXMAN_TREE)/pixman SUBDIRS = . include diff --git a/Build/source/libs/pixman/aclocal.m4 b/Build/source/libs/pixman/aclocal.m4 index 46e929d7fec..68edc2b237b 100644 --- a/Build/source/libs/pixman/aclocal.m4 +++ b/Build/source/libs/pixman/aclocal.m4 @@ -1185,4 +1185,5 @@ AC_SUBST([am__untar]) m4_include([../../m4/kpse-common.m4]) m4_include([../../m4/kpse-lib-version.m4]) +m4_include([../../m4/kpse-size-max.m4]) m4_include([../../m4/kpse-warnings.m4]) diff --git a/Build/source/libs/pixman/configure.ac b/Build/source/libs/pixman/configure.ac index 40835c9d428..4f54aa8c4cc 100644 --- a/Build/source/libs/pixman/configure.ac +++ b/Build/source/libs/pixman/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2012, 2013 Peter Breitenlohner +dnl Copyright (C) 2012-2014 Peter Breitenlohner dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -96,10 +96,7 @@ AC_DEFUN([PIXMAN_LINK_WITH_ENV],[dnl LIBS="$save_LIBS" ]) -dnl Define SIZE_MAX if necessary, e.g., for Solaris 9. -AC_CHECK_DECL([SIZE_MAX], , - [AC_DEFINE([SIZE_MAX], [((size_t)-1)], - [Define to `((size_t)-1)' if does not define it.])]) +KPSE_CHECK_SIZE_MAX dnl Find a -Werror for catching warnings. WERROR= diff --git a/Build/source/libs/pixman/include/Makefile.in b/Build/source/libs/pixman/include/Makefile.in index f19ad420cd1..f9666692057 100644 --- a/Build/source/libs/pixman/include/Makefile.in +++ b/Build/source/libs/pixman/include/Makefile.in @@ -81,6 +81,7 @@ subdir = include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-lib-version.m4 \ + $(top_srcdir)/../../m4/kpse-size-max.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/version.ac $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/Build/source/libs/potrace/ChangeLog b/Build/source/libs/potrace/ChangeLog index 536f5dbe868..f2d5e29386f 100644 --- a/Build/source/libs/potrace/ChangeLog +++ b/Build/source/libs/potrace/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2013-07-06 Peter Breitenlohner * Makefile.am: Use ../../am/rebuild.am. diff --git a/Build/source/libs/potrace/Makefile.am b/Build/source/libs/potrace/Makefile.am index cabbcfa0ed1..46024282648 100644 --- a/Build/source/libs/potrace/Makefile.am +++ b/Build/source/libs/potrace/Makefile.am @@ -1,13 +1,11 @@ ## Proxy Makefile.am to build potrace for TeX Live. ## -## Copyright (C) 2013 Peter Breitenlohner +## Copyright (C) 2013, 2014 Peter Breitenlohner ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, ## with or without modifications, as long as this notice is preserved. ## -ACLOCAL_AMFLAGS = -I ../../m4 - ## We want to re-distribute the whole original potrace source tree. ## EXTRA_DIST = $(POTRACE_TREE) diff --git a/Build/source/libs/potrace/Makefile.in b/Build/source/libs/potrace/Makefile.in index 22f3fc907c0..95a77a772ae 100644 --- a/Build/source/libs/potrace/Makefile.in +++ b/Build/source/libs/potrace/Makefile.in @@ -536,7 +536,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 = $(POTRACE_TREE) $(POTRACE_TREE)-PATCHES SUBDIRS = . include AM_CPPFLAGS = -I$(top_srcdir)/$(POTRACE_TREE)/src diff --git a/Build/source/libs/teckit/ChangeLog b/Build/source/libs/teckit/ChangeLog index 2f1855ede79..d3cc42e0902 100644 --- a/Build/source/libs/teckit/ChangeLog +++ b/Build/source/libs/teckit/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2012-07-06 Peter Breitenlohner * Makefile.am: Use ../../am/reconfig.am and ../../am/rebuild.am. diff --git a/Build/source/libs/teckit/Makefile.am b/Build/source/libs/teckit/Makefile.am index a1935bcce03..9a42f8eb755 100644 --- a/Build/source/libs/teckit/Makefile.am +++ b/Build/source/libs/teckit/Makefile.am @@ -1,10 +1,8 @@ ## Makefile.am for the TeX Live subdirectory libs/teckit/ ## -## Copyright (C) 2009-2013 Peter Breitenlohner +## Copyright (C) 2009-2014 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## -ACLOCAL_AMFLAGS = -I ../../m4 - ## We want to re-distribute the whole original TECkit source tree. ## EXTRA_DIST = $(TECKIT_TREE) diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in index 778ab9e181a..b0777ca559e 100644 --- a/Build/source/libs/teckit/Makefile.in +++ b/Build/source/libs/teckit/Makefile.in @@ -565,7 +565,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 = $(TECKIT_TREE) $(TECKIT_TREE)-PATCHES teckit.test \ tex-text.map tex-text.tec SUBDIRS = . include/teckit diff --git a/Build/source/libs/zlib/ChangeLog b/Build/source/libs/zlib/ChangeLog index 82efbf35c34..1d6cd49c118 100644 --- a/Build/source/libs/zlib/ChangeLog +++ b/Build/source/libs/zlib/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2012-07-06 Peter Breitenlohner * Makefile.am: Use ../../am/rebuild.am. diff --git a/Build/source/libs/zlib/Makefile.am b/Build/source/libs/zlib/Makefile.am index 7fce7d03e99..adb52b75c15 100644 --- a/Build/source/libs/zlib/Makefile.am +++ b/Build/source/libs/zlib/Makefile.am @@ -1,14 +1,12 @@ ## Proxy Makefile.am to build zlib for TeX Live. ## -## Copyright (C) 2009-2013 Peter Breitenlohner +## Copyright (C) 2009-2014 Peter Breitenlohner ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, ## with or without modifications, as long as this notice is preserved. ## -ACLOCAL_AMFLAGS = -I ../../m4 - -## We want to re-distribute the whole original zlib source tree. +## We want to re-distribute the whole zlib source tree. ## EXTRA_DIST = $(ZLIB_TREE) diff --git a/Build/source/libs/zlib/Makefile.in b/Build/source/libs/zlib/Makefile.in index 8e6e0415485..0b2328dd029 100644 --- a/Build/source/libs/zlib/Makefile.in +++ b/Build/source/libs/zlib/Makefile.in @@ -546,7 +546,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 = $(ZLIB_TREE) $(ZLIB_TREE)-PATCHES SUBDIRS = . include AM_CPPFLAGS = -I$(top_srcdir)/$(ZLIB_TREE) $(ZLIB_DEFINES) diff --git a/Build/source/libs/zziplib/Makefile.am b/Build/source/libs/zziplib/Makefile.am index 1ea30e7d63e..b2d58e59502 100644 --- a/Build/source/libs/zziplib/Makefile.am +++ b/Build/source/libs/zziplib/Makefile.am @@ -1,16 +1,16 @@ ## Proxy Makefile.am to build zziplib for TeX Live. ## -## Copyright (C) 2010-2013 Peter Breitenlohner +## Copyright (C) 2010-2014 Peter Breitenlohner ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, ## with or without modifications, as long as this notice is preserved. ## -## We want to re-distribute the whole original zziplib source tree. +## We want to re-distribute the whole zziplib source tree. ## EXTRA_DIST = $(ZZIPLIB_TREE) -## Patches applied to the original source tree +## Changes applied to the original source tree ## EXTRA_DIST += $(ZZIPLIB_TREE)-PATCHES -- cgit v1.2.3