Patch: FYI: no-dist flag

[Tom Tromey]

I'm finally checking this in.

This patch adds the "no-dist" option.  I'm only checking this in on
the trunk; this part of the 1.7 branch is different, and anyway it is
a new feature.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>

        * lib/Automake/Options.pm (_process_option_list): Recognize
        no-dist.
        * NEWS: Update.
        * doc/automake.texi (Options): Document no-dist.
        * automake.in (check_cygnus): Set no-dist option.
        (handle_dist): Recognize no-dist.
        * tests/nodist3.test: New file.
        * tests/Makefile.am (TESTS): Added nodist3.test.

Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.230
diff -u -r1.230 NEWS
--- NEWS 29 Sep 2003 20:21:18 -0000 1.230
+++ NEWS 30 Sep 2003 19:03:06 -0000
@@ -78,6 +78,8 @@
 
   - New option no-dist-gzip.
 
+  - New option no-dist.
+
   - install-sh now understands --version and --help.
 
   - Automake will now recognize AC_CONFIG_LINKS so far as removing created
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1506
diff -u -r1.1506 automake.in
--- automake.in 29 Sep 2003 20:21:18 -0000 1.1506
+++ automake.in 30 Sep 2003 19:03:09 -0000
@@ -3046,9 +3046,7 @@
 # Handle 'dist' target.
 sub handle_dist ()
 {
-  # `make dist' isn't used in a Cygnus-style tree.
-  # Omit the rules so that people don't try to use them.
-  return if option 'cygnus';
+  return if option 'no-dist';
 
   # At least one of the archive formats must be enabled.
   if ($relative_dir eq '.')
@@ -4506,6 +4504,7 @@
   set_strictness ('foreign');
   set_option ('no-installinfo', $cygnus);
   set_option ('no-dependencies', $cygnus);
+  set_option ('no-dist', $cygnus);
 
   err_ac "`AM_MAINTAINER_MODE' required when --cygnus specified"
     if !$seen_maint_mode;
Index: configure
===================================================================
RCS file: /cvs/automake/automake/configure,v
retrieving revision 1.161
diff -u -r1.161 configure
--- configure 23 Sep 2003 22:39:11 -0000 1.161
+++ configure 30 Sep 2003 19:03:09 -0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57c for GNU Automake 1.7a.
+# Generated by GNU Autoconf 2.57f for GNU Automake 1.7a.
 #
 # Report bugs to <address@hidden>.
 #
@@ -21,6 +21,7 @@
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
+DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
 if ((MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -219,6 +220,7 @@
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
 else
+  test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
@@ -854,7 +856,7 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 GNU Automake configure 1.7a
-generated by GNU Autoconf 2.57c
+generated by GNU Autoconf 2.57f
 
 Copyright (C) 2003 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -868,7 +870,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by GNU Automake $as_me 1.7a, which was
-generated by GNU Autoconf 2.57c.  Invocation command line was
+generated by GNU Autoconf 2.57f.  Invocation command line was
 
   $ $0 $@
 
@@ -2001,6 +2003,7 @@
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
+DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
 if ((MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -2201,6 +2204,7 @@
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
 else
+  test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
@@ -2237,7 +2241,7 @@
 cat >&5 <<_CSEOF
 
 This file was extended by GNU Automake $as_me 1.7a, which was
-generated by GNU Autoconf 2.57c.  Invocation command line was
+generated by GNU Autoconf 2.57f.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -2292,7 +2296,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 GNU Automake config.status 1.7a
-configured by $0, generated by GNU Autoconf 2.57c,
+configured by $0, generated by GNU Autoconf 2.57f,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright (C) 2003 Free Software Foundation, Inc.
Index: doc/automake.texi
===================================================================
RCS file: /cvs/automake/automake/doc/automake.texi,v
retrieving revision 1.4
diff -u -r1.4 automake.texi
--- doc/automake.texi 26 Sep 2003 17:35:08 -0000 1.4
+++ doc/automake.texi 30 Sep 2003 19:03:12 -0000
@@ -5380,6 +5380,11 @@
 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}
address@hidden Option, no-dist
+Don't emit any code related to @code{dist} target.  This is useful
+when a package has its own method for making distributions.
+
 @item @code{no-dist-gzip}
 @cindex Option, no-dist-gzip
 Do not hook @code{dist-gzip} to @code{dist}.
Index: lib/Automake/Options.pm
===================================================================
RCS file: /cvs/automake/automake/lib/Automake/Options.pm,v
retrieving revision 1.1
diff -u -r1.1 Options.pm
--- lib/Automake/Options.pm 7 Aug 2003 20:30:04 -0000 1.1
+++ lib/Automake/Options.pm 30 Sep 2003 19:03:12 -0000
@@ -261,7 +261,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 'no-dist-gzip' || $_ eq 'no-dist'
             || $_ eq 'dejagnu' || $_ eq 'no-texinfo.tex'
             || $_ eq 'readme-alpha' || $_ eq 'check-news'
             || $_ eq 'subdir-objects' || $_ eq 'nostdinc'
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.am,v
retrieving revision 1.518
diff -u -r1.518 Makefile.am
--- tests/Makefile.am 29 Sep 2003 20:21:19 -0000 1.518
+++ tests/Makefile.am 30 Sep 2003 19:03:12 -0000
@@ -314,6 +314,7 @@
 nodepcomp.test \
 nodist.test \
 nodist2.test \
+nodist3.test \
 nogzip.test \
 nogzip2.test \
 noinst.test \
Index: tests/Makefile.in
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.in,v
retrieving revision 1.666
diff -u -r1.666 Makefile.in
--- tests/Makefile.in 29 Sep 2003 20:21:19 -0000 1.666
+++ tests/Makefile.in 30 Sep 2003 19:03:13 -0000
@@ -424,6 +424,7 @@
 nodepcomp.test \
 nodist.test \
 nodist2.test \
+nodist3.test \
 nogzip.test \
 nogzip2.test \
 noinst.test \