From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 31 Dec 2012 08:53:43 +0000 (+0100)
Subject: maint: state when compatibility cruft should be removed or warned about
X-Git-Tag: v1.13.1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6602b334c016042e252545d16733b7d5678fd90;p=thirdparty%2Fautomake.git

maint: state when compatibility cruft should be removed or warned about

* automake.in: Here.
* lib/Automake/Options.pm: And here.
* m4/obsolete-err.m4: And here.

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

diff --git a/automake.in b/automake.in
index 3194c9948..805e0e9c2 100644
--- a/automake.in
+++ b/automake.in
@@ -2131,6 +2131,7 @@ sub handle_source_transform ($$$$%)
 	msg_var ('unsupported', $ext_var, $ext_var->name . " can assume at most one value")
 	  if $default_source_ext =~ /[\t ]/;
 	(my $default_source = $unxformed) =~ s,(\.[^./\\]*)?$,$default_source_ext,;
+	# TODO: Remove this backward-compatibility hack in Automake 1.14.
 	if ($old_default_source ne $default_source
 	    && !$ext_var
 	    && (rule $old_default_source
@@ -2992,6 +2993,8 @@ sub scan_texinfo_file ($)
 	  next if $outfile;
 
 	  $outfile = $1;
+	  # TODO: In Automake 1.14 (or even 1.13.2), start warning against
+	  # TODO: suffixes != ".info", to ease transition to Automake-NG.
 	  if ($outfile =~ /\.([^.]+)$/ && $1 ne 'info')
 	    {
 	      error ("$filename:$.",
@@ -3014,6 +3017,8 @@ sub scan_texinfo_file ($)
     }
 
   my $infobase = basename ($filename);
+  # TODO: In Automake 1.14 (or even 1.13.2), start warning against
+  # TODO: suffixes != ".texi", to ease transition to Automake-NG.
   $infobase =~ s/\.te?xi(nfo)?$//;
   return ($outfile, $vfile);
 }
@@ -3142,6 +3147,8 @@ sub handle_texinfo_helper ($)
       ($info_texinfos->value_as_list_recursive (inner_expand => 1))
     {
       my $infobase = $texi;
+      # TODO: In Automake 1.14 (or even 1.13.2), start warning against
+      # TODO: suffixes != ".texi", to ease transition to Automake-NG.
       $infobase =~ s/\.(txi|texinfo|texi)$//;
 
       if ($infobase eq $texi)
@@ -4134,6 +4141,9 @@ sub handle_configure ($$$@)
   # Distribute and define mkinstalldirs only if it is already present
   # in the package, for backward compatibility (some people may still
   # use $(mkinstalldirs)).
+  # TODO: start warning about this in Automake 1.13.2, and have
+  # TODO: Automake 1.14 or 1.15 drop it (and the mkinstalldirs script
+  # TODO: as well).
   my $mkidpath = "$config_aux_dir/mkinstalldirs";
   if (-f $mkidpath)
     {
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 186d4ca8c..9e06599f9 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -315,16 +315,19 @@ sub _process_option_list (\%@)
         {
           set_strictness ($_);
         }
+      # TODO: Remove this special check in Automake 1.14 or 1.15.
       elsif (/^(.*\/)?ansi2knr$/)
         {
           # Obsolete (and now removed) de-ANSI-fication support.
           error ($where,
                  "automatic de-ANSI-fication support has been removed");
         }
+      # TODO: Remove this special check in Automake 1.15.
       elsif ($_ eq 'cygnus')
         {
           error $where, "support for Cygnus-style trees has been removed";
         }
+      # TODO: Remove this special check in Automake 1.14 or 1.15.
       elsif ($_ eq 'dist-lzma')
         {
           error ($where, "support for lzma-compressed distribution " .
diff --git a/m4/obsolete-err.m4 b/m4/obsolete-err.m4
index eb23dc4b0..01c2d6ef9 100644
--- a/m4/obsolete-err.m4
+++ b/m4/obsolete-err.m4
@@ -8,16 +8,19 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+dnl TODO: Remove in Automake 1.15.
 AC_DEFUN([AM_CONFIG_HEADER],
 [AC_FATAL(['$0': this macro is obsolete.
     You should use the 'AC][_CONFIG_HEADERS' macro instead.])])
 
+dnl TODO: Remove in Automake 1.15.
 AC_DEFUN([AM_PROG_CC_STDC],
 [AC_FATAL(['$0': this macro is obsolete.
     You should simply use the 'AC][_PROG_CC' macro instead.
     Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
     but upon 'ac_cv_prog_cc_stdc'.])])
 
+dnl TODO: Remove in Automake 1.14.
 AC_DEFUN([AM_C_PROTOTYPES],
          [AC_FATAL([automatic de-ANSI-fication support has been removed])])
 AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])