Update to autoconf 1.12.4.

9 files changed, 22 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 6dc35701..862153de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,12 @@
 	* gawkapi.c: Changed r_make_str_node to make_str_node everywhere.
 	* node.c (make_str_node): Renamed from make_str_node.
 
+	Update to automake 1.12.4.
+
+	* Makefile.in, aclocal.m4, awklib/Makefile.in, doc/Makefile.in,
+	extension/Makefile.in, extension/aclocal.m4, test/Makefile.in:
+	Regenerated.
+
 2012-09-23         Arnold D. Robbins     <arnold@skeeve.com>
 
 	`delete array' and `nextfile' are now in POSIX.
diff --git a/Makefile.in b/Makefile.in
index d3931c46..f58c58e1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/NEWS b/NEWS
index 6b542028..c4117dd4 100644
--- a/NEWS
+++ b/NEWS
@@ -26,11 +26,13 @@ Changes from 4.0.1 to 4.1
 
 7. The and(), or() and xor() functions now take any number of arguments,
    with a minimum of two.
+
+8. Infrastructure upgrades: Automake 1.12.4.
  
 Changes from 4.0.1 to 4.0.2
 ---------------------------
 
-1. Infrastructure upgrades: Autoconf 2.69, Automake 1.12,3, bison 2.6.3.
+1. Infrastructure upgrades: Autoconf 2.69, Automake 1.12.3, bison 2.6.3.
 
 xx. Various minor bug fixes and documentation updates.
  
diff --git a/aclocal.m4 b/aclocal.m4
index 43bbdd44..fa8a2461 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.4 -*- 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.3], [],
+m4_if([$1], [1.12.4], [],
       [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.3])dnl
+[AM_AUTOMAKE_VERSION([1.12.4])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/awklib/Makefile.in b/awklib/Makefile.in
index d6d2aa27..6a89d053 100644
--- a/awklib/Makefile.in
+++ b/awklib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 280e18bd..85ca9ab3 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/extension/Makefile.in b/extension/Makefile.in
index 687c496f..0ea1b86d 100644
--- a/extension/Makefile.in
+++ b/extension/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/extension/aclocal.m4 b/extension/aclocal.m4
index 18cab755..4358745f 100644
--- a/extension/aclocal.m4
+++ b/extension/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.4 -*- 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.3], [],
+m4_if([$1], [1.12.4], [],
       [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.3])dnl
+[AM_AUTOMAKE_VERSION([1.12.4])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/test/Makefile.in b/test/Makefile.in
index cc8091a0..e60c1c6e 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -1370,7 +1370,7 @@ machine-tests: $(MACHINE_TESTS)
 mpfr-tests: $(MPFR_TESTS)
 
 shlib-tests:
-	@if grep 'DYNAMIC 1' $(top_srcdir)/config.h > /dev/null ; then \
+	@if grep 'DYNAMIC 1' $(top_builddir)/config.h > /dev/null ; then \
 	$(MAKE) shlib-real-tests ; \
 	else echo shlib tests not supported on this system ; \
 	fi
@@ -1880,7 +1880,7 @@ beginfile1::
 
 beginfile2:
 	@echo $@
-	@-( cd $(srcdir) && LC_ALL=C AWK="$(abs_builddir)/$(AWKPROG)" $(srcdir)/$@.sh $(srcdir)/$@.in ) > _$@ 2>&1
+	@-( cd $(srcdir) && LC_ALL=C AWK="$(abs_builddir)/$(AWKPROG)" $(abs_srcdir)/$@.sh $(abs_srcdir)/$@.in ) > _$@ 2>&1
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
 dumpvars::