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

[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=29ce538b0c32f2295eb8577f5f7af4a5bf8d695f

The branch, master has been updated
       via  29ce538b0c32f2295eb8577f5f7af4a5bf8d695f (commit)
       via  7db422b23f1921c94a6eea7489b10b98fc7ef183 (commit)
       via  01fef4ae9e0ea43fba4a5cc836ad42f45805c6b8 (commit)
       via  104f3027a7f0d0d4dc0f01e786f7deec9707a863 (commit)
       via  02e90723551e707d77fb972aa47b4bc3f0fb0029 (commit)
       via  4f3e5b5c883fb2cf867e9d7734690a283a1165ee (commit)
       via  da14dc7d8a597bf0960cc565f16b728955f4ebe4 (commit)
       via  3cec0f63c97df20bb559851ed04186dbb902cc07 (commit)
       via  d2fc8246603a665891b673d4a3b759e846232ff0 (commit)
       via  54af9ca84664208507afed2ee2707145b2d2890a (commit)
       via  b722b10866f0d67c053e3dc8079b81127b9a451b (commit)
       via  14cc1b8d4bc61f8be0a8bfd2d1a2f505ad3f0328 (commit)
       via  620ba14f54a994d3b695001546a4734282902bba (commit)
      from  c1b14e966c2aa929e80bdfb259d0a81813859509 (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 -----------------------------------------------------------------
commit 29ce538b0c32f2295eb8577f5f7af4a5bf8d695f
Merge: 104f302 7db422b
Author: Stefano Lattarini <address@hidden>
Date:   Sun Jan 1 19:44:24 2012 +0100

    Merge branch 'msvc'
    
    * msvc:
      tests: fix spurious failure due to autom4te caching
      news: fix suboptimal wording
      tests: various minor tweakings, mostly related to AM_PROG_AR

commit 104f3027a7f0d0d4dc0f01e786f7deec9707a863
Author: Stefano Lattarini <address@hidden>
Date:   Sun Jan 1 19:06:00 2012 +0100

    tests: fix spurious failure of 'get-sysconf.test'
    
    * tests/get-sysconf.test: Do not assume that a ChangeLog file exists
    in $(srcdir): now that the ChangeLog is autogenerated and not under
    version control anymore, this is not necessary true.  Instead, if we
    are running from a git checkout, use "git log" to get information on
    the version of the automake snapshot being tested (and fall back on
    extracting the first ChangeLog entry otherwise).
    
    Reported by Jim Meyering in automake bug#10418.

commit 02e90723551e707d77fb972aa47b4bc3f0fb0029
Author: Stefano Lattarini <address@hidden>
Date:   Sun Jan 1 13:23:19 2012 +0100

    dist: remove support for lzma (superseded by xz and lzip)
    
    See also commit `v1.11-611-ge637fa2' (from maint), where support
    for lzma compression of distribution archive had been deprecated.
    
    * NEWS: Update.
    * lib/Automake/Options.pm: Error out if the `dist-lzma' option
    is used.
    * lib/am/distdir.am: Remove all support for the creation of a
    lzma-compressed distribution archive.
    * tests/lzma.test: Update.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog.11            |   66 ++++++++++++++++++++++++++++++++++++++++++++++-
 NEWS                    |    7 ++---
 lib/Automake/Options.pm |    7 +---
 lib/am/distdir.am       |    9 ------
 tests/alloca2.test      |    2 +
 tests/ar-lib3.test      |    1 +
 tests/get-sysconf.test  |   14 +++++++++-
 tests/ldadd.test        |    5 ++-
 tests/libtool4.test     |    3 ++
 tests/lzma.test         |   21 +++------------
 tests/pr211.test        |    2 +-
 tests/reqd2.test        |    6 +++-
 tests/syntax.test       |    6 ++--
 13 files changed, 105 insertions(+), 44 deletions(-)

diff --git a/ChangeLog.11 b/ChangeLog.11
index cd60419..50b37ec 100644
--- a/ChangeLog.11
+++ b/ChangeLog.11
@@ -218,7 +218,6 @@
        nested variables, and substitute AM_V and AM_DEFAULT_V accordingly.
        * tests/silent-nested-vars.test: New test.
        * tests/Makefile.am (TESTS): Add it.
->>>>>>> maint
 
 2011-12-24  Stefano Lattarini  <address@hidden>
 
@@ -1079,6 +1078,71 @@
        Yikes.  Cater to this incompatibility, by relaxing the test when
        a faulty `rm' is detected.
 
+2011-11-10  Stefano Lattarini  <address@hidden>
+
+       tests: various minor tweakings, mostly related to AM_PROG_AR
+       * tests/alloca2.test: Ensure we don't experience a spurious failure
+       due to a missing `AM_PROG_AR' macro or a missing `ar-lib' auxiliary
+       script.
+       * tests/libtool4.test: Likewise.
+       * tests/ldadd.test: Likewise.  Since we are at it, make grepping of
+       automake stderr stricter.
+       * tests/reqd2.test: Likewise.
+       * tests/pr211.test: Ensure automake fails also with `-Wnone', since
+       the error we are testing for is an hard error, not a mere warning.
+       * tests/syntax.test: Likewise, and ensure we don't fail to other
+       errors by removing use of `lib_LTLIBRARIES' in Makefile.am.  Since
+       we are at it, make grepping of automake stderr stricter.
+
+2011-11-05  Stefano Lattarini  <address@hidden>
+
+       ar-lib: fix configure output for "unrecognized archiver interface"
+       * m4/ar-lib.m4: Ensure that, even when an error is hit while trying
+       to determine the archiver interface kind, the "checking archiver
+       interface" message from configure is properly terminated before
+       an error message is printed, to avoid slightly garbled output.
+       * tests/ar4.test: Enhance.
+       * tests/ar5.test: Likewise.
+
+2011-11-04  Stefano Lattarini  <address@hidden>
+
+       warnings: fix buglets for portability warnings
+       * lib/Automake/ChannelDefs.pm (switch_warning): Ensure the
+       correct implications and inter-dependencies between warnings
+       in the categories `portability', `extra-portability' and
+       `recursive-portability' are respected.  Also add detailed
+       explicative comments, and references to the relevant tests.
+       * tests/dollarvar2.test: Update and extend.  Also, remove
+       some unnecessary uses of `--force' option in automake calls.
+       * tests/extra-portability3.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+
+2011-11-04  Stefano Lattarini  <address@hidden>
+
+       tests: extend tests on 'extra-portability' warning category
+       * tests/extra-portability.test: Redefine `$AUTOMAKE' to ensure we
+       have complete control over the automake options.  Extend by using
+       also a setup where no `portability' warning is present (only an
+       `extra-portability' warning is).  Other minor extensions.  Remove
+       some redundant, verbose comments about the expected diagnostic.
+
+2011-11-03  Stefano Lattarini  <address@hidden>
+
+       tests: various minor tweakings, mostly related to AM_PROG_AR
+       * tests/alloca.test: Adjust to new portability requirements due
+       to the new AM_PROG_AR macro.
+       * tests/discover.test: Likewise.
+       * tests/libobj3.test: Likewise.
+       * tests/pluseq7.test: Likewise.  Also, make grepping of automake
+       expected error message stricter.
+       * tests/stdlib.test: Likewise, and extend the test a bit.
+       * tests/parse.test (configure.in): Remove redundant call to
+       AC_PROG_RANLIB.
+       * tests/library2.test: Adjust to new portability requirements
+       due to the new AM_PROG_AR macro.  Also ...
+       (configure.in): ... add call to AC_PROG_CC, to ensure automake
+       really fails for the expected reason.
+
 2011-11-05  Stefano Lattarini  <address@hidden>
 
        ar-lib: fix configure output for "unrecognized archiver interface"
diff --git a/NEWS b/NEWS
index a64847d..6f6051b 100644
--- a/NEWS
+++ b/NEWS
@@ -4,10 +4,6 @@ New in 1.11a:
 
   - automake now generates silenced rules for texinfo outputs.
 
-  - The `lzma' compression format for distribution archives has been
-    deprecated in favor of `xz' and `lzip', and will be removed in the
-    next major Automake release (1.12).
-
   - The deprecated options `--output-dir', `--Werror' and `--Wno-error'
     have been removed.
 
@@ -109,6 +105,9 @@ New in 1.11a:
 
   - "make dist" can now create lzip-compressed tarballs.
 
+  - The deprecated `lzma' compression format for distribution archives
+    has been removed, in favor of `xz' and `lzip'.
+
   - In the Automake info documentation, the Top node and the nodes about
     the invocation of the automake and aclocal programs have been renamed;
     now, calling "info automake" will open the Top node, while calling
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 34c026c..75a7392 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -274,11 +274,8 @@ sub _process_option_list (\%@)
        }
       elsif ($_ eq 'dist-lzma')
         {
-          # Creation of distribution tarball compressed with lzma is
-          # deprecated, will be removed in the next major release.
-          msg 'obsolete', $where,
-              "lzma compression is deprecated; use `dist-xz' " .
-              "or `dist-lzip' instead\n";
+          error ($where, "support for lzma-compressed distribution " .
+                         "archives has been removed");
         }
       elsif ($_ eq 'no-installman' || $_ eq 'no-installinfo'
             || $_ eq 'dist-shar' || $_ eq 'dist-zip'
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 2697efc..d8c1a89 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -355,12 +355,6 @@ dist-lzip: distdir
        tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} 
>$(distdir).tar.lz
        $(am__remove_distdir)
 
-?LZMA?DIST_ARCHIVES += $(distdir).tar.lzma
-.PHONY: dist-lzma
-dist-lzma: distdir
-       tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-       $(am__post_remove_distdir)
-
 ?XZ?DIST_ARCHIVES += $(distdir).tar.xz
 .PHONY: dist-xz
 dist-xz: distdir
@@ -386,7 +380,6 @@ dist-zip: distdir
        zip -rq $(distdir).zip $(distdir)
        $(am__post_remove_distdir)
 
-?LZMA?DIST_TARGETS += dist-lzma
 ?LZIP?DIST_TARGETS += dist-lzip
 ?XZ?DIST_TARGETS += dist-xz
 ?SHAR?DIST_TARGETS += dist-shar
@@ -440,8 +433,6 @@ distcheck: dist
          GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
        *.tar.bz2*) \
          bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-       *.tar.lzma*) \
-         lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
        *.tar.lz*) \
          lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
        *.tar.xz*) \
diff --git a/tests/alloca2.test b/tests/alloca2.test
index 8ebdcd7..0c1ac4d 100755
--- a/tests/alloca2.test
+++ b/tests/alloca2.test
@@ -20,6 +20,7 @@
 
 cat >> configure.in <<'END'
 AC_PROG_CC
+AM_PROG_AR
 END
 
 cat > Makefile.am << 'END'
@@ -29,6 +30,7 @@ libtu_la_LIBADD = @LTALLOCA@
 END
 
 : > alloca.c
+: > ar-lib
 
 $ACLOCAL
 AUTOMAKE_fails
diff --git a/tests/ar-lib3.test b/tests/ar-lib3.test
index 4235bdb..8be96fa 100755
--- a/tests/ar-lib3.test
+++ b/tests/ar-lib3.test
@@ -37,6 +37,7 @@ cat >> configure.in << 'END'
 AM_PROG_AR
 END
 
+rm -rf autom4te*.cache
 $ACLOCAL
 $AUTOMAKE --add-missing
 
diff --git a/tests/get-sysconf.test b/tests/get-sysconf.test
index fe78d70..039a436 100755
--- a/tests/get-sysconf.test
+++ b/tests/get-sysconf.test
@@ -23,7 +23,19 @@
 . ./defs || Exit 1
 
 st=0
-sed 20q "$top_testsrcdir/ChangeLog" || st=1
+if test -d "$top_testsrcdir"/.git; then
+  # We are running from a git checkout.
+  git log -1 || st=1
+else
+  # We are probably running from a distribution tarball, so
+  # the ChangeLog file must be present.
+  awk '
+    BEGIN { first = 1 }
+    (first == 1) { print; first = 0; next; }
+    /^[^\t]/ { exit(0); }
+    { print }
+  ' "$top_testsrcdir"/ChangeLog || st=1
+fi
 $PERL -V || st=1
 cat "$top_testbuilddir/config.log" || st=1
 cat "$testbuilddir/aclocal-$APIVERSION" || st=1
diff --git a/tests/ldadd.test b/tests/ldadd.test
index 12785fa..4c5dd7b 100755
--- a/tests/ldadd.test
+++ b/tests/ldadd.test
@@ -40,6 +40,7 @@ END
 : > q.c
 
 $ACLOCAL || Exit 1
-AUTOMAKE_fails
-grep LDADD stderr || Exit 1
+AUTOMAKE_fails -Wno-extra-portability
+grep "libtu_la_LDADD" stderr
+grep " use [\`"']libtu_la_LIBADD' stderr
 Exit 0
diff --git a/tests/libtool4.test b/tests/libtool4.test
index 22d0cb5..a694586 100755
--- a/tests/libtool4.test
+++ b/tests/libtool4.test
@@ -20,12 +20,15 @@
 
 cat >> configure.in <<'END'
 AC_PROG_CC
+AM_PROG_AR
 END
 
 cat > Makefile.am << 'END'
 EXTRA_LTLIBRARIES = liblib.la
 END
 
+: > ar-lib
+
 $ACLOCAL
 AUTOMAKE_fails
 grep '[Ll]ibtool library .*LIBTOOL.* undefined' stderr
diff --git a/tests/lzma.test b/tests/lzma.test
index 6c42ae9..28b4198 100755
--- a/tests/lzma.test
+++ b/tests/lzma.test
@@ -18,11 +18,11 @@
 
 . ./defs || Exit 1
 
-errmsg='lzma.*deprecated.*dist-xz.*dist-lzip.*instead'
+errmsg='support for lzma.*removed'
 
 echo AUTOMAKE_OPTIONS = dist-lzma > Makefile.am
 $ACLOCAL --force
-AUTOMAKE_fails -Wnone -Wobsolete
+AUTOMAKE_fails -Wnone -Wno-error
 grep "^Makefile\\.am:1:.*$errmsg" stderr
 
 cat > configure.in << 'END'
@@ -31,23 +31,10 @@ AM_INIT_AUTOMAKE([no-dist-gzip dist-lzma])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 END
-
-cat > Makefile.am << 'END'
-test: distcheck
-       test $(DIST_ARCHIVES) = lzma-1.0.tar.lzma
-       test -f $(DIST_ARCHIVES)
-END
+: > Makefile.am
 
 $ACLOCAL --force
-AUTOMAKE_fails
+AUTOMAKE_fails -Wnone -Wno-error
 grep "^configure\\.in:2:.*$errmsg" stderr
 
-$AUTOMAKE -Wno-obsolete
-
-lzma --version || skip_ "lzma compressor required for the rest of the test"
-
-$AUTOCONF
-./configure
-$MAKE test
-
 :
diff --git a/tests/pr211.test b/tests/pr211.test
index 5d4f0c1..5ed79dd 100755
--- a/tests/pr211.test
+++ b/tests/pr211.test
@@ -46,7 +46,7 @@ END
 
 libtoolize
 $ACLOCAL
-AUTOMAKE_fails -a
+AUTOMAKE_fails -Wnone -a
 $FGREP 'foo.$(OBJEXT)' stderr
 
 :
diff --git a/tests/reqd2.test b/tests/reqd2.test
index dfb2371..236e521 100755
--- a/tests/reqd2.test
+++ b/tests/reqd2.test
@@ -27,6 +27,7 @@ AC_CONFIG_AUX_DIR([autoconf])
 AM_INIT_AUTOMAKE
 AC_CONFIG_FILES([Makefile])
 AC_PROG_CC
+AM_PROG_AR
 AM_PROG_LIBTOOL
 AC_CONFIG_FILES([autoconf/Makefile main/Makefile])
 AC_OUTPUT
@@ -43,6 +44,7 @@ lib_LTLIBRARIES = lib0.la
 lib0_la_SOURCES = 0.c
 END
 
+: > ar-lib
 libtoolize --force --copy
 $ACLOCAL
 $AUTOCONF
@@ -50,4 +52,6 @@ $AUTOCONF
 test -f autoconf/ltmain.sh # Sanity check.
 rm -f autoconf/ltmain.sh
 AUTOMAKE_fails --add-missing --copy
-grep 'autoconf/ltmain.sh' stderr
+grep '^configure\.in:7:.* required file.*autoconf/ltmain\.sh' stderr
+
+:
diff --git a/tests/syntax.test b/tests/syntax.test
index 7834136..4957b8e 100755
--- a/tests/syntax.test
+++ b/tests/syntax.test
@@ -22,11 +22,11 @@
 cat > Makefile.am << 'END'
 foo = q \
 
-bar = z
+bin_SCRIPTS = foo.sh
 END
 
 $ACLOCAL
-AUTOMAKE_fails
-grep '^Makefile\.am:2:.*blank line follow.* trailing backslash' stderr
+AUTOMAKE_fails -Wnone
+grep '^Makefile\.am:2:.*blank line following trailing backslash' stderr
 
 :


hooks/post-receive
-- 
GNU Automake