Skip to content

Commit 738835a

Browse files
committed
Update to autoconf 1.12.4.
1 parent 6d63bb4 commit 738835a

File tree

9 files changed

+22
-14
lines changed

9 files changed

+22
-14
lines changed

ChangeLog

+6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
* gawkapi.c: Changed r_make_str_node to make_str_node everywhere.
88
* node.c (make_str_node): Renamed from make_str_node.
99

10+
Update to automake 1.12.4.
11+
12+
* Makefile.in, aclocal.m4, awklib/Makefile.in, doc/Makefile.in,
13+
extension/Makefile.in, extension/aclocal.m4, test/Makefile.in:
14+
Regenerated.
15+
1016
2012-09-23 Arnold D. Robbins <[email protected]>
1117

1218
`delete array' and `nextfile' are now in POSIX.

Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.12.3 from Makefile.am.
1+
# Makefile.in generated by automake 1.12.4 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994-2012 Free Software Foundation, Inc.

NEWS

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@ Changes from 4.0.1 to 4.1
2626

2727
7. The and(), or() and xor() functions now take any number of arguments,
2828
with a minimum of two.
29+
30+
8. Infrastructure upgrades: Automake 1.12.4.
2931

3032
Changes from 4.0.1 to 4.0.2
3133
---------------------------
3234

33-
1. Infrastructure upgrades: Autoconf 2.69, Automake 1.12,3, bison 2.6.3.
35+
1. Infrastructure upgrades: Autoconf 2.69, Automake 1.12.3, bison 2.6.3.
3436

3537
xx. Various minor bug fixes and documentation updates.
3638

aclocal.m4

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# generated automatically by aclocal 1.12.3 -*- Autoconf -*-
1+
# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
22

33
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
44

@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
3434
[am__api_version='1.12'
3535
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
3636
dnl require some minimum version. Point them to the right macro.
37-
m4_if([$1], [1.12.3], [],
37+
m4_if([$1], [1.12.4], [],
3838
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
3939
])
4040

@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
5050
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
5151
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
5252
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
53-
[AM_AUTOMAKE_VERSION([1.12.3])dnl
53+
[AM_AUTOMAKE_VERSION([1.12.4])dnl
5454
m4_ifndef([AC_AUTOCONF_VERSION],
5555
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
5656
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

awklib/Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.12.3 from Makefile.am.
1+
# Makefile.in generated by automake 1.12.4 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994-2012 Free Software Foundation, Inc.

doc/Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.12.3 from Makefile.am.
1+
# Makefile.in generated by automake 1.12.4 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994-2012 Free Software Foundation, Inc.

extension/Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.12.3 from Makefile.am.
1+
# Makefile.in generated by automake 1.12.4 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994-2012 Free Software Foundation, Inc.

extension/aclocal.m4

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# generated automatically by aclocal 1.12.3 -*- Autoconf -*-
1+
# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
22

33
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
44

@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
3434
[am__api_version='1.12'
3535
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
3636
dnl require some minimum version. Point them to the right macro.
37-
m4_if([$1], [1.12.3], [],
37+
m4_if([$1], [1.12.4], [],
3838
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
3939
])
4040

@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
5050
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
5151
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
5252
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
53-
[AM_AUTOMAKE_VERSION([1.12.3])dnl
53+
[AM_AUTOMAKE_VERSION([1.12.4])dnl
5454
m4_ifndef([AC_AUTOCONF_VERSION],
5555
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
5656
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

test/Makefile.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.12.3 from Makefile.am.
1+
# Makefile.in generated by automake 1.12.4 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -1370,7 +1370,7 @@ machine-tests: $(MACHINE_TESTS)
13701370
mpfr-tests: $(MPFR_TESTS)
13711371

13721372
shlib-tests:
1373-
@if grep 'DYNAMIC 1' $(top_srcdir)/config.h > /dev/null ; then \
1373+
@if grep 'DYNAMIC 1' $(top_builddir)/config.h > /dev/null ; then \
13741374
$(MAKE) shlib-real-tests ; \
13751375
else echo shlib tests not supported on this system ; \
13761376
fi
@@ -1880,7 +1880,7 @@ beginfile1::
18801880

18811881
beginfile2:
18821882
@echo $@
1883-
@-( cd $(srcdir) && LC_ALL=C AWK="$(abs_builddir)/$(AWKPROG)" $(srcdir)/$@.sh $(srcdir)/$@.in ) > _$@ 2>&1
1883+
@-( cd $(srcdir) && LC_ALL=C AWK="$(abs_builddir)/$(AWKPROG)" $(abs_srcdir)/$@.sh $(abs_srcdir)/$@.in ) > _$@ 2>&1
18841884
@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
18851885

18861886
dumpvars::

0 commit comments

Comments
 (0)