[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-614-gbbce9c2

[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=bbce9c2b229b4791974f0433c75b0bdd4ebc7c4e

The branch, maint has been updated
       via  bbce9c2b229b4791974f0433c75b0bdd4ebc7c4e (commit)
       via  bff8cecacd4a9f5697fe9c5c0a72c29c0c8ca947 (commit)
       via  34feafeec134a7bdc99d1b261fd97e6c0c5ab716 (commit)
       via  0878bd3455f488f5c70f2ba92cc0139319026ec0 (commit)
      from  cec3f327d5b70c8dba59485f221813e281cc972c (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 bbce9c2b229b4791974f0433c75b0bdd4ebc7c4e
Merge: bff8cec 0878bd3
Author: Stefano Lattarini <address@hidden>
Date:   Sat Dec 31 08:47:34 2011 +0100

    Merge branch 'dist-lzip' into maint
    
    * dist-lzip:
      dist: add support for lzip compression

commit bff8cecacd4a9f5697fe9c5c0a72c29c0c8ca947
Author: Stefano Lattarini <address@hidden>
Date:   Fri Dec 30 19:22:55 2011 +0100

    test defs: more granular overriding of the make program
    
    Before this change, the only way the user could override the make
    program used in the automake test cases was to override the $MAKE
    variable in the environment.  This had the annoying side effect of
    requiring that, whenever a non-default make program was to be used
    in the test cases, that same make program had to be used to drive
    the execution of the automake testsuite; otherwise, the recursive
    make invocations could pick up $MAKE from the environment, and use
    that instead of re-executing with the correct make.
    
    So, for example, if one wanted to try how Solaris /usr/ccs/bin/make
    behaved in the automake test cases, he couldn't run the testsuite
    in parallel mode, because that make lacks support for concurrent
    execution of recipes; on fast machines, this easily meant a 4x or
    higher slow-down.
    
    Once the problem is clear, the solution is pretty simple: allow
    the use of another variable, besides $MAKE, to override the make
    program to be used in the test cases.
    
    See also commit `v1.11-1318-g3ceeef4', that introduced a more
    general version of this change to the master branch.
    
    * tests/defs.in: Allow the make implementation to be used by the
    test cases to be overridden by the `$AM_TESTSUITE_MAKE' variable,
    in preference to the `$MAKE' variable.

commit 34feafeec134a7bdc99d1b261fd97e6c0c5ab716
Author: Stefano Lattarini <address@hidden>
Date:   Fri Dec 30 18:13:28 2011 +0100

    docs: fix a couple broken anchors
    
    * doc/automake.texi: In previous commit v1.11-605-g5f71f2b (related
    to automake bug#8071), we had renamed the chapters about aclocal
    and automake invocation, and added anchors to the old names as not
    to break hyperlinks to our on-line manual.  Unfortunately, these
    anchors had been erroneously placed *before* the relevant address@hidden'
    commands, instead that just after, so that they ended up pointing
    to the wrong chapters.  Fix this.  Since we are at it, tweak the
    wording of the comments to the anchors to better match that used
    in the autoconf manual.
    
    Report and suggestion by Eric Blake.

commit 0878bd3455f488f5c70f2ba92cc0139319026ec0
Author: Antonio Diaz Diaz <address@hidden>
Date:   Fri Dec 30 14:35:18 2011 +0100

    dist: add support for lzip compression
    
    * NEWS: Update.
    * automake.in (handle_dist): Recognize dist-lzip.
    (make_paragraphs): Map LZIP to dist-lzip.
    * doc/automake.texi (Dist, Options): Describe dist-lzip.
    * lib/Automake/Options.pm (_process_option_list): Recognize
    `dist-lzip'.
    * lib/am/distdir.am (dist-lzip): New target.
    (DIST_ARCHIVES) [?LZIP?]: Add `dist-lzip'.
    (dist, dist-all) [?LZIP?]: Add command to create an lzip-compressed
    tarball.
    (distcheck): Handle lzip-compressed tarballs just like the others.
    * tests/lzip.test: New test.
    * tests/Makefile.am (TESTS): Add it.

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

Summary of changes:
 NEWS                         |    2 ++
 automake.in                  |    3 ++-
 doc/automake.texi            |   28 ++++++++++++++++++++--------
 lib/Automake/Options.pm      |    2 +-
 lib/am/distdir.am            |    9 +++++++++
 tests/Makefile.am            |    1 +
 tests/defs.in                |    2 +-
 tests/{xz.test => lzip.test} |   14 ++++++++------
 8 files changed, 44 insertions(+), 17 deletions(-)
 copy tests/{xz.test => lzip.test} (79%)
 mode change 100755 => 100644

diff --git a/NEWS b/NEWS
index 0c0a2dc..7b3dedf 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,8 @@ New in 1.11.0a:
 
 * Miscellaneous changes:
 
+  - "make dist" can now create lzip-compressed tarballs.
+
   - 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/automake.in b/automake.in
index 7efb7d5..f235c9d 100644
--- a/automake.in
+++ b/automake.in
@@ -3921,7 +3921,7 @@ sub handle_dist ()
     {
       my $archive_defined = option 'no-dist-gzip' ? 0 : 1;
       $archive_defined ||=
-       grep { option "dist-$_" } qw(shar zip tarZ bzip2 lzma xz);
+       grep { option "dist-$_" } qw(shar zip tarZ bzip2 lzip lzma xz);
       error (option 'no-dist-gzip',
             "no-dist-gzip specified but no dist-* specified, "
             . "at least one archive format must be enabled")
@@ -7122,6 +7122,7 @@ sub make_paragraphs ($%)
 
                 'XZ'          => !! option 'dist-xz',
                 'LZMA'        => !! option 'dist-lzma',
+                'LZIP'        => !! option 'dist-lzip',
                 'BZIP2'       => !! option 'dist-bzip2',
                 'COMPRESS'    => !! option 'dist-tarZ',
                 'GZIP'        =>  ! option 'no-dist-gzip',
diff --git a/doc/automake.texi b/doc/automake.texi
index e155fd1..4bae611 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -2492,11 +2492,11 @@ with different flags.  In this instance, the names of 
the object files
 would be chosen by automake; they would be @file{false-true.o} and
 @file{true-true.o}. (The name of the object files rarely matters.)
 
address@hidden The anchor is required to avoid breaking existing web hyperlinks
address@hidden still using the old name of this node.
address@hidden automake}
 @node automake Invocation
 @chapter Creating a @file{Makefile.in}
address@hidden This node used to be named "Invoking automake".  This @anchor
address@hidden allows old links to still work.
address@hidden automake}
 
 @cindex Multiple @file{configure.ac} files
 @cindex Invoking @command{automake}
@@ -3108,11 +3108,11 @@ macros installed in a system-wide directory, 
@pxref{aclocal Invocation}).
 
 @end ftable
 
address@hidden The anchor is required to avoid breaking existing web hyperlinks
address@hidden still using the old name of this node.
address@hidden aclocal}
 @node aclocal Invocation
 @section Auto-generating aclocal.m4
address@hidden This node used to be named "Invoking automake".  This @anchor
address@hidden allows old links to still work.
address@hidden aclocal}
 
 @cindex Invocation of @command{aclocal}
 @cindex @command{aclocal}, Invocation
@@ -8666,6 +8666,11 @@ environment variable.  For example, @samp{make 
dist-bzip2 BZIP2=-7}.
 Generate a gzip tar archive of the distribution.
 @trindex dist-gzip
 
address@hidden @code{dist-lzip}
+Generate a @samp{lzip} tar archive of the distribution.  @command{lzip}
+archives are frequently smaller than @command{bzip2}-compressed archives.
address@hidden dist-lzip
+
 @item @code{dist-lzma}
 Generate an @samp{lzma} tar archive of the distribution.  @command{lzma}
 archives are frequently smaller than @command{bzip2}-compressed archives.
@@ -9278,6 +9283,12 @@ Cause @command{dejagnu}-specific rules to be generated.  
@xref{DejaGnu Tests}.
 Hook @code{dist-bzip2} to @code{dist}.
 @trindex dist-bzip2
 
address@hidden @option{dist-lzip}
address@hidden Option, @option{dist-lzip}
address@hidden dist-lzip
+Hook @code{dist-lzip} to @code{dist}.
address@hidden dist-lzip
+
 @item @option{dist-lzma}
 @cindex Option, @option{dist-lzma}
 @opindex dist-lzma
@@ -9478,7 +9489,8 @@ In order to use this option with C sources, you should add
 These three mutually exclusive options select the tar format to use
 when generating tarballs with @samp{make dist}.  (The tar file created
 is then compressed according to the set of @option{no-dist-gzip},
address@hidden, @option{dist-xz} and @option{dist-tarZ} options in use.)
address@hidden, @option{dist-lzip}, @option{dist-xz} and
address@hidden options in use.)
 
 These options must be passed as arguments to @code{AM_INIT_AUTOMAKE}
 (@pxref{Macros}) because they can require additional configure checks.
@@ -13542,4 +13554,4 @@ parentheses is the number of generated test cases.
 @c  LocalWords:  LTALLOCA MALLOC malloc memcmp strdup alloca libcompat xyz DFOO
 @c  LocalWords:  unprefixed buildable preprocessed DBAZ DDATADIR WARNINGCFLAGS
 @c  LocalWords:  LIBFOOCFLAGS LIBFOOLDFLAGS ftable testSubDir obj LIBTOOLFLAGS
address@hidden  LocalWords:  barexec Pinard's automatize initialize lzma xz
address@hidden  LocalWords:  barexec Pinard's automatize initialize lzip lzma xz
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index b7ff3d1..388d4b9 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -264,7 +264,7 @@ sub _process_option_list (\%$@)
       elsif ($_ eq 'no-installman' || $_ eq 'no-installinfo'
             || $_ eq 'dist-shar' || $_ eq 'dist-zip'
             || $_ eq 'dist-tarZ' || $_ eq 'dist-bzip2'
-            || $_ eq 'dist-lzma' || $_ eq 'dist-xz'
+            || $_ eq 'dist-lzip' || $_ eq 'dist-lzma' || $_ eq 'dist-xz'
             || $_ eq 'no-dist-gzip' || $_ eq 'no-dist'
             || $_ eq 'dejagnu' || $_ eq 'no-texinfo.tex'
             || $_ eq 'readme-alpha' || $_ eq 'check-news'
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index f685ec1..a681101 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -344,6 +344,12 @@ dist-bzip2: distdir
        tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c 
>$(distdir).tar.bz2
        $(am__remove_distdir)
 
+?LZIP?DIST_ARCHIVES += $(distdir).tar.lz
+.PHONY: dist-lzip
+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
@@ -396,6 +402,7 @@ endif %?SUBDIRS%
 dist dist-all: distdir
 ?GZIP? tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c 
>$(distdir).tar.gz
 ?BZIP2?        tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c 
>$(distdir).tar.bz2
+?LZIP? tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} 
>$(distdir).tar.lz
 ?LZMA? tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
 ?XZ?   tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c 
>$(distdir).tar.xz
 ?COMPRESS?     tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
@@ -429,6 +436,8 @@ distcheck: dist
          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*) \
          xz -dc $(distdir).tar.xz | $(am__untar) ;;\
        *.tar.Z*) \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 21afdf4..2f1ac0d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -550,6 +550,7 @@ ltinstloc.test \
 ltlibobjs.test \
 ltlibsrc.test \
 ltorder.test \
+lzip.test \
 lzma.test \
 m4-inclusion.test \
 maintclean.test \
diff --git a/tests/defs.in b/tests/defs.in
index aa8eb63..0ee53c2 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -95,8 +95,8 @@ PATH_SEPARATOR='@PATH_SEPARATOR@'
 SHELL='@SHELL@'
 export SHELL
 # User can override various tools used.
+MAKE=${AM_TESTSUITE_MAKE-${MAKE-'make'}}
 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@"
diff --git a/tests/xz.test b/tests/lzip.test
old mode 100755
new mode 100644
similarity index 79%
copy from tests/xz.test
copy to tests/lzip.test
index f442711..ab62990
--- a/tests/xz.test
+++ b/tests/lzip.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
+# Copyright (C) 2011 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,23 +14,23 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check support for no-dist-gzip with xz
+# Check support for no-dist-gzip with lzip.
 
-required=xz
+required=lzip
 . ./defs || Exit 1
 
 set -e
 
 cat > configure.in << 'END'
-AC_INIT([xz], [1.0])
-AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
+AC_INIT([lzip], [1.0])
+AM_INIT_AUTOMAKE([no-dist-gzip dist-lzip])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
 test: distcheck
-       test $(DIST_ARCHIVES) = xz-1.0.tar.xz
+       test $(DIST_ARCHIVES) = lzip-1.0.tar.lz
        test -f $(DIST_ARCHIVES)
 END
 
@@ -39,3 +39,5 @@ $AUTOCONF
 $AUTOMAKE
 ./configure
 $MAKE test
+
+:


hooks/post-receive
-- 
GNU Automake