diff options
| author | Alexander Wirt <formorer@debian.org> | 2013-05-18 21:48:14 +0200 |
|---|---|---|
| committer | Alexander Wirt <formorer@debian.org> | 2013-05-18 21:48:14 +0200 |
| commit | 484ed0908b6415ea847a4ba42dcb7dbebe81831d (patch) | |
| tree | 671e8b11fae025390feb87a678689ba8f4f4acee /aclocal.m4 | |
| parent | 095df096593fa957706bff1a552b072ae079d7fb (diff) | |
| parent | 6b61aefbf3de71852386f5f26d60c10ef62407d3 (diff) | |
| download | conntrack-tools-484ed0908b6415ea847a4ba42dcb7dbebe81831d.tar.gz conntrack-tools-484ed0908b6415ea847a4ba42dcb7dbebe81831d.zip | |
Merge tag 'upstream/1.4.1'
Upstream version 1.4.1
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.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, @@ -198,7 +198,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 ]) @@ -214,7 +214,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]))]) |