libs/*/: Drop the obsolete ACLOCAL_AMFLAGS

git-svn-id: svn://tug.org/texlive/trunk@34283 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 12 insertions, 10 deletions

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  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS.
+
 2013-11-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	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 <taco@metatex.org>
+##   Copyright (C) 2012 Taco Hoekwater <taco@metatex.org>
+##   Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org>
 ##
 ##   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 <tex-live@tug.org>
+dnl   Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org>
 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 <stdint.h> 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) \