no-dist-gzip

[Akim Demaille]

Gzip is really a pain in my case.  I'm suggesting this first stab.
Possible debates:

1. a warning when no-dist-gzip but no option to enable another format?
2. if so, where?
3. a better message at the end of distcheck?  It no longer gives the
   name of an archive.

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * automake.in (make_paragraphs): Define %GZIP%.
        (process_option_list): Accept no-dist-gzip2.
        * lib/am/distdir.am (dist-gzip): Now conditioned by %GZIP%.
        (distcheck): Depend upon distdir, not dist.
        Run make dist at the end.
        * automake.texi (Options): Adjust.

Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.215
diff -u -u -u -w -r1.215 NEWS
--- NEWS 2 Jun 2003 07:08:39 -0000 1.215
+++ NEWS 2 Jun 2003 15:35:34 -0000
@@ -121,6 +121,8 @@
   Autom4te's cache isn't needlessly invalidated.  This behavior can
   be switched off with the new `--force' option.
 
+* New option no-dist-gzip.
+
 
 New in 1.7:
 * Autoconf 2.54 is required.
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1461
diff -u -u -u -w -r1.1461 automake.in
--- automake.in 29 May 2003 19:05:55 -0000 1.1461
+++ automake.in 2 Jun 2003 15:35:35 -0000
@@ -1373,7 +1373,7 @@
 
 # $BOOL
 # process_option_list ($CONFIG, @OPTIONS)
-# ------------------------------
+# ---------------------------------------
 # Process a list of options.  Return 1 on error, 0 otherwise.
 # This is a helper for handle_options.  CONFIG is true if we're
 # handling global options.
@@ -1407,6 +1407,7 @@
       elsif ($_ eq 'no-installman' || $_ eq 'no-installinfo'
             || $_ eq 'dist-shar' || $_ eq 'dist-zip'
             || $_ eq 'dist-tarZ' || $_ eq 'dist-bzip2'
+            || $_ eq 'no-dist-gzip'
             || $_ eq 'dejagnu' || $_ eq 'no-texinfo.tex'
             || $_ eq 'readme-alpha' || $_ eq 'check-news'
             || $_ eq 'subdir-objects' || $_ eq 'nostdinc'
@@ -6649,10 +6650,11 @@
                     'MAINTAINER-MODE'
                     => $seen_maint_mode ? subst ('MAINTAINER_MODE_TRUE') : '',
 
-                    'SHAR'        => $options{'dist-shar'} || 0,
                     'BZIP2'       => $options{'dist-bzip2'} || 0,
-                    'ZIP'         => $options{'dist-zip'} || 0,
                     'COMPRESS'    => $options{'dist-tarZ'} || 0,
+                    'GZIP'        => $options{'no-dist-gzip'} ? 0 : 1,
+                    'SHAR'        => $options{'dist-shar'} || 0,
+                    'ZIP'         => $options{'dist-zip'} || 0,
 
                     'INSTALL-INFO' => !$options{'no-installinfo'},
                     'INSTALL-MAN'  => !$options{'no-installman'},
Index: automake.texi
===================================================================
RCS file: /cvs/automake/automake/automake.texi,v
retrieving revision 1.339
diff -u -u -u -w -r1.339 automake.texi
--- automake.texi 22 May 2003 20:44:11 -0000 1.339
+++ automake.texi 2 Jun 2003 15:35:35 -0000
@@ -4944,6 +4944,12 @@
 to make automatic dependency tracking work @xref{Dependencies}.  In this
 case the effect is to effectively disable automatic dependency tracking.
 
address@hidden @code{no-dist-gzip}
address@hidden Option, no-dist-gzip
+Do not generate a @code{dist-gzip} target, and don't bind it to
address@hidden
address@hidden no-dist-gzip
+
 @item @code{no-exeext}
 @cindex Option, no-exeext
 If your @file{Makefile.am} defines a target @samp{foo}, it will override
Index: stamp-vti
===================================================================
RCS file: /cvs/automake/automake/stamp-vti,v
retrieving revision 1.246
diff -u -u -u -w -r1.246 stamp-vti
--- stamp-vti 2 Jun 2003 07:08:39 -0000 1.246
+++ stamp-vti 2 Jun 2003 15:35:35 -0000
@@ -1,4 +1,4 @@
address@hidden UPDATED 28 May 2003
address@hidden UPDATED-MONTH May 2003
address@hidden UPDATED 2 June 2003
address@hidden UPDATED-MONTH June 2003
 @set EDITION 1.7a
 @set VERSION 1.7a
Index: version.texi
===================================================================
RCS file: /cvs/automake/automake/version.texi,v
retrieving revision 1.318
diff -u -u -u -w -r1.318 version.texi
--- version.texi 2 Jun 2003 07:08:39 -0000 1.318
+++ version.texi 2 Jun 2003 15:35:35 -0000
@@ -1,4 +1,4 @@
address@hidden UPDATED 28 May 2003
address@hidden UPDATED-MONTH May 2003
address@hidden UPDATED 2 June 2003
address@hidden UPDATED-MONTH June 2003
 @set EDITION 1.7a
 @set VERSION 1.7a
Index: lib/am/distdir.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/distdir.am,v
retrieving revision 1.46
diff -u -u -u -w -r1.46 distdir.am
--- lib/am/distdir.am 15 Apr 2003 20:40:31 -0000 1.46
+++ lib/am/distdir.am 2 Jun 2003 15:35:35 -0000
@@ -213,11 +213,13 @@
 
 if %?TOPDIR_P%
 
+if  %?GZIP%
 GZIP_ENV = --best
 .PHONY: dist-gzip
 dist-gzip: distdir
        $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
        $(am__remove_distdir)
+endif  %?GZIP%
 
 if  %?BZIP2%
 .PHONY: dist-bzip2
@@ -266,7 +268,7 @@
 
 .PHONY: dist dist-all
 dist dist-all: distdir
-       $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+?GZIP? $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 ?BZIP2?        $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
 ?COMPRESS?     $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
 ?SHAR? shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
@@ -287,9 +289,7 @@
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
 .PHONY: distcheck
-distcheck: dist
-       $(am__remove_distdir)
-       GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+distcheck: distdir
 ## Make the new source tree read-only.  Distributions ought to work in
 ## this case.  However, make the top-level directory writable so we
 ## can make our new subdirs.
@@ -340,13 +340,13 @@
                    distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
              } || { rm -rf "$$dc_destdir"; exit 1; }) \
          && rm -rf "$$dc_destdir" \
-         && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
-## Make sure to remove the dist file we created in the test build
+         && $(MAKE) $(AM_MAKEFLAGS) distdir \
+## Make sure to remove the dist dir we created in the test build
 ## directory.
-         && rm -f $(distdir).tar.gz \
+         && rm -rf $(distdir) \
          && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-       $(am__remove_distdir)
-       @echo "$(distdir).tar.gz is ready for distribution" | \
+       $(MAKE) $(AM_MAKEFLAGS) dist
+       @echo "$(distdir) is ready for distribution" | \
          sed 'h;s/./=/g;p;x;p;x'
 
 ## Define distuninstallcheck_listfiles and distuninstallcheck separately