From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 10 May 2013 23:06:58 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v1.16~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65643c8d626b2d60608300ad8495f1dfba1006a4;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  options: try to report as much errors as possible
  warns: don't tell AM_PROG_MKDIR_P is going to be removed
  refactor: fix few "inverted boolean" usages
  options: better name for an internal function
  options: more consistency in use of return statuses to report errors
  options: tiny simplification in dealing with erroneous opts
  options: consistently use return statuses to report errors
  options: re-enable some sanity checks
  THANKS: update Eric Blake's e-mail address
  NEWS: typofix

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

65643c8d626b2d60608300ad8495f1dfba1006a4
diff --cc lib/Automake/Options.pm
index 3105b11ef,db5661cec..b0693bdb9
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@@ -331,19 -337,22 +337,20 @@@ sub _process_option_list (\%@
          {
            error ($where, "support for lzma-compressed distribution " .
                           "archives has been removed");
+           $ret = 0;
          }
 -      # TODO: Make this a fatal error in Automake 2.0.
 +      # TODO: Remove this special check in Automake 3.0.
        elsif ($_ eq 'dist-shar')
          {
 -          msg ('obsolete', $where,
 -               "support for shar distribution archives is deprecated.\n" .
 -               "  It will be removed in Automake 2.0");
 +          error ($where, "support for shar distribution archives has " .
 +                         "been removed.");
          }
 -      # TODO: Make this a fatal error in Automake 2.0.
 +      # TODO: Remove this special check in Automake 3.0.
        elsif ($_ eq 'dist-tarZ')
          {
 -          msg ('obsolete', $where,
 -               "support for distribution archives compressed with " .
 -               "legacy program 'compress' is deprecated.\n" .
 -               "  It will be removed in Automake 2.0");
 +          error ($where, "support for distribution archives compressed " .
 +                         "with legacy program 'compress' has " .
 +                         "been removed.");
          }
        elsif (/^filename-length-max=(\d+)$/)
          {