Update to automake 1.14 (no code changes).

diff --git a/aclocal.m4 b/aclocal.m4
index a3746e82a1ece13cac5614ac9158e19719ce6669..71d05a94058a4d275b972640acdd6ae1ba7c2502 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -12,8 +11,9 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 # longlong.m4 serial 17
-dnl Copyright (C) 1999-2007, 2009-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 1999-2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.

diff --git a/autogen.sh b/autogen.sh
index f175724770b4918cbe7d01e16901bc06298bd99a..00e59328a4906ac3843290f7b4d7a4ede6a9f49c 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
 # If the user hasn't chosen one themselves, we do here.
 if [ "`/usr/bin/uname 2>&1`" = "OpenBSD" ]; then
     if [ X"$AUTOMAKE_VERSION" = X"" ]; then
-       AUTOMAKE_VERSION=1.11; export AUTOMAKE_VERSION
+       AUTOMAKE_VERSION=1.14; export AUTOMAKE_VERSION
     fi
     if [ X"$AUTOCONF_VERSION" = X"" ]; then
        AUTOCONF_VERSION=2.69; export AUTOCONF_VERSION