Merge branch 'master' into ng/master

* master:
  tests: remove stray uses of 'Exit', in favour of simple 'exit'
  general: assume dot-starting file names are supported
  Drop support for DJGPP, MS-DOS, Windows 95/98/ME
  depcomp: remove support for SGI C/C++ compilers
  tests: a test about warnings in category 'obsolete' was failing spuriously
  ACLOCAL_AMFLAGS: fully deprecate, with warnings in the 'obsolete' category
  compile: remove support for $(INCLUDES)
  aclocal: allow third-party macros take precedence over automake ones

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

diff --cc aclocal.in
Simple merge

diff --cc automake.in
index 5820c51719e28eb6831e059e8c031ff41a6af396,f829ad642e97960696a5f4c27e16e05ed02d8d77..7d431e9473c620d79039fe83cd1dfb91d8cdf73f
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in
@@@ -831,7 -869,7 +831,7 @@@ register_language ('name' => 'asm'
                   'config_vars' => ['CCAS', 'CCASFLAGS'],
  
                   'flags' => ['CCASFLAGS'],
-                  # Users can set AM_CCASFLAGS to include, say, DEFS,
 -                 # Users can set AM_CCASFLAGS to include $(DEFS) or
++                 # Users can set AM_CCASFLAGS to include, say, $(DEFS),
                   # or anything else required.  They can also set CCAS.
                   # Or simply use Preprocessed Assembler.
                   'compile' => '$(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)',
@@@ -6643,28 -7819,18 +6643,38 @@@ sub generate_makefile ($$
        }
      }
  
 -  # Must do this after reading .am file.
 -  define_variable ('subdir', $relative_dir, INTERNAL);
+   # Catch some obsolete variables.
+   reject_var 'INCLUDES', "'INCLUDES' is the obsolete name for " .
+                          "'AM_CPPFLAGS' (or '*_CPPFLAGS')";
+   if (my $amflags = var ('ACLOCAL_AMFLAGS'))
+     {
+       msg_var 'obsolete', $amflags,
+               "'ACLOCAL_AMFLAGS' is deprecated; use 'AC_CONFIG_MACRO_DIRS'"
+               . " in configure.ac instead";
+     }
+ 
 +  # Some of these must do this after reading .am file.
 +
 +  define_variable ('subdir', INTERNAL, $relative_dir);
 +  define_variable ('am.conf.is-topdir', INTERNAL,
 +                   $relative_dir eq '.' ? "yes" : "");
 +  define_variable ('am.conf.check-news', INTERNAL,
 +                   option 'check-news' ? "yes" : "");
 +  define_variable ('am.conf.no-installinfo', INTERNAL,
 +                   option 'no-installinfo' ? "yes" : "");
 +  define_variable ('am.conf.aux-dir', INTERNAL, $am_config_aux_dir);
 +  define_variable ('am.relpath.makefile', INTERNAL, basename ($makefile));
 +  define_variable ('am.relpath.makefile.am', INTERNAL,
 +                   prepend_srcdir ($makefile_am));
 +  define_variable ('am.relpath.makefile.in', INTERNAL,
 +                   prepend_srcdir ($makefile_in));
 +
 +  define_variable 'am.conf.build-triplet', INTERNAL,
 +                  $seen_canonical >= AC_CANONICAL_BUILD ? '$(build)' : '';
 +  define_variable 'am.conf.host-triplet', INTERNAL,
 +                  $seen_canonical >= AC_CANONICAL_HOST ? '$(host)' : '';
 +  define_variable 'am.conf.target-triplet', INTERNAL,
 +                  $seen_canonical >= AC_CANONICAL_TARGET ? '$(target)' : '';
  
    # If DIST_SUBDIRS is defined, make sure SUBDIRS is, so that
    # recursive rules are enabled.

diff --cc doc/automake-ng.texi
Simple merge

diff --cc lib/depcomp
Simple merge

diff --cc lib/ylwrap
Simple merge

diff --cc syntax-checks.mk
Simple merge

diff --cc t/ax/distcheck-hook-m4.am
index 30b8760bebdb31a3bec3542b71af61fc39dcc39c,262e370c95726ee1cf4fcab3bb3c1e4a0d4543c0..a65d2693b0dbcd5156c51a76cf5779b1c78be3a7
--- 1/t/ax/distcheck-hook-m4.am
--- 2/t/ax/distcheck-hook-m4.am
+++ b/t/ax/distcheck-hook-m4.am
@@@ -15,9 -15,11 +15,11 @@@
  ## You should have received a copy of the GNU General Public License
  ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
+ AUTOMAKE_OPTIONS = -Wno-obsolete
+ 
  distcheck-hook:
        @fatal () { echo "$@: $$*" >&2; exit 1; }; \
 -      $(am__cd) $(distdir) && chmod u+w . && mkdir _m4 \
 +      cd $(distdir) && chmod u+w . && mkdir _m4 \
          || fatal "cannot setup distdir"; \
        $(ACLOCAL) -I _m4 $(ACLOCAL_AMFLAGS) --install --output=_am.m4 \
          || fatal "cannot regenerate aclocal.m4"; \

diff --cc t/dist-missing-m4.sh
Simple merge

diff --cc t/gettext-macros.sh
Simple merge

diff --cc t/remake-deleted-m4-file.sh
Simple merge

diff --cc t/remake-gnulib-add-acsubst.sh
Simple merge

diff --cc t/remake-gnulib-add-header.sh
Simple merge

diff --cc t/remake-gnulib-remove-header.sh
Simple merge

diff --cc t/remake-moved-m4-file.sh
Simple merge

diff --cc t/remake-renamed-m4-file.sh
Simple merge

diff --cc t/remake-renamed-m4-macro-and-file.sh
Simple merge

diff --cc t/remake-renamed-m4-macro.sh
Simple merge