diff options
| author | Alessio Treglia <alessio@debian.org> | 2013-01-15 00:46:37 +0000 |
|---|---|---|
| committer | Alessio Treglia <alessio@debian.org> | 2013-01-15 00:46:37 +0000 |
| commit | 8f1bef0c8abe53da0001b0d4df1f5439fecd9c3b (patch) | |
| tree | 67137e06f48cbe06c0bf16052ea446edf63eb7a0 /aclocal.m4 | |
| parent | d723aded8c1b91731f391754358750e9119d6689 (diff) | |
| parent | b99db4e5834bb8668c249bb7ce30af9a4d23527e (diff) | |
Merge tag 'upstream/3.6.0'
Upstream version 3.6.0
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.5 -*- Autoconf -*- +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -781,7 +781,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.11' 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.11.5], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -797,7 +797,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.11.5])dnl +[AM_AUTOMAKE_VERSION([1.11.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |