From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 28 Dec 2012 21:08:46 +0000 (+0100)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19379bae87f4270d9f023b63d01a2107fb3de942;p=thirdparty%2Fautomake.git

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>
---

19379bae87f4270d9f023b63d01a2107fb3de942
diff --cc automake.in
index 5820c5171,f829ad642..7d431e947
--- a/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 ($$
  	}
      }
  
+   # 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";
+     }
+ 
 -  # Must do this after reading .am file.
 -  define_variable ('subdir', $relative_dir, INTERNAL);
 +  # 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 t/ax/distcheck-hook-m4.am
index 30b8760be,262e370c9..a65d2693b
--- a/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"; \