* Makefile.in: Rebuilt.

	* Makefile.am: Updated to reflect removal of TAR subst.
	* automake.texi (Options): Document dist-bzip2.
	* automake.in (TAR): Removed global.
	(initialize_global_constants): Changed `dist' to use pipe with
	gzip; work with non-GNU tar.
	(handle_dist): Handle non-GNU tar.  Don't define TAR.
	(initialize_global_constants): Added `dist-bzip2' entry.
	(handle_options): Recognize dist-bzip2 option.
	(handle_dist): Likewise.
	* configure: Rebuilt.
	* configure.in: Don't check for tar.
	* m4/init.m4 (AM_INIT_AUTOMAKE): Check for `tar'.  Substitute
	AMTARFLAGS.

diff --git a/ChangeLog b/ChangeLog
index ae290622dac36c7fd87612531db597fe43e2b799..8c1d934bf964bf2815f81b93ec528431f3cd721a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 1999-03-26  Tom Tromey  <tromey@cygnus.com>
 
+       * Makefile.in: Rebuilt.
+       * Makefile.am: Updated to reflect removal of TAR subst.
+       * automake.texi (Options): Document dist-bzip2.
+       * automake.in (TAR): Removed global.
+       (initialize_global_constants): Changed `dist' to use pipe with
+       gzip; work with non-GNU tar.
+       (handle_dist): Handle non-GNU tar.  Don't define TAR.
+       (initialize_global_constants): Added `dist-bzip2' entry.
+       (handle_options): Recognize dist-bzip2 option.
+       (handle_dist): Likewise.
+       * configure: Rebuilt.
+       * configure.in: Don't check for tar.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Check for `tar'.  Substitute
+       AMTARFLAGS.
+
        * automake.in (am_install_var): Removed obsolete comment.
 
        * texinfos.am (uninstall-info): Don't print loop but instead print

diff --git a/Makefile.am b/Makefile.am
index 3c336b3367a8dce163c14b056f49a9a67a7bafe0..596a6efae3158ae3797d3d0b0d2821799ca6ac95 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,9 +62,9 @@ perl4-check: automake aclocal
 # guaranteed to work on my machine.
 maintainer-check: automake aclocal
 ## This check avoids accidental configure substitutions in the source.
-## There are exactly 8 lines that should be modified.  This works out
-## to 24 lines of diffs.
-       @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 24; then \
+## There are exactly 7 lines that should be modified.  This works out
+## to 22 lines of diffs.
+       @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 22; then \
          echo "found too many diffs between automake.in and automake"; 1>&2; \
          diff -c $(srcdir)/automake.in automake; \
          exit 1; \

diff --git a/Makefile.in b/Makefile.in
index 2cb55ba8aa103ded6f8dc8ecb5c439a5aa211814..729bf4fae198b75a97a7f9f55f949206e92f3e69 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -57,6 +57,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+AMTARFLAGS = @AMTARFLAGS@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
@@ -425,7 +426,7 @@ top_distdir = $(distdir)
 # tarfile.
 distcheck: dist
        -rm -rf $(distdir)
-       GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+       GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(TAR) xf -
        mkdir $(distdir)/=build
        mkdir $(distdir)/=inst
        dc_install_base=`cd $(distdir)/=inst && pwd`; \
@@ -445,11 +446,11 @@ distcheck: dist
        echo "$$dashes"
 dist: distdir
        -chmod -R a+r $(distdir)
-       GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+       tar ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz
        -rm -rf $(distdir)
 dist-all: distdir
        -chmod -R a+r $(distdir)
-       GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+       tar ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz
        -rm -rf $(distdir)
 distdir: $(DISTFILES)
        @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \
@@ -591,7 +592,7 @@ perl4-check: automake aclocal
 # Some simple checks, and then ordinary check.  These are only really
 # guaranteed to work on my machine.
 maintainer-check: automake aclocal
-       @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 24; then \
+       @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 22; then \
          echo "found too many diffs between automake.in and automake"; 1>&2; \
          diff -c $(srcdir)/automake.in automake; \
          exit 1; \

diff --git a/aclocal.m4 b/aclocal.m4
index 9f8add8f0d990b497df73a3f164cb305379278fb..7e3f44b77d7874f0d13a799148ac518a1249e9d0 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
+dnl aclocal.m4 generated automatically by aclocal 1.4a
 
 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -21,6 +21,8 @@ dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
 AC_DEFUN(AM_INIT_AUTOMAKE,
 [AC_REQUIRE([AC_PROG_INSTALL])
+dnl We require 2.13 because we rely on SHELL being computed by configure.
+AC_PREREQ([2.13])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -41,6 +43,19 @@ AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
 AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+dnl We check for tar when the user configures the end package.
+dnl This is sad, since we only need this for "dist".  However,
+dnl there's no other good way to do it.  We prefer GNU tar if
+dnl we can find it.  If we can't find a tar, it doesn't really matter.
+AC_CHECK_PROGS(TAR, gnutar gtar tar)
+AMTARFLAGS=
+if test -n "$TAR"; then
+  if $(SHELL) -c "$TAR --version" > /dev/null 2>&1; then
+    dnl We have GNU tar.
+    AMTARFLAGS=o
+  fi
+fi
+AC_SUBST(AMTARFLAGS)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
 #

diff --git a/automake.in b/automake.in
index e8fd7e026be4cdbe8bc3c37fefb77c92e9b514de..e6eac19e1045047ca30c76b502510716f1fcdf11 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -33,7 +33,6 @@ $VERSION = "@VERSION@";
 $PACKAGE = "@PACKAGE@";
 $prefix = "@prefix@";
 $am_dir = "@datadir@/@PACKAGE@";
-$TAR = "@TAR@";
 
 # String constants.
 $IGNORE_PATTERN = "^##([^#].*)?\$";
@@ -711,8 +710,8 @@ sub handle_options
            }
            elsif ($_ eq 'no-installman' || $_ eq 'no-installinfo'
                   || $_ eq 'dist-shar' || $_ eq 'dist-zip'
-                  || $_ eq 'dist-tarZ' || $_ eq 'dejagnu'
-                  || $_ eq 'no-texinfo.tex'
+                  || $_ eq 'dist-tarZ' || $_ eq 'dist-bzip2'
+                  || $_ eq 'dejagnu' || $_ eq 'no-texinfo.tex'
                   || $_ eq 'readme-alpha' || $_ eq 'check-news')
            {
                # Explicitly recognize these.
@@ -2514,7 +2513,6 @@ sub handle_dist
 
     # Some boilerplate.
     $output_vars .= &file_contents ('dist-vars') . "\n";
-    &define_variable ('TAR', $TAR);
     &define_variable ('GZIP_ENV', '--best');
 
     # Put these things in rules section so it is easier for whoever
@@ -2541,7 +2539,7 @@ sub handle_dist
        $output_rules .= "\nsubdir = " . $relative_dir . "\n\n";
     }
 
-    # Generate 'dist' target, and maybe dist-shar / dist-zip / dist-tarZ.
+    # Generate 'dist' target, and maybe other dist targets.
     if ($relative_dir eq '.')
     {
        # Rule to check whether a distribution is viable.
@@ -2550,7 +2548,7 @@ sub handle_dist
 # tarfile.
 distcheck: dist
        -rm -rf $(distdir)
-       GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+       GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(TAR) xf -
        mkdir $(distdir)/=build
        mkdir $(distdir)/=inst
        dc_install_base=`cd $(distdir)/=inst && pwd`; \\'
@@ -2581,7 +2579,8 @@ distcheck: dist
        local ($dist_all) = ('dist-all: distdir' . "\n"
                             . $dist_header);
        local ($curs);
-       foreach $curs ('dist', 'dist-shar', 'dist-zip', 'dist-tarZ')
+       foreach $curs ('dist', 'dist-shar', 'dist-zip', 'dist-tarZ',
+                      'dist-bzip2')
        {
            if (defined $options{$curs} || $curs eq 'dist')
            {
@@ -6312,14 +6311,19 @@ sub initialize_global_constants
     # Ignore return result from chmod, because it might give an error
     # if we chmod a symlink.
     $dist_header = "\t" . '-chmod -R a+r $(distdir)' . "\n";
+    $dist{'dist-bzip2'} = ("\t"
+                          . '$(TAR) ch$(AMTARFLAGS)f - $(distdir) | bzip --best -c > $(distdir).bz2'
+                          . "\n");
     $dist{'dist-tarZ'} = ("\t"
-                    . '$(TAR) chf - $(distdir) | compress -c > $(distdir).tar.Z'
+                    . '$(TAR) ch$(AMTARFLAGS)f - $(distdir) | compress -c > $(distdir).tar.Z'
                     . "\n");
     $dist{'dist-shar'} = ("\t"
                     . 'shar $(distdir) | gzip > $(distdir).shar.gz'
                     . "\n");
     $dist{'dist-zip'} = "\t" . 'zip -rq $(distdir).zip $(distdir)' . "\n";
-    $dist{'dist'} = "\t" .  'GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)' . "\n";
+    $dist{'dist'} = ("\t"
+                    .  'tar ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz'
+                    . "\n");
     $dist_trailer = "\t" . '-rm -rf $(distdir)' . "\n";
 }
 

diff --git a/automake.texi b/automake.texi
index 6e5c959efb6016133c4eac577f533bdde7f81f8c..ccea2a9d8fea56c934af0cc3392e3ed5f4688849 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -2988,6 +2988,14 @@ in the first few lines of the @file{NEWS} file.
 @cindex Option, dejagnu
 Cause @code{dejagnu}-specific rules to be generated.  @xref{Tests}.
 
+@item @code{dist-bzip2}
+@cindex Option, dist-bzip2
+Generate a @code{dist-bzip2} target as well as the ordinary @code{dist}
+target.  This new target will create a bzip2 tar archive of the
+distribution.  bzip2 archives are frequently smaller than even gzipped
+archives.
+@trindex dist-bzip2
+
 @item @code{dist-shar}
 @cindex Option, dist-shar
 Generate a @code{dist-shar} target as well as the ordinary @code{dist}
@@ -3005,9 +3013,7 @@ target.  This new target will create a zip archive of the distribution.
 @cindex Option, dist-tarZ
 Generate a @code{dist-tarZ} target as well as the ordinary @code{dist}
 target.  This new target will create a compressed tar archive of the
-distribution; a traditional @code{tar} and @code{compress} will be
-assumed.  Warning: if you are actually using @code{GNU tar}, then the
-generated archive might contain nonportable constructs.
+distribution.
 @trindex dist-tarZ
 
 @item @code{no-dependencies}

diff --git a/configure b/configure
index 6a01ed53da7eb7ae545eb519e59c1b4d881ef94f..31ba22e339c43cf1781b4d2a7ea11a190b37612d 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12.2 
+# Generated automatically using autoconf version 2.14.1 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -333,7 +333,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12.2"
+    echo "configure generated by autoconf version 2.14.1"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -690,6 +690,7 @@ else
 fi
 
 
+
 PACKAGE=automake
 
 VERSION=1.4a
@@ -709,7 +710,7 @@ EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:713: checking for working aclocal" >&5
+echo "configure:714: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -722,7 +723,7 @@ else
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:726: checking for working autoconf" >&5
+echo "configure:727: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -735,7 +736,7 @@ else
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:739: checking for working automake" >&5
+echo "configure:740: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -748,7 +749,7 @@ else
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:752: checking for working autoheader" >&5
+echo "configure:753: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -761,7 +762,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:765: checking for working makeinfo" >&5
+echo "configure:766: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -773,16 +774,12 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-
-
-# Find an appropriate tar for use in "dist" targets.  A "best guess"
-# is good enough -- if we can't find GNU tar, we don't really care.
 for ac_prog in gnutar gtar tar
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:786: checking for $ac_word" >&5
+echo "configure:783: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -811,10 +808,19 @@ fi
 test -n "$TAR" && break
 done
 
+AMTARFLAGS=
+if test -n "$TAR"; then
+  if $(SHELL) -c "$TAR --version" > /dev/null 2>&1; then
+        AMTARFLAGS=o
+  fi
+fi
+
+
+
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:818: checking for $ac_word" >&5
+echo "configure:824: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -955,7 +961,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12.2"
+    echo "$CONFIG_STATUS generated by autoconf version 2.14.1"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -1008,8 +1014,9 @@ s%@AUTOCONF@%$AUTOCONF%g
 s%@AUTOMAKE@%$AUTOMAKE%g
 s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
 s%@TAR@%$TAR%g
+s%@AMTARFLAGS@%$AMTARFLAGS%g
+s%@SET_MAKE@%$SET_MAKE%g
 s%@PERL@%$PERL%g
 
 CEOF

diff --git a/configure.in b/configure.in
index d79f5ddcddd6760bec8e65ed1945dee16b69c57c..405675dd438b271cdcfbb762625d9c93b56d0c8f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,9 +3,6 @@ AC_INIT(automake.in)
 
 AM_INIT_AUTOMAKE(automake, 1.4a)
 
-# Find an appropriate tar for use in "dist" targets.  A "best guess"
-# is good enough -- if we can't find GNU tar, we don't really care.
-AC_CHECK_PROGS(TAR, gnutar gtar tar)
 AC_PATH_PROG(PERL, perl)
 if test -z "$PERL"; then
    AC_MSG_ERROR([perl not found])

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 3c336b3367a8dce163c14b056f49a9a67a7bafe0..596a6efae3158ae3797d3d0b0d2821799ca6ac95 100644 (file)
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -62,9 +62,9 @@ perl4-check: automake aclocal
 # guaranteed to work on my machine.
 maintainer-check: automake aclocal
 ## This check avoids accidental configure substitutions in the source.
-## There are exactly 8 lines that should be modified.  This works out
-## to 24 lines of diffs.
-       @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 24; then \
+## There are exactly 7 lines that should be modified.  This works out
+## to 22 lines of diffs.
+       @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 22; then \
          echo "found too many diffs between automake.in and automake"; 1>&2; \
          diff -c $(srcdir)/automake.in automake; \
          exit 1; \

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 95cb5d70b9976a2a24d5a5825ac0f7235849ec7e..b51f0e0a1dee74ed9ea3ddff4bc82315b7d06a8e 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -60,7 +60,6 @@ POST_UNINSTALL = :
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
-TAR = @TAR@
 VERSION = @VERSION@
 
 

diff --git a/m4/init.m4 b/m4/init.m4
index 2e3580b8c31fdc076def6a4ad211ee29bfc9ab94..65fa1535e13a73b1a6e07f26b19a07f315360e52 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -31,4 +31,17 @@ AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
 AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+dnl We check for tar when the user configures the end package.
+dnl This is sad, since we only need this for "dist".  However,
+dnl there's no other good way to do it.  We prefer GNU tar if
+dnl we can find it.  If we can't find a tar, it doesn't really matter.
+AC_CHECK_PROGS(TAR, gnutar gtar tar)
+AMTARFLAGS=
+if test -n "$TAR"; then
+  if $(SHELL) -c "$TAR --version" > /dev/null 2>&1; then
+    dnl We have GNU tar.
+    AMTARFLAGS=o
+  fi
+fi
+AC_SUBST(AMTARFLAGS)
 AC_REQUIRE([AC_PROG_MAKE_SET])])

diff --git a/stamp-vti b/stamp-vti
index 609b303544bf689c9723dfabae754e77acf68526..d0a06f9024c041efeba72425c1914e19efb230ed 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,3 +1,3 @@
-@set UPDATED 25 March 1999
+@set UPDATED 26 March 1999
 @set EDITION 1.4a
 @set VERSION 1.4a

diff --git a/tests/Makefile.in b/tests/Makefile.in
index d3c1a3b898b8a253e2986502c02f7d08dc6c0a4b..5be82d5b381f0e13ffe9708524e9813ddf7ff612 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -60,7 +60,6 @@ POST_UNINSTALL = :
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
-TAR = @TAR@
 VERSION = @VERSION@
 
 

diff --git a/version.texi b/version.texi
index 609b303544bf689c9723dfabae754e77acf68526..d0a06f9024c041efeba72425c1914e19efb230ed 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 25 March 1999
+@set UPDATED 26 March 1999
 @set EDITION 1.4a
 @set VERSION 1.4a