diff options
| author | Michael Biebl <biebl@debian.org> | 2012-10-26 21:33:05 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-10-26 21:33:05 +0200 |
| commit | 3e08ba570f7e146b67c0f9dfd17dc04987ebac18 (patch) | |
| tree | ec993cb408a2edb4bb48ce86db4eaca09def6260 /aclocal.m4 | |
| parent | 74d97e718091bb137b480fb31d740fe20677812b (diff) | |
| parent | 36cb2f364a821e1be50b23e03a18891ec55adb06 (diff) | |
Merge tag 'upstream/0.9.6.4' into experimental
Upstream version 0.9.6.4
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index db4a429f..acfe6e8a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.3 -*- 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, @@ -196,7 +196,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.3], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -212,7 +212,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.3])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]))]) |