[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-833-

automake-commit
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-833-

From:	Stefano Lattarini
Subject:	[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-833-g3eb0591
Date:	Wed, 01 Jun 2011 14:46:21 +0000
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=3eb059190213c60a9f201f671f1c69d6eed6bd7d

The branch, master has been updated
       via  3eb059190213c60a9f201f671f1c69d6eed6bd7d (commit)
       via  d235db335eaae0934ede72698395f8591d115f9a (commit)
       via  8a8890a9152528a4fc348bb15b27ebb2a4c3b7cb (commit)
       via  aa6883fdcf1e7f21ea81fe4745c0018a9398d43f (commit)
      from  1e18d5d0a71ef4152d1a90718ebf4b06b6b5ba56 (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:
 ChangeLog                      |   50 ++++++++++++++++++++++++++++++++++++++++
 Makefile.am                    |    2 +
 Makefile.in                    |    5 ++++
 NEWS                           |    4 +++
 THANKS                         |    1 +
 aclocal.in                     |    2 +-
 automake.in                    |    2 +-
 configure                      |   12 ++++++++-
 configure.ac                   |    6 ++++-
 doc/Makefile.am                |   10 ++++++-
 doc/Makefile.in                |   13 ++++++++-
 lib/Automake/Makefile.in       |    3 ++
 lib/Automake/tests/Makefile.in |    3 ++
 lib/Makefile.in                |    3 ++
 lib/am/Makefile.in             |    3 ++
 m4/Makefile.in                 |    3 ++
 tests/Makefile.in              |    3 ++
 tests/README                   |    6 ++--
 tests/defs-static.in           |    4 ++-
 19 files changed, 123 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8e77e2a..cb8adbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,53 @@
+2011-05-29  Stefano Lattarini  <address@hidden>
+
+       automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE
+       Currently, the Automake's own configure script allow definition
+       of AUTOCONF and AUTOM4TE, expected to point respectively to an
+       autoconf and autom4te programs.  But while these definitions are
+       honoured in the Automake's build systems and test suite, they
+       were *not* honoured in the generated `automake' and `aclocal'
+       scripts.  This behaviour, apart from being wrong in that it does
+       not allow the user enough freedom in choosing his tools, also
+       caused inconsistencies in the test suite, brining to spurious
+       failures.
+       Problem reported by Graham Reitz on the automake list; see thread:
+       <http://lists.gnu.org/archive/html/automake/2011-05/msg00022.html>
+       * automake.in ($traces): Use address@hidden', not simply `autoconf'.
+       * aclocal.in ($traces): Use address@hidden', not simply `autom4te'.
+       * Makefile.am (do_subst): Substitute also address@hidden' and
+       address@hidden'.
+       * NEWS: Update.
+       * THANKS: Update.
+
+2011-05-29  Stefano Lattarini  <address@hidden>
+
+       build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too
+       Our build system allows the user to override AUTOCONF and AUTOHEADER
+       at configure time, and honours these overrides in our testsuite.
+       But it didn't do the same with AUTOM4TE, AUTORECONF and AUTOUPDATE.
+       This change fixes that inconsistency.
+       * configure.ac (am_AUTOM4TE, am_AUTOUPDATE, am_AUTORECONF): New
+       AC_SUBSTitutions.  Update comments.
+       * tests/defs.in ($AUTOUPDATE): Default to address@hidden@' now.
+       ($AUTOM4TE): New variable, defaulting to address@hidden@'.
+       ($AUTORECONF): New variable, defaulting to address@hidden@'.
+       * doc/Makefile.am ($(srcdir)/amhello-1.0.tar.gz): Update.
+
+2011-05-22  Ralf Wildenhues  <address@hidden>
+           Stefano Lattarini  <address@hidden>
+
+       tests/README: fix example about `make -e' usage
+       * tests/README (Section "Writing test cases" subsection "Do"): When
+       some variable is never initialized in the Makefile, `-e' is not
+       necessary in order to override it.  DESTDIR is such a variable: we
+       ensure that we do not ever initialize it.  And as such, it is quite
+       portable to use:
+         $ make DESTDIR=/foo/bar install
+       and in fact, quite widely used.
+       So our example about when `make -e' is required, which references
+       the `DESTDIR' variable, is poorly chosen, if not downright wrong.
+       Rewrite it to use `prefix' as the overridden variable instead.
+
 2011-05-27  Stefano Lattarini  <address@hidden>
 
        testsuite: each test case depends on `defs-static'
diff --git a/Makefile.am b/Makefile.am
index 7ee282b..ff258ec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,6 +76,8 @@ do_subst = sed \
   -e 's,address@hidden@],$(PERL),g' \
   -e 's,address@hidden@],$(PERL_THREADS),g' \
   -e 's,address@hidden@],$(SHELL),g' \
+  -e 's,address@hidden@],$(am_AUTOCONF),g' \
+  -e 's,address@hidden@],$(am_AUTOM4TE),g' \
   -e 's,address@hidden@],$(VERSION),g' \
   -e 's,address@hidden@],Generated from address@hidden; do not edit by 
hand.,g' \
   -e 's,address@hidden@],$(datadir),g'
diff --git a/Makefile.in b/Makefile.in
index 9b976a7..30a06c9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -204,6 +204,9 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 am_AUTOCONF = @am_AUTOCONF@
 am_AUTOHEADER = @am_AUTOHEADER@
+am_AUTOM4TE = @am_AUTOM4TE@
+am_AUTORECONF = @am_AUTORECONF@
+am_AUTOUPDATE = @am_AUTOUPDATE@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@
@@ -271,6 +274,8 @@ do_subst = sed \
   -e 's,address@hidden@],$(PERL),g' \
   -e 's,address@hidden@],$(PERL_THREADS),g' \
   -e 's,address@hidden@],$(SHELL),g' \
+  -e 's,address@hidden@],$(am_AUTOCONF),g' \
+  -e 's,address@hidden@],$(am_AUTOM4TE),g' \
   -e 's,address@hidden@],$(VERSION),g' \
   -e 's,address@hidden@],Generated from address@hidden; do not edit by 
hand.,g' \
   -e 's,address@hidden@],$(datadir),g'
diff --git a/NEWS b/NEWS
index df4179b..3c8f8ce 100644
--- a/NEWS
+++ b/NEWS
@@ -125,6 +125,10 @@ Bugs fixed in 1.11a:
 
   - Java sources specified with check_JAVA are not compiled anymore upon
     "make all", but only upon "make check".
+
+  - Now aclocal and automake, when they've to spawn autoconf or autom4te
+    processes, honour the configure-time definitions of AUTOCONF and
+    AUTOM4TE.
 
 New in 1.11:
 
diff --git a/THANKS b/THANKS
index 5ee0e4c..c3cc55c 100644
--- a/THANKS
+++ b/THANKS
@@ -118,6 +118,7 @@ Geoffrey Keating    address@hidden
 Glenn Amerine          address@hidden
 Gord Matzigkeit                address@hidden
 Gordon Sadler          address@hidden
+Graham Reitz           address@hidden
 Greg A. Woods          address@hidden
 Greg Schafer           address@hidden
 Guido Draheim          address@hidden
diff --git a/aclocal.in b/aclocal.in
index 11bb9ee..394aeae 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -662,7 +662,7 @@ sub trace_used_macros ()
   my %files = map { $map{$_} => 1 } keys %macro_seen;
   %files = strip_redundant_includes %files;
 
-  my $traces = ($ENV{AUTOM4TE} || 'autom4te');
+  my $traces = ($ENV{AUTOM4TE} || '@am_AUTOM4TE@');
   $traces .= " --language Autoconf-without-aclocal-m4 ";
   # All candidate files.
   $traces .= join (' ',
diff --git a/automake.in b/automake.in
index a1c6f30..3d6993a 100644
--- a/automake.in
+++ b/automake.in
@@ -5313,7 +5313,7 @@ sub scan_autoconf_traces ($)
                sinclude => 1,
              );
 
-  my $traces = ($ENV{AUTOCONF} || 'autoconf') . " ";
+  my $traces = ($ENV{AUTOCONF} || '@am_AUTOCONF@') . " ";
 
   # Use a separator unlikely to be used, not `:', the default, which
   # has a precise meaning for AC_CONFIG_FILES and so on.
diff --git a/configure b/configure
index e2add32..c302483 100755
--- a/configure
+++ b/configure
@@ -605,7 +605,10 @@ am__isrc
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+am_AUTOUPDATE
 am_AUTOHEADER
+am_AUTORECONF
+am_AUTOM4TE
 am_AUTOCONF
 build_os
 build_vendor
@@ -1784,11 +1787,18 @@ case $build_os in *\ *) build_os=`echo "$build_os" | 
sed 's/ /-/g'`;; esac
 
 # Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it; this
 # way we can run Autoconf tests from configure (or from the test
-# suite) without being bothered by `missing'.  Likewise for autoheader.
+# suite) without being bothered by `missing'.  Likewise for autom4te,
+# autoreconf, autoheader, and autoupdate.
 am_AUTOCONF="${AUTOCONF-autoconf}"
 
+am_AUTOM4TE="${AUTOM4TE-autom4te}"
+
+am_AUTORECONF="${AUTORECONF-autoreconf}"
+
 am_AUTOHEADER="${AUTOHEADER-autoheader}"
 
+am_AUTOUPDATE="${AUTOUPDATE-autoupdate}"
+
 
 am__api_version='1.11a'
 
diff --git a/configure.ac b/configure.ac
index 577541c..437ce9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,9 +28,13 @@ AC_CANONICAL_BUILD
 
 # Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it; this
 # way we can run Autoconf tests from configure (or from the test
-# suite) without being bothered by `missing'.  Likewise for autoheader.
+# suite) without being bothered by `missing'.  Likewise for autom4te,
+# autoreconf, autoheader, and autoupdate.
 AC_SUBST([am_AUTOCONF], ["${AUTOCONF-autoconf}"])
+AC_SUBST([am_AUTOM4TE], ["${AUTOM4TE-autom4te}"])
+AC_SUBST([am_AUTORECONF], ["${AUTORECONF-autoreconf}"])
 AC_SUBST([am_AUTOHEADER], ["${AUTOHEADER-autoheader}"])
+AC_SUBST([am_AUTOUPDATE], ["${AUTOUPDATE-autoupdate}"])
 
 AM_INIT_AUTOMAKE([1.10a dist-bzip2 filename-length-max=99 color-tests
                  parallel-tests silent-rules])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 01cf663..ae4016c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -73,8 +73,14 @@ $(srcdir)/amhello-1.0.tar.gz: $(amhello_sources) 
$(top_srcdir)/configure.ac
        $(AM_V_GEN)PATH="`pwd`/../tests$(PATH_SEPARATOR)$$PATH" && \
        export PATH && \
        cd $(srcdir)/amhello && \
-       ACLOCAL=aclocal-$(APIVERSION) AUTOMAKE=automake-$(APIVERSION) \
-       autoreconf -vfi && \
+       ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL && \
+       AUTOMAKE=automake-$(APIVERSION) && export AUTOMAKE && \
+       AUTOCONF='$(am_AUTOCONF)' && export AUTOCONF && \
+       AUTOM4TE='$(am_AUTOM4TE)' && export AUTOM4TE && \
+       AUTORECONF='$(am_AUTORECONF)' && export AUTORECONF && \
+       AUTOHEADER='$(am_AUTOHEADER)' && export AUTOHEADER && \
+       AUTOUPDATE='$(am_AUTOUPDATE)' && export AUTOUPDATE && \
+       $(am_AUTORECONF) -vfi && \
        ./configure && \
        $(MAKE) $(AM_MAKEFLAGS) distcheck && \
        $(MAKE) $(AM_MAKEFLAGS) distclean && \
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 7bc40a6..ff01625 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -189,6 +189,9 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 am_AUTOCONF = @am_AUTOCONF@
 am_AUTOHEADER = @am_AUTOHEADER@
+am_AUTOM4TE = @am_AUTOM4TE@
+am_AUTORECONF = @am_AUTORECONF@
+am_AUTOUPDATE = @am_AUTOUPDATE@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@
@@ -860,8 +863,14 @@ $(srcdir)/amhello-1.0.tar.gz: $(amhello_sources) 
$(top_srcdir)/configure.ac
        $(AM_V_GEN)PATH="`pwd`/../tests$(PATH_SEPARATOR)$$PATH" && \
        export PATH && \
        cd $(srcdir)/amhello && \
-       ACLOCAL=aclocal-$(APIVERSION) AUTOMAKE=automake-$(APIVERSION) \
-       autoreconf -vfi && \
+       ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL && \
+       AUTOMAKE=automake-$(APIVERSION) && export AUTOMAKE && \
+       AUTOCONF='$(am_AUTOCONF)' && export AUTOCONF && \
+       AUTOM4TE='$(am_AUTOM4TE)' && export AUTOM4TE && \
+       AUTORECONF='$(am_AUTORECONF)' && export AUTORECONF && \
+       AUTOHEADER='$(am_AUTOHEADER)' && export AUTOHEADER && \
+       AUTOUPDATE='$(am_AUTOUPDATE)' && export AUTOUPDATE && \
+       $(am_AUTORECONF) -vfi && \
        ./configure && \
        $(MAKE) $(AM_MAKEFLAGS) distcheck && \
        $(MAKE) $(AM_MAKEFLAGS) distclean && \
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 20b1957..8719084 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -188,6 +188,9 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 am_AUTOCONF = @am_AUTOCONF@
 am_AUTOHEADER = @am_AUTOHEADER@
+am_AUTOM4TE = @am_AUTOM4TE@
+am_AUTORECONF = @am_AUTORECONF@
+am_AUTOUPDATE = @am_AUTOUPDATE@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 4eb7c6a..3274122 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -236,6 +236,9 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 am_AUTOCONF = @am_AUTOCONF@
 am_AUTOHEADER = @am_AUTOHEADER@
+am_AUTOM4TE = @am_AUTOM4TE@
+am_AUTORECONF = @am_AUTORECONF@
+am_AUTOUPDATE = @am_AUTOUPDATE@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 9195976..91e9bae 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -191,6 +191,9 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 am_AUTOCONF = @am_AUTOCONF@
 am_AUTOHEADER = @am_AUTOHEADER@
+am_AUTOM4TE = @am_AUTOM4TE@
+am_AUTORECONF = @am_AUTORECONF@
+am_AUTOUPDATE = @am_AUTOUPDATE@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 059ae97..674d4bf 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -148,6 +148,9 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 am_AUTOCONF = @am_AUTOCONF@
 am_AUTOHEADER = @am_AUTOHEADER@
+am_AUTOM4TE = @am_AUTOM4TE@
+am_AUTORECONF = @am_AUTORECONF@
+am_AUTOUPDATE = @am_AUTOUPDATE@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@
diff --git a/m4/Makefile.in b/m4/Makefile.in
index e508848..679930b 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -148,6 +148,9 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 am_AUTOCONF = @am_AUTOCONF@
 am_AUTOHEADER = @am_AUTOHEADER@
+am_AUTOM4TE = @am_AUTOM4TE@
+am_AUTORECONF = @am_AUTORECONF@
+am_AUTOUPDATE = @am_AUTOUPDATE@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@
diff --git a/tests/Makefile.in b/tests/Makefile.in
index d0430bf..44f8c97 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -243,6 +243,9 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 am_AUTOCONF = @am_AUTOCONF@
 am_AUTOHEADER = @am_AUTOHEADER@
+am_AUTOM4TE = @am_AUTOM4TE@
+am_AUTORECONF = @am_AUTORECONF@
+am_AUTOUPDATE = @am_AUTOUPDATE@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@
diff --git a/tests/README b/tests/README
index 29c964b..4d5288e 100644
--- a/tests/README
+++ b/tests/README
@@ -204,11 +204,11 @@ Do not
   here.)
 
   Do not override Makefile variables using make arguments, as in e.g.:
-    $MAKE DESTDIR=/foo/bar install
+    $MAKE prefix=/opt install
   This is not portable for recursive targets (targets that call a
-  sub-make may not pass `DESTDIR=/foo/bar' along).  Use the following
+  sub-make may not pass `prefix=/opt' along).  Use the following
   instead:
-    DESTDIR=/foo/bar $MAKE -e install
+    prefix=/opt $MAKE -e install
 
   Do not send a test case without signing a copyright disclaimer.
   See http://sources.redhat.com/automake/contribute.html or
diff --git a/tests/defs-static.in b/tests/defs-static.in
index 45f08bf..6d82956 100644
--- a/tests/defs-static.in
+++ b/tests/defs-static.in
@@ -89,8 +89,10 @@ SHELL='@SHELL@'; export SHELL
 test -z "$PERL" && PERL='@PERL@'
 test -z "$MAKE" && MAKE=make
 test -z "$AUTOCONF" && AUTOCONF="@am_AUTOCONF@"
+test -z "$AUTOM4TE" && AUTOM4TE="@am_AUTOM4TE@"
+test -z "$AUTORECONF" && AUTORECONF="@am_AUTORECONF@"
 test -z "$AUTOHEADER" && AUTOHEADER="@am_AUTOHEADER@"
-test -z "$AUTOUPDATE" && AUTOUPDATE=autoupdate
+test -z "$AUTOUPDATE" && AUTOUPDATE="@am_AUTOUPDATE@"
 test -z "$MISSING" && MISSING=$top_testsrcdir/lib/missing
 
 # Use -Werror because this also turns some Perl warnings into error.


hooks/post-receive
-- 
GNU Automake
[Prev in Thread]
Current Thread
[Next in Thread]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-833-g3eb0591, Stefano Lattarini <=
Prev by Date: [Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-886-g851e77a
Next by Date: [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-836-g2aa8c8e
Previous by thread: [Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-886-g851e77a
Next by thread: [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-836-g2aa8c8e
Index(es):
- Date
- Thread