* automake.in (set_strictness): Never enable 'portability'

warnings for now.
(usage): Adjust `-Wportability' doc.
* automake.texi (Invoking Automake): Likewise.
Suggested by Ralf Corsepius.

diff --git a/ChangeLog b/ChangeLog
index b041c4367ca441d01ab6793a426f826713661275..4a91a8531bf2ec7521f0d3ec24cdabffcc675277 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-22  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * automake.in (set_strictness): Never enable 'portability'
+       warnings for now.
+       (usage): Adjust `-Wportability' doc.
+       * automake.texi (Invoking Automake): Likewise.
+       Suggested by Ralf Corsepius.
+
 2002-08-21  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * lib/am/ltlib.am (clean-%DIR%LTLIBRARIES): Fix cleanup of

diff --git a/automake.in b/automake.in
index 58bc1d18d9a71dae461c09c088fbb92cf77dea70..b1497528dbf24a84813bae058d470ea4fff0ef27 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -8608,13 +8608,30 @@ sub push_dist_common
 sub set_strictness
 {
   $strictness_name = $_[0];
+
+  # FIXME: 'portability' warnings are currently disabled by default.
+  # Eventually we want to turn them on in GNU and GNITS modes, but
+  # we don't do this yet in Automake 1.7 to help the 1.6/1.7 transition.
+  #
+  # Indeed there would be only two ways to get rid of these new warnings:
+  #  1. adjusting Makefile.am
+  #     This is not always easy (or wanted).  Consider %-rules or
+  #     $(function args) variables.
+  #  2. using -Wno-portability
+  #     This means there is no way to have the same Makefile.am
+  #     working both with Automake 1.6 and 1.7 (since 1.6 does not
+  #     understand -Wno-portability).
+  #
+  # In Automake 1.8 (or whatever it is called) we can turn these
+  # warnings on, since -Wno-portability will not be an issue for
+  # the 1.7/1.8 transition.
   if ($strictness_name eq 'gnu')
     {
       $strictness = GNU;
       setup_channel 'error-gnu', silent => 0;
       setup_channel 'error-gnu/warn', silent => 0, type => 'error';
       setup_channel 'error-gnits', silent => 1;
-      setup_channel 'portability', silent => 0;
+      # setup_channel 'portability', silent => 0;
       setup_channel 'gnu', silent => 0;
     }
   elsif ($strictness_name eq 'gnits')
@@ -8623,7 +8640,7 @@ sub set_strictness
       setup_channel 'error-gnu', silent => 0;
       setup_channel 'error-gnu/warn', silent => 0, type => 'error';
       setup_channel 'error-gnits', silent => 0;
-      setup_channel 'portability', silent => 0;
+      # setup_channel 'portability', silent => 0;
       setup_channel 'gnu', silent => 0;
     }
   elsif ($strictness_name eq 'foreign')
@@ -8632,7 +8649,7 @@ sub set_strictness
       setup_channel 'error-gnu', silent => 1;
       setup_channel 'error-gnu/warn', silent => 0, type => 'warning';
       setup_channel 'error-gnits', silent => 1;
-      setup_channel 'portability', silent => 1;
+      # setup_channel 'portability', silent => 1;
       setup_channel 'gnu', silent => 1;
     }
   else
@@ -8740,7 +8757,7 @@ Warning categories include:
   `obsolete'      obsolete features or constructions
   `unsupported'   unsupported or incomplete features (default)
   `unused'        unused variables (default)
-  `portability'   portability issues (default in gnu and gnits modes)
+  `portability'   portability issues
   `all'           all the warnings
   `no-CATEGORY'   turn off warnings in CATEGORY
   `none'          turn off all the warnings

diff --git a/automake.texi b/automake.texi
index a03d02fa3566f2ad3334e4c1b1cf8b5b12c249ba..7ef8fba169106fa19b9f6a8e85eea18aa4dca681 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -1047,7 +1047,7 @@ unsupported or incomplete features
 @item unused
 unused variables
 @item portability
-portability issues
+portability issues (e.g., use of Make features which are known not portable)
 @item all
 all the warnings
 @item none
@@ -1061,8 +1061,12 @@ instance @samp{-Wno-unused} will hide the warnings about unused
 variables.
 
 The categories output by default are @samp{unsupported} and
-@samp{unused}.  Additionally, @samp{gnu} and @samp{portability} warnings
-are enabled in @samp{--gnu} and @samp{--gnits} strictness.
+@samp{unused}.  Additionally, @samp{gnu} is enabled in @samp{--gnu} and
+@samp{--gnits} strictness.
+
+@samp{portability} warnings are currently disabled by default, but they
+will be enabled in @samp{--gnu} and @samp{--gnits} strictness in a
+future release.
 
 @vindex WARNINGS
 The environment variable @samp{WARNINGS} can contain a comma separated

diff --git a/stamp-vti b/stamp-vti
index 44177b394ebf0597f03a88dc1f672ceb587667a3..cb189c4879e9f5547625df9b9f0d21080ad5ac6f 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 21 August 2002
+@set UPDATED 22 August 2002
 @set UPDATED-MONTH August 2002
 @set EDITION 1.6c
 @set VERSION 1.6c

diff --git a/version.texi b/version.texi
index 44177b394ebf0597f03a88dc1f672ceb587667a3..cb189c4879e9f5547625df9b9f0d21080ad5ac6f 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 21 August 2002
+@set UPDATED 22 August 2002
 @set UPDATED-MONTH August 2002
 @set EDITION 1.6c
 @set VERSION 1.6c