[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.13.1d-977-g90079e8

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=90079e8bba596a39a145f46ea97988bf24f4867f

The branch, ng/master has been updated
       via  90079e8bba596a39a145f46ea97988bf24f4867f (commit)
       via  4c39a5fa96ddc86d5c0d96153fb79696bf5edf0c (commit)
       via  65643c8d626b2d60608300ad8495f1dfba1006a4 (commit)
       via  9f21b55d38e8983090ce169969a2f8f1f6645583 (commit)
       via  421f0ad97b4344e7ed35321850df1ae896ed7298 (commit)
       via  74be388e1871d54940ef5d3f8650efec37215ef0 (commit)
       via  90ec3fe5aa8aed2a1c42751f91ffaa438cf04867 (commit)
       via  9a0d4868528e29af16877568a2da664ef640b7fe (commit)
       via  117ddf8d25420691edbd065a85f64cd8a283e1c0 (commit)
       via  f7ef16feb40d3ea8b126ec29b31dae5cec31faf0 (commit)
       via  6e486c5db436b0145280806655b17a462d2f827b (commit)
       via  b636268a12d1a0fdee3eb4ac0f8e9a1eaf45da80 (commit)
       via  efa6880fa10ce8ccc0e0c34c6603fd15169501a0 (commit)
       via  b602d99c9a85f00067553458d8ed2fd96b8d5bb7 (commit)
       via  1ffdec455d35762f8bd7a75f5922679bd9f63d16 (commit)
       via  0cf58ea7c1c05cdc7b6abff6edc68e934333d1e2 (commit)
       via  7a2ff99d85c7abcd2753e9815fc8fdac4b13e38f (commit)
       via  0fd44c9b41405cf3d9580de77b5242cdae37c637 (commit)
       via  ebadaac0d292c6f6c0fded6074d54c3eedca02bc (commit)
       via  0709f52fabeb1f4bbab46a8349471ced111a716e (commit)
       via  c0e30c4f1a7dc7c983a0621dabbd7682eed06e96 (commit)
       via  cfba5c03994cf6784de1c68f92c0d3d3f5cae7bc (commit)
       via  05703b1ad6ae8728d360d28e385cc6187dbe2102 (commit)
       via  780299d96327ac43de44e38173c0162ed2c10474 (commit)
      from  7e693f266c735d38516b1c8736c476fd044a0894 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 90079e8bba596a39a145f46ea97988bf24f4867f
Merge: 7e693f2 4c39a5f
Author: Stefano Lattarini <address@hidden>
Date:   Sat May 11 01:38:51 2013 +0200

    Merge branch 'master' into ng/master
    
    * master:
      options: consistently use return statuses to report errors (more)
      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
      dist: remove support for shar and tarZ formats
      news: document new 'subdir-objects' warning
      PLANS: one minor fixlet (mostly cosmetic)
      PLANS: we have already dropped support for split info files in master
      NEWS: fix a reference to Automake 1.14 where Automake 2.0 was intended
      PLANS: fix reference to non-existent 'next' branch
      PLANS: fix botched version reference
      maintcheck: fix two references to old location of aclocal and automake
      dist: deprecated shar and tar+compress formats
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 NEWS                                    |   12 +++++++++-
 PLANS/obsolete-removed/configure.in.txt |    6 ++--
 PLANS/rm-f-without-args.txt             |    4 +-
 PLANS/texi/drop-split-info-files.txt    |    6 ++--
 THANKS                                  |    2 +-
 bin/automake.in                         |   23 +++++++++----------
 lib/Automake/Options.pm                 |   37 ++++++++++++++++++++-----------
 maintainer/syntax-checks.mk             |    4 +-
 t/dist-formats.tap                      |   13 ++++++++--
 9 files changed, 67 insertions(+), 40 deletions(-)

diff --git a/NEWS b/NEWS
index 56a3eb4..1d035b6 100644
--- a/NEWS
+++ b/NEWS
@@ -143,6 +143,16 @@ New in 1.14:
     <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13378#35>
     <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13378#44>
 
+  - The next major Automake version (2.0) will unconditionally turn on
+    the 'subdir-objects' option.  In order to smooth out the transition,
+    we now give a warning (in the category 'unsupported') whenever a
+    source file is present in a subdirectory but the 'subdir-object' is
+    not enabled.  For example, the following usage will trigger such a
+    warning (of course, assuming the 'subdir-objects' option is off):
+
+        bin_PROGRAMS = sub/foo
+        sub_foo_SOURCES = sub/main.c sub/bar.c
+
   - Automake will automatically enhance the AC_PROG_CC autoconf macro
     to make it check, at configure time, that the C compiler supports
     the combined use of both the "-c -o" options.  This "rewrite" of
@@ -183,7 +193,7 @@ New in 1.14:
     Now that we have the 'info-in-builddir' option that explicitly causes
     generated '.info' files to be placed in the builddir, this hack should
     be longer necessary, so we deprecate it with runtime warnings.  It will
-    likely be removed altogether in Automake 1.14.
+    likely be removed altogether in Automake 2.0.
 
 * Relative directory in Makefile fragments:
 
diff --git a/PLANS/obsolete-removed/configure.in.txt 
b/PLANS/obsolete-removed/configure.in.txt
index 180f92c..d3f6da7 100644
--- a/PLANS/obsolete-removed/configure.in.txt
+++ b/PLANS/obsolete-removed/configure.in.txt
@@ -1,5 +1,5 @@
-In Automake 1.13.x
-------------------
+In Automake 1.13.x (once planned, then dropped)
+-----------------------------------------------
 
 We are already warning about 'configure.in' used as the name for the
 Autoconf input file ('configure.ac' should be used instead); we've
@@ -24,5 +24,5 @@ that Autoconf will actually have started deprecating 
'configure.in'
 by the time Automake 2.0 is released.
 
 Note that the removal of 'configure.in' has already been implemented
-in our 'next' branch (from where the 2.0 release will be finally
+in our 'master' branch (from where the 2.0 release will be finally
 cut); see commits 'v1.13-17-gbff57c8' and 'v1.13-21-g7626e63'.
diff --git a/PLANS/rm-f-without-args.txt b/PLANS/rm-f-without-args.txt
index 918e049..b940fc3 100644
--- a/PLANS/rm-f-without-args.txt
+++ b/PLANS/rm-f-without-args.txt
@@ -13,8 +13,8 @@ accordingly, to get rid of the awful idiom:
 
 See automake bug#10828.
 
-For Automake 1.13.2 (DONE)
---------------------------
+For Automake 1.14 (DONE)
+------------------------
 
 Add a temporary "probe check" in AM_INIT_AUTOMAKE that verifies that
 the no-args "rm -f" usage is supported on the system configure is
diff --git a/PLANS/texi/drop-split-info-files.txt 
b/PLANS/texi/drop-split-info-files.txt
index 8b36ecb..a0a5636 100644
--- a/PLANS/texi/drop-split-info-files.txt
+++ b/PLANS/texi/drop-split-info-files.txt
@@ -1,7 +1,7 @@
-For automake 2.0
-----------------
+For in Automake 2.0 (DONE)
+--------------------------
 
-We want to drop split info files in Automake 2.0.
+We will drop split info files in Automake 2.0.
 See automake bug#13351: <http://debbugs.gnu.org/13351>.
 
 Basically, it has been confirmed that the original reason behind
diff --git a/THANKS b/THANKS
index 66b3270..fe7a7de 100644
--- a/THANKS
+++ b/THANKS
@@ -108,7 +108,7 @@ Elmar Hoffmann                  address@hidden
 Elrond                          address@hidden
 Enrico Scholz                   address@hidden
 Erez Zadok                      address@hidden
-Eric Blake                      address@hidden
+Eric Blake                      address@hidden
 Eric Dorland                    address@hidden
 Eric Magnien                    address@hidden
 Eric Siegerman                  address@hidden
diff --git a/bin/automake.in b/bin/automake.in
index dc0da8a..3492157 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -1081,7 +1081,7 @@ sub handle_silent ()
 ################################################################
 
 
-# Handle AUTOMAKE_OPTIONS variable.  Return 1 on error, 0 otherwise.
+# Handle AUTOMAKE_OPTIONS variable.  Return 0 on error, 1 otherwise.
 sub handle_options ()
 {
   my $var = var ('AUTOMAKE_OPTIONS');
@@ -1095,7 +1095,7 @@ sub handle_options ()
       my @options = map { { option => $_->[1], where => $_->[0] } }
                        $var->value_as_list_recursive (cond_filter => TRUE,
                                                       location => 1);
-      return 1 if process_option_list (@options);
+      return 0 unless process_option_list (@options);
     }
 
   if ($strictness == GNITS)
@@ -1105,7 +1105,7 @@ sub handle_options ()
       set_option ('check-news', INTERNAL);
     }
 
-  return 0;
+  return 1;
 }
 
 # shadow_unconditionally ($varname, $where)
@@ -4251,7 +4251,7 @@ EOF
            {
              my @opts = split (' ', $args[1]);
              @opts = map { { option => $_, where => $where } } @opts;
-             exit $exit_code if process_global_option_list (@opts);
+             exit $exit_code unless process_global_option_list (@opts);
            }
        }
       elsif ($macro eq 'AM_PROG_AR')
@@ -5503,13 +5503,12 @@ sub preprocess_file
 
   # Complete %transform with global options.
   # Note that %transform goes last, so it overrides global options.
-  %transform = ( 'INSTALL-MAN'  =>  ! option 'no-installman',
-                'SUBDIRS'      => !! var ('SUBDIRS'),
-                'TOPDIR_P'     => $relative_dir eq '.',
-
-                'LIBTOOL'      => !! var ('LIBTOOL'),
-                'NONLIBTOOL'   => 1,
-                'SILENT'       => silent_flag (),
+  %transform = ('INSTALL-MAN'  =>  ! option 'no-installman',
+               'SUBDIRS'      => !! var ('SUBDIRS'),
+               'TOPDIR_P'     => $relative_dir eq '.',
+               'LIBTOOL'      => !! var ('LIBTOOL'),
+               'NONLIBTOOL'   => 1,
+               'SILENT'       => silent_flag (),
                %transform);
 
   local $_ = slurp_makefile_fragment ($file);
@@ -6485,7 +6484,7 @@ sub generate_makefile
   $relative_dir = dirname ($makefile);
 
   read_main_am_file ($makefile_am, $makefile_in);
-  if (handle_options)
+  if (not handle_options)
     {
       # Process buffered warnings.
       flush_messages;
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 9ba59d5..ee72cc4 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -241,24 +241,27 @@ These functions should be called at most once for each 
set of options
 having the same precedence; i.e., do not call it twice for two options
 from C<AM_INIT_AUTOMAKE>.
 
-Return 1 on error, 0 otherwise.
+Return 0 on error, 1 otherwise.
 
 =cut
 
-# _option_must_be_from_configure ($OPTION, $WHERE)
+# $BOOL
+# _option_is_from_configure ($OPTION, $WHERE)
 # ----------------------------------------------
 # Check that the $OPTION given in location $WHERE is specified with
 # AM_INIT_AUTOMAKE, not with AUTOMAKE_OPTIONS.
-sub _option_must_be_from_configure ($$)
+sub _option_is_from_configure ($$)
 {
   my ($opt, $where)= @_;
-  return
+  return 1
     if $where->get =~ /^configure\./;
   error $where,
         "option '$opt' can only be used as argument to AM_INIT_AUTOMAKE\n" .
         "but not in AUTOMAKE_OPTIONS makefile statements";
+  return 0;
 }
 
+# $BOOL
 # _is_valid_easy_option ($OPTION)
 # -------------------------------
 # Explicitly recognize valid automake options that require no
@@ -300,6 +303,7 @@ sub _process_option_list (\%@)
 {
   my ($options, @list) = @_;
   my @warnings = ();
+  my $ret = 1;
 
   foreach my $h (@list)
     {
@@ -316,17 +320,20 @@ sub _process_option_list (\%@)
           # Obsolete (and now removed) de-ANSI-fication support.
           error ($where,
                  "automatic de-ANSI-fication support has been removed");
+          $ret = 0;
         }
       # TODO: Remove this special check in Automake 3.0.
       elsif ($_ eq 'cygnus')
         {
           error $where, "support for Cygnus-style trees has been removed";
+          $ret = 0;
         }
       elsif (/^(?:no-)?dist-.*/)
         {
           error ($where,
                  "'$_' option and the like are no more supported;\n" .
                  "use AM_DIST_FORMATS in top-level Makefile.am instead");
+          $ret = 0;
         }
       elsif (/^filename-length-max=(\d+)$/)
         {
@@ -335,14 +342,17 @@ sub _process_option_list (\%@)
         }
       elsif ($_ eq 'tar-v7' || $_ eq 'tar-ustar' || $_ eq 'tar-pax')
         {
-          _option_must_be_from_configure ($_, $where);
+          if (not _option_is_from_configure ($_, $where))
+            {
+              $ret = 0;
+            }
           for my $opt ('tar-v7', 'tar-ustar', 'tar-pax')
             {
               next
                 if $opt eq $_ or ! exists $options->{$opt};
               error ($where,
                      "options '$_' and '$opt' are mutually exclusive");
-              last;
+              $ret = 0;
             }
         }
       elsif (/^\d+\.\d+(?:\.\d+)?[a-z]?(?:-[A-Za-z0-9]+)?$/)
@@ -352,7 +362,7 @@ sub _process_option_list (\%@)
             {
               error ($where, "require Automake $_, but have $VERSION",
                      uniq_scope => US_GLOBAL);
-              return 1;
+              $ret = 0;
             }
         }
       elsif (/^(?:--warnings=|-W)(.*)$/)
@@ -362,11 +372,11 @@ sub _process_option_list (\%@)
         }
       elsif (! _is_valid_easy_option $_)
         {
-          error ($where, "option '$_' not recognized",
-                 uniq_scope => US_GLOBAL);
-          return 1;
+          error ($where, "option '$_' not recognized");
+          $ret = 0;
         }
     }
+
   # We process warnings here, so that any explicitly-given warning setting
   # will take precedence over warning settings defined implicitly by the
   # strictness.
@@ -376,23 +386,24 @@ sub _process_option_list (\%@)
           "unknown warning category '$w->{'cat'}'"
         if switch_warning $w->{cat};
     }
-  return 0;
+
+  return $ret;
 }
 
 sub process_option_list (@)
 {
   prog_error "local options already processed"
     if $_options_processed;
-  return _process_option_list (%_options, @_);
   $_options_processed = 1;
+  _process_option_list (%_options, @_);
 }
 
 sub process_global_option_list (@)
 {
   prog_error "global options already processed"
     if $_global_options_processed;
-  return _process_option_list (%_global_options, @_);
   $_global_options_processed = 1;
+  _process_option_list (%_global_options, @_);
 }
 
 =item C<set_strictness ($name)>
diff --git a/maintainer/syntax-checks.mk b/maintainer/syntax-checks.mk
index f5b1fef..4c1c603 100644
--- a/maintainer/syntax-checks.mk
+++ b/maintainer/syntax-checks.mk
@@ -593,11 +593,11 @@ sc_tests_PATH_SEPARATOR:
 ## Try to make sure all @...@ substitutions are covered by our
 ## substitution rule.
 sc_perl_at_substs:
-       @if test `grep -E 'address@hidden@' aclocal | wc -l` -ne 0; then \
+       @if test `grep -E 'address@hidden@' bin/aclocal | wc -l` -ne 0; then \
          echo "Unresolved @...@ substitution in aclocal" 1>&2; \
          exit 1; \
        fi
-       @if test `grep -E 'address@hidden@' automake | wc -l` -ne 0; then \
+       @if test `grep -E 'address@hidden@' bin/automake | wc -l` -ne 0; then \
          echo "Unresolved @...@ substitution in automake" 1>&2; \
          exit 1; \
        fi
diff --git a/t/dist-formats.tap b/t/dist-formats.tap
index e511e27..375a5b6 100755
--- a/t/dist-formats.tap
+++ b/t/dist-formats.tap
@@ -165,6 +165,7 @@ for format in $all_compression_formats; do
   unset desc suffix compressor format
 done
 
+
 # ----------------------- #
 #  Parallel compression.  #
 # ----------------------- #
@@ -175,9 +176,15 @@ done
 
 desc='parallel compression'
 
-skip_reason=
-have_compressor xz || skip_reason="'xz' not available"
-have_compressor bzip2 || skip_reason="'bzip2' not available"
+if ! have_compressor xz && ! have_compressor bzip2; then
+  skip_reason="both 'bzip2' and 'xz' are unavailable"
+elif ! have_compressor xz; then
+  skip_reason="'xz' not available"
+elif ! have_compressor bzip2; then
+  skip_reason="'bzip2' not available"
+else
+  skip_reason=
+fi
 
 if test -n "$skip_reason"; then
   skip_row_ 6 -r "$skip_reason" "$desc"


hooks/post-receive
-- 
GNU Automake