[Automake-commit] [SCM] GNU Automake branch, micro, updated. v1.13.2-46-g87e49f4

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=87e49f4f040c8ab93233a31b377fe5a541e3b6ff

The branch, micro has been updated
       via  87e49f4f040c8ab93233a31b377fe5a541e3b6ff (commit)
       via  15f610e7fd67b0b31c5048fd14dcf72b5e456865 (commit)
       via  e6df383b13504db26caa61e871a6d76764840e41 (commit)
       via  e833dfe6db3b884f90c8338c8633d50906f4e06c (commit)
       via  8a2c43b6e7764eaee17f26c47091062d42b40909 (commit)
       via  cc9d8f26dbeadc908248b6992770f531c69b655b (commit)
       via  dd78a5e81de220e7030c5c6be4162bab2f0cf4c7 (commit)
      from  3fd6f1648b4bb773a3d7036e9409e4920349e213 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .gitignore        |    2 +
 NEWS              |   21 +++++++++++++-
 configure.ac      |    2 +-
 doc/automake.texi |    4 +-
 maint.mk          |   77 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 5 files changed, 98 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index a32310e..2cd6bd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 /announcement
+/maintainer/autoconf-*/
+/maintainer/autoconf-*.tar.gz
 /ChangeLog
 /aclocal.m4
 /configure
diff --git a/NEWS b/NEWS
index ab519c4..9ce9fc4 100644
--- a/NEWS
+++ b/NEWS
@@ -39,6 +39,17 @@
 
 * WARNING: Future backward-incompatibilities!
 
+  - Makefile recipes generated by Automake 2.0 will expect to use an
+    'rm' program that doesn't complain when called without any non-option
+    argument if the '-f' option is given (so that commands like "rm -f"
+    and "rm -rf" will act as a no-op, instead of raising usage errors).
+    Accordingly, AM_INIT_AUTOMAKE will expand new shell code checking
+    that the default 'rm' program in PATH satisfies this requirement, and
+    aborting the configure process if this is not the case.  This behavior
+    of 'rm' is very widespread in the wild, and it will be required in the
+    next POSIX version:
+    <http://austingroupbugs.net/view.php?id=542>
+
   - Automake 2.0 will require Autoconf 2.70 or later (which is still
     unreleased at the moment of writing, but is planned to be released
     before Automake 2.0 is).
@@ -82,6 +93,12 @@
 
 New in 1.13.3:
 
+* Documentation fixes:
+
+  - The documentation no longer mistakenly report that the obsolete
+    'AM_MKDIR_PROG_P' macro and '$(mkdir_p)' make variable are going
+    to be removed in Automake 2.0.
+
 * Bugs fixed:
 
   - Byte-compilation of Emacs lisp files could fail spuriously on Solaris,
@@ -1612,8 +1629,8 @@ New in 1.9:
     tar-pax.  The new option filename-length-max=99 helps diagnosing
     filenames that are too long for tar-v7.  (PR/414)
 
-  - Variables aumented with `+=' are now automatically flattened (i.e.,
-    trailing backslashes removed) and then wrapped around 80 colummns
+  - Variables augmented with `+=' are now automatically flattened (i.e.,
+    trailing backslashes removed) and then wrapped around 80 columns
     (adding trailing backslashes).  In previous versions, a long series
     of
       VAR += value1
diff --git a/configure.ac b/configure.ac
index 732183f..bdc3907 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,7 +139,7 @@ AC_CHECK_PROGS([LEX], [lex flex], [false])
 # following tests, but some users were unable to figure out that their
 # installation was broken since --version appeared to work.
 
-required_autoconf_version=2.65
+AC_SUBST([required_autoconf_version], [2.65])
 AC_CACHE_CHECK([whether autoconf is installed], [am_cv_autoconf_installed],
 [if AM_RUN_LOG([$am_AUTOCONF --version]);
 then
diff --git a/doc/automake.texi b/doc/automake.texi
index 58561ed..c62d3b4 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -4087,8 +4087,8 @@ the output variable @code{MKDIR_P} instead.  In case you 
are still
 using the @code{AM_PROG_MKDIR_P} macro in your @file{configure.ac},
 or its provided variable @code{$(mkdir_p)} in your @file{Makefile.am},
 you are advised to switch ASAP to the more modern Autoconf-provided
-interface instead; both the macro and the variable @emph{will be
-removed} in the next major Automake release.
+interface instead; both the macro and the variable might be removed
+in a future major Automake release.
 
 @end table
 
diff --git a/maint.mk b/maint.mk
index 8b72639..54bff42 100644
--- a/maint.mk
+++ b/maint.mk
@@ -18,6 +18,9 @@
 # Avoid CDPATH issues.
 unexport CDPATH
 
+# Program to use to fetch files from the Net.
+WGET = wget
+
 # --------------------------------------------------------- #
 #  Automatic generation of the ChangeLog from git history.  #
 # --------------------------------------------------------- #
@@ -303,9 +306,6 @@ CLEANFILES += announcement
 #  Synchronize third-party files that are committed in our repository.  #
 # --------------------------------------------------------------------- #
 
-# Program to use to fetch files.
-WGET = wget
-
 # Git repositories on Savannah.
 git-sv-host = git.savannah.gnu.org
 
@@ -473,6 +473,77 @@ update-copyright:
          | grep -Ev "^($$excluded_re)$$" \
          | $(update_copyright_env) xargs $(srcdir)/lib/$@
 
+# -------------------------------------------------------------- #
+#  Run the testsuite with the least supported autoconf version.  #
+# -------------------------------------------------------------- #
+
+gnu-ftp = http://ftp.gnu.org/gnu
+
+# Various shorthands: version, name, package name, tarball name,
+# tarball location, installation directory.
+ac-v = $(required_autoconf_version)
+ac-n = autoconf
+ac-p = $(ac-n)-$(ac-v)
+ac-t = $(ac-p).tar.gz
+ac-l = maintainer/$(ac-t)
+ac-d = maintainer/$(ac-p)
+
+fetch-minimal-autoconf: o = $(ac-l)
+fetch-minimal-autoconf:
+       $(AM_V_at)$(MKDIR_P) $(dir $o)
+       $(AM_V_at)rm -f $o $o-t
+       $(AM_V_GEN)$(WGET) -O $o-t $(gnu-ftp)/$(ac-n)/$(ac-t)
+       $(AM_V_at)chmod a-w $o-t && mv -f $o-t $o && ls -l $o
+.PHONY: fetch-minimal-autoconf
+
+build-minimal-autoconf:
+       $(AM_V_GEN):; \
+       test -f $(ac-l) || { \
+         echo "$@: tarball $(ac-l) seems missing." >&2; \
+         echo "$@: have you run '$(MAKE) fetch-minimal-autoconf'?" >&2; \
+         exit 1; \
+       }; \
+         set -x \
+         && $(PERL) $(srcdir)/t/ax/deltree.pl $(ac-d) \
+         && $(MKDIR_P) $(ac-d) \
+         && cd $(ac-d) \
+         && tar xzf '$(CURDIR)/$(ac-l)' \
+         && mv $(ac-p) src \
+         && mkdir build \
+         && cd build \
+         && env CONFIG_SHELL='$(SHELL)' $(SHELL) ../src/configure \
+              --prefix='$(CURDIR)/$(ac-d)' CONFIG_SHELL='$(SHELL)' \
+         && $(MAKE) install
+       $(AM_V_at)echo ' ======' && $(ac-d)/bin/autoconf --version
+.PHONY: build-minimal-autoconf
+
+check-minimal-autoconf:
+       $(AM_V_at)p='$(ac-d)/bin/autoconf'; \
+         if test ! -f "$$p" || test ! -x "$$p"; then \
+           echo "$@: program '$$p' seems missing." >&2; \
+           echo "$@: have you run '$(MAKE) build-minimal-autoconf'?" >&2; \
+           exit 1; \
+         fi
+       $(AM_V_GEN): \
+         && PATH='$(CURDIR)/$(ac-d)/bin$(PATH_SEPARATOR)'$$PATH \
+         && export PATH \
+         && AUTOCONF=autoconf \
+         && AUTOHEADER=autoheader \
+         && AUTORECONF=autoreconf \
+         && AUTOM4TE=autom4te \
+         && AUTOUPDATE=autoupdate \
+         && export AUTOCONF AUTOHEADER AUTORECONF AUTOM4TE AUTOUPDATE \
+         && echo === check autoconf version '(must be = $(ac-v))' \
+         && autoconf --version \
+         && autoconf --version | sed -e 's/^/ /; s/$$/ /' -e 1q \
+              | $(FGREP) '$(ac-v)' >/dev/null \
+         && echo === configure \
+         && ./configure $(shell ./config.status --config) \
+         && echo === build and test \
+         && $(MAKE) check
+.PHONY: check-minimal-autoconf
+
+
 # --------------------------------------------------------------- #
 #  Testing on real-world packages can help us avoid regressions.  #
 # --------------------------------------------------------------- #


hooks/post-receive
-- 
GNU Automake