https://github.com/libsdl-org/libtiff/commit/d52db1c396d5de4c83fd431462ae95f53860d8d0
From d52db1c396d5de4c83fd431462ae95f53860d8d0 Mon Sep 17 00:00:00 2001
From: Bob Friesenhahn <[EMAIL REDACTED]>
Date: Sun, 18 Nov 2012 18:17:35 +0000
Subject: [PATCH] * automake: Update Automake to 1.12.5 release.
---
ChangeLog | 4 ++++
Makefile.in | 2 +-
aclocal.m4 | 6 +++---
build/Makefile.in | 4 ++--
contrib/Makefile.in | 2 +-
contrib/acorn/Makefile.in | 2 +-
contrib/addtiffo/Makefile.in | 2 +-
contrib/dbs/Makefile.in | 2 +-
contrib/dbs/xtiff/Makefile.in | 4 ++--
contrib/iptcutil/Makefile.in | 2 +-
contrib/mac-cw/Makefile.in | 2 +-
contrib/mac-mpw/Makefile.in | 2 +-
contrib/mfs/Makefile.in | 2 +-
contrib/pds/Makefile.in | 2 +-
contrib/ras/Makefile.in | 2 +-
contrib/stream/Makefile.in | 2 +-
contrib/tags/Makefile.in | 2 +-
contrib/win_dib/Makefile.in | 2 +-
html/Makefile.in | 4 ++--
html/images/Makefile.in | 2 +-
html/man/Makefile.in | 2 +-
libtiff/Makefile.in | 2 +-
man/Makefile.in | 2 +-
port/Makefile.in | 2 +-
test/Makefile.in | 2 +-
tools/Makefile.in | 2 +-
26 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c18d4958..33227e3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-18 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
+
+ * automake: Update Automake to 1.12.5 release.
+
2012-09-22 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
* libtiff 3.9.7 released.
diff --git a/Makefile.in b/Makefile.in
index 72fbbf30..2ed56822 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/aclocal.m4 b/aclocal.m4
index d7d14c8e..9293eda9 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/build/Makefile.in b/build/Makefile.in
index 1a316b17..cea7a08d 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -14,7 +14,7 @@
@SET_MAKE@
-# $Id: Makefile.in,v 1.1.2.25 2012-09-22 17:16:19 bfriesen Exp $
+# $Id: Makefile.in,v 1.1.2.26 2012-11-18 18:17:36 bfriesen Exp $
#
# Tag Image File Format (TIFF) Software
#
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index ae675540..72be7a33 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/contrib/acorn/Makefile.in b/contrib/acorn/Makefile.in
index 1e966b41..5a73941c 100644
--- a/contrib/acorn/Makefile.in
+++ b/contrib/acorn/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/contrib/addtiffo/Makefile.in b/contrib/addtiffo/Makefile.in
index 25a6e8be..e07640c6 100644
--- a/contrib/addtiffo/Makefile.in
+++ b/contrib/addtiffo/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/contrib/dbs/Makefile.in b/contrib/dbs/Makefile.in
index f5b3ee5a..d5e7b40d 100644
--- a/contrib/dbs/Makefile.in
+++ b/contrib/dbs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/contrib/dbs/xtiff/Makefile.in b/contrib/dbs/xtiff/Makefile.in
index 2d1ce948..c655c544 100644
--- a/contrib/dbs/xtiff/Makefile.in
+++ b/contrib/dbs/xtiff/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -14,7 +14,7 @@
@SET_MAKE@
-# $Id: Makefile.in,v 1.36.2.25 2012-09-22 17:16:19 bfriesen Exp $
+# $Id: Makefile.in,v 1.36.2.26 2012-11-18 18:17:36 bfriesen Exp $
#
# Tag Image File Format (TIFF) Software
#
diff --git a/contrib/iptcutil/Makefile.in b/contrib/iptcutil/Makefile.in
index 75b1ca3e..5858c033 100644
--- a/contrib/iptcutil/Makefile.in
+++ b/contrib/iptcutil/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/contrib/mac-cw/Makefile.in b/contrib/mac-cw/Makefile.in
index a94a33ae..054d44e1 100644
--- a/contrib/mac-cw/Makefile.in
+++ b/contrib/mac-cw/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/contrib/mac-mpw/Makefile.in b/contrib/mac-mpw/Makefile.in
index 8fdaae18..7dd27d7a 100644
--- a/contrib/mac-mpw/Makefile.in
+++ b/contrib/mac-mpw/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/contrib/mfs/Makefile.in b/contrib/mfs/Makefile.in
index 230c9252..4ee41af4 100644
--- a/contrib/mfs/Makefile.in
+++ b/contrib/mfs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/contrib/pds/Makefile.in b/contrib/pds/Makefile.in
index 3511f629..fa0bcf74 100644
--- a/contrib/pds/Makefile.in
+++ b/contrib/pds/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/contrib/ras/Makefile.in b/contrib/ras/Makefile.in
index 88907bf3..e33a00ff 100644
--- a/contrib/ras/Makefile.in
+++ b/contrib/ras/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/contrib/stream/Makefile.in b/contrib/stream/Makefile.in
index 9c9dffb6..1c36a7f1 100644
--- a/contrib/stream/Makefile.in
+++ b/contrib/stream/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/contrib/tags/Makefile.in b/contrib/tags/Makefile.in
index e378f326..891d5659 100644
--- a/contrib/tags/Makefile.in
+++ b/contrib/tags/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/contrib/win_dib/Makefile.in b/contrib/win_dib/Makefile.in
index 0f68e765..45bf9281 100644
--- a/contrib/win_dib/Makefile.in
+++ b/contrib/win_dib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/html/Makefile.in b/html/Makefile.in
index b9f86c84..a85ebd66 100644
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -14,7 +14,7 @@
@SET_MAKE@
-# $Id: Makefile.in,v 1.49.2.25 2012-09-22 17:16:19 bfriesen Exp $
+# $Id: Makefile.in,v 1.49.2.26 2012-11-18 18:17:36 bfriesen Exp $
#
# Tag Image File Format (TIFF) Software
#
diff --git a/html/images/Makefile.in b/html/images/Makefile.in
index 1b962400..eaf50a3d 100644
--- a/html/images/Makefile.in
+++ b/html/images/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/html/man/Makefile.in b/html/man/Makefile.in
index 3a5278ee..98226c32 100644
--- a/html/man/Makefile.in
+++ b/html/man/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in
index 6a7c415f..69e59c76 100644
--- a/libtiff/Makefile.in
+++ b/libtiff/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/man/Makefile.in b/man/Makefile.in
index a007da7f..cac0721e 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/port/Makefile.in b/port/Makefile.in
index 66741091..f95d58ff 100644
--- a/port/Makefile.in
+++ b/port/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/test/Makefile.in b/test/Makefile.in
index 61ea1ffe..f88959f4 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 47dcec87..6f3d517a 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.