summaryrefslogtreecommitdiff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2012-12-15 22:00:25 +0200
committerArnold D. Robbins <arnold@skeeve.com>2012-12-15 22:00:25 +0200
commitcd14ae87e64199c0d9755a4f4a5e8e96b91fb60f (patch)
treec765d394641bea7a05258bc75b5e5b0327725073 /aclocal.m4
parent63c77b4b434ebca094b73a7058f4bbb997c6ef94 (diff)
parenta8202dfd103b1a0134939d55f48eb748ce65144d (diff)
downloadgawk-cd14ae87e64199c0d9755a4f4a5e8e96b91fb60f.tar.gz
Merge branch 'gawk-4.0-stable'. Automake and bison.
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m46
1 files changed, 3 insertions, 3 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index fa8a2461..1d4e9d22 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.6 -*- 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.6], [],
[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.6])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])