Autotools
diff --git a/Makefile.in b/Makefile.in
index 2de0e69..9eb2d3e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -637,10 +637,16 @@
$(am__post_remove_distdir)
dist-tarZ: distdir
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
diff --git a/aclocal.m4 b/aclocal.m4
index 20cae98..98a247f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.13.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.14 -*- Autoconf -*-
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.13'
+[am__api_version='1.14'
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.13.3], [],
+m4_if([$1], [1.14], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# 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.13.3])dnl
+[AM_AUTOMAKE_VERSION([1.14])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -153,6 +153,12 @@
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
# AM_INIT_AUTOMAKE([OPTIONS])
# -----------------------------------------------
@@ -261,7 +267,48 @@
AC_CONFIG_COMMANDS_PRE(dnl
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes. So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+ cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present. This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message. This
+can help us improve future automake versions.
+
+END
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+ echo 'Configuration will proceed anyway, since you have set the' >&2
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+ echo >&2
+ else
+ cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+ AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+ fi
+fi])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -269,7 +316,6 @@
m4_define([_AC_COMPILER_EXEEXT],
m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
# that is generated. The stamp files are numbered to have different names.
diff --git a/bin/Makefile.in b/bin/Makefile.in
index ab1167e..6f61968 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 120cc0d..b79252d 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2013 Free Software Foundation, Inc.
-timestamp='2013-05-16'
+timestamp='2013-06-10'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -995,6 +995,12 @@
ppc:Linux:*:*)
echo powerpc-unknown-linux-${LIBC}
exit ;;
+ ppc64le:Linux:*:*)
+ echo powerpc64le-unknown-linux-${LIBC}
+ exit ;;
+ ppcle:Linux:*:*)
+ echo powerpcle-unknown-linux-${LIBC}
+ exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
exit ;;
diff --git a/configure b/configure
index 9946f53..c7f567f 100755
--- a/configure
+++ b/configure
@@ -1789,7 +1789,7 @@
-am__api_version='1.13'
+am__api_version='1.14'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2326,6 +2326,47 @@
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes. So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+ cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present. This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message. This
+can help us improve future automake versions.
+
+END
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+ echo 'Configuration will proceed anyway, since you have set the' >&2
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+ echo >&2
+ else
+ cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+ fi
+fi
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -3814,7 +3855,7 @@
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -4408,7 +4449,7 @@
"tests/atconfig":C) cat >tests/atconfig <<ATEOF
# Configurable variable values for building test suites.
# Generated by $0.
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) Free Software Foundation, Inc.
# The test suite will define top_srcdir=$at_top_srcdir/../.. etc.
at_testdir='tests'
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6a93d84..0d60b81 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -97,8 +97,7 @@
subdir = doc
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(autoconf_TEXINFOS) $(top_srcdir)/build-aux/mdate-sh \
- $(srcdir)/version.texi $(srcdir)/stamp-vti \
- $(standards_TEXINFOS)
+ $(srcdir)/version.texi $(srcdir)/stamp-vti
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
$(top_srcdir)/m4/m4.m4 $(top_srcdir)/m4/make-case.m4 \
@@ -150,13 +149,13 @@
am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
am__v_texidevnull_0 = > /dev/null
am__v_texidevnull_1 =
-INFO_DEPS = $(srcdir)/autoconf.info $(srcdir)/standards.info
+INFO_DEPS = $(srcdir)/autoconf.info
am__TEXINFO_TEX_DIR = $(srcdir)/../build-aux
-DVIS = autoconf.dvi standards.dvi
-PDFS = autoconf.pdf standards.pdf
-PSS = autoconf.ps standards.ps
-HTMLS = autoconf.html standards.html
-TEXINFOS = autoconf.texi standards.texi
+DVIS = autoconf.dvi
+PDFS = autoconf.pdf
+PSS = autoconf.ps
+HTMLS = autoconf.html
+TEXINFOS = autoconf.texi
TEXI2DVI = texi2dvi
TEXI2PDF = $(TEXI2DVI) --pdf --batch
MAKEINFOHTML = $(MAKEINFO) --html
@@ -298,9 +297,8 @@
AM_MAKEINFOFLAGS = --no-split
TEXI2HTML_FLAGS = -split_chapter
TEXINFO_TEX = ../build-aux/texinfo.tex
-info_TEXINFOS = autoconf.texi standards.texi
+info_TEXINFOS = autoconf.texi
autoconf_TEXINFOS = fdl.texi install.texi
-standards_TEXINFOS = fdl.texi gnu-oids.texi make-stds.texi
EXTRA_DIST = gendocs_template
# Files from texi2dvi that should be removed, but which Automake does
@@ -384,13 +382,9 @@
$(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-o $(@:.html=.htp) $<; \
then \
- rm -rf $@; \
- if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
- mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
+ rm -rf $@ && mv $(@:.html=.htp) $@; \
else \
- if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
- rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
- exit 1; \
+ rm -rf $(@:.html=.htp); exit 1; \
fi
$(srcdir)/autoconf.info: autoconf.texi $(srcdir)/version.texi $(autoconf_TEXINFOS)
autoconf.dvi: autoconf.texi $(srcdir)/version.texi $(autoconf_TEXINFOS)
@@ -415,10 +409,6 @@
maintainer-clean-vti:
-rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
-$(srcdir)/standards.info: standards.texi $(standards_TEXINFOS)
-standards.dvi: standards.texi $(standards_TEXINFOS)
-standards.pdf: standards.texi $(standards_TEXINFOS)
-standards.html: standards.texi $(standards_TEXINFOS)
.dvi.ps:
$(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
$(DVIPS) $(AM_V_texinfo) -o $@ $<
@@ -500,13 +490,11 @@
done
mostlyclean-aminfo:
- -rm -rf autoconf.t2d autoconf.t2p standards.t2d standards.t2p
+ -rm -rf autoconf.t2d autoconf.t2p
clean-aminfo:
- -test -z "autoconf.dvi autoconf.pdf autoconf.ps autoconf.html standards.dvi \
- standards.pdf standards.ps standards.html" \
- || rm -rf autoconf.dvi autoconf.pdf autoconf.ps autoconf.html standards.dvi \
- standards.pdf standards.ps standards.html
+ -test -z "autoconf.dvi autoconf.pdf autoconf.ps autoconf.html" \
+ || rm -rf autoconf.dvi autoconf.pdf autoconf.ps autoconf.html
maintainer-clean-aminfo:
@list='$(INFO_DEPS)'; for i in $$list; do \
diff --git a/doc/autoconf.info b/doc/autoconf.info
index 0dd9ad9..b98d16b 100644
--- a/doc/autoconf.info
+++ b/doc/autoconf.info
Binary files differ
diff --git a/doc/stamp-vti b/doc/stamp-vti
index da7803f..179cabf 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 10 June 2013
-@set UPDATED-MONTH June 2013
-@set EDITION 2.69.2-2851b7-dirty
-@set VERSION 2.69.2-2851b7-dirty
+@set UPDATED 30 January 2014
+@set UPDATED-MONTH January 2014
+@set EDITION 2.69
+@set VERSION 2.69
diff --git a/doc/version.texi b/doc/version.texi
index da7803f..179cabf 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 10 June 2013
-@set UPDATED-MONTH June 2013
-@set EDITION 2.69.2-2851b7-dirty
-@set VERSION 2.69.2-2851b7-dirty
+@set UPDATED 30 January 2014
+@set UPDATED-MONTH January 2014
+@set EDITION 2.69
+@set VERSION 2.69
diff --git a/lib/Autom4te/Makefile.in b/lib/Autom4te/Makefile.in
index 1631c2e..a7c79f9 100644
--- a/lib/Autom4te/Makefile.in
+++ b/lib/Autom4te/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/lib/Makefile.in b/lib/Makefile.in
index e3533b4..3835515 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/lib/autoconf/Makefile.in b/lib/autoconf/Makefile.in
index 5bbb5b9..5f4c443 100644
--- a/lib/autoconf/Makefile.in
+++ b/lib/autoconf/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/lib/autoscan/Makefile.in b/lib/autoscan/Makefile.in
index 348dd05..4709588 100644
--- a/lib/autoscan/Makefile.in
+++ b/lib/autoscan/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/lib/autotest/Makefile.in b/lib/autotest/Makefile.in
index c341152..8eae0eb 100644
--- a/lib/autotest/Makefile.in
+++ b/lib/autotest/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/lib/emacs/Makefile.in b/lib/emacs/Makefile.in
index 3da9ca1..3ab758d 100644
--- a/lib/emacs/Makefile.in
+++ b/lib/emacs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/lib/m4sugar/Makefile.in b/lib/m4sugar/Makefile.in
index a9e27e3..d351a36 100644
--- a/lib/m4sugar/Makefile.in
+++ b/lib/m4sugar/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/man/Makefile.in b/man/Makefile.in
index c8f6cca..5892814 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/man/config.guess.1 b/man/config.guess.1
index c9e745f..fa87112 100644
--- a/man/config.guess.1
+++ b/man/config.guess.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.13.
-.TH CONFIG.GUESS "1" "June 2013" "GNU Autoconf 2.69.2-2851b7-dirty" "User Commands"
+.TH CONFIG.GUESS "1" "January 2014" "GNU Autoconf 2.69" "User Commands"
.SH NAME
config.guess \- guess the build system triplet
.SH SYNOPSIS
@@ -41,10 +41,7 @@
.br
Originally written by Per Bothner.
.br
-Copyright \(co 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-.br
-Free Software Foundation, Inc.
+Copyright 1992\-2013 Free Software Foundation, Inc.
.PP
.br
This is free software; see the source for copying conditions. There is NO
diff --git a/man/config.sub.1 b/man/config.sub.1
index 6c0a03f..56608ff 100644
--- a/man/config.sub.1
+++ b/man/config.sub.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.13.
-.TH CONFIG.SUB "1" "June 2013" "GNU Autoconf 2.69.2-2851b7-dirty" "User Commands"
+.TH CONFIG.SUB "1" "January 2014" "GNU Autoconf 2.69" "User Commands"
.SH NAME
config.sub \- validate and canonicalize a configuration triplet
.SH SYNOPSIS
@@ -23,9 +23,7 @@
.SH "REPORTING BUGS"
Report bugs and patches to <config\-patches@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992\-2013 Free Software Foundation, Inc.
.PP
.br
This is free software; see the source for copying conditions. There is NO
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 00ef6ef..5ea5993 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
