From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 20 May 2012 22:06:13 +0000 (+0200)
Subject: [ng] cleanup: don't support $(ACLOCAL_M4_SOURCES) anymore, it's obsolete
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbcda36445ffc05e53b9565262e5b0f15e4c7656;p=thirdparty%2Fautomake.git

[ng] cleanup: don't support $(ACLOCAL_M4_SOURCES) anymore, it's obsolete

The $(ACLOCAL_M4_SOURCES) variables has been since long obsolete and
basically unused (since at least commit ab57cf28 of 2003-04-24), so
drop any mention of it.

* automake.in (scan_aclocal_m4): Don't bother warning about usages of
$(ACLOCAL_M4_SOURCES).  Don't append it to @ac_deps.  This makes such
variable always empty, so there's no need to return it.  Adjust the
signature of this function accordingly, and ...
(handle_configure): ... update this function accordingly.

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

diff --git a/automake.in b/automake.in
index c0fcd5b09..09b43fffb 100644
--- a/automake.in
+++ b/automake.in
@@ -3826,10 +3826,11 @@ sub handle_subdirs ()
 }
 
 
-# ($REGEN, @DEPENDENCIES)
+# $REGEN
 # &scan_aclocal_m4
 # ----------------
-# If aclocal.m4 creation is automated, return the list of its dependencies.
+# If aclocal.m4 creation is automated, return "aclocal.m4",
+# otherwise return 0.
 sub scan_aclocal_m4 ()
 {
   my $regen_aclocal = 0;
@@ -3846,21 +3847,11 @@ sub scan_aclocal_m4 ()
       $regen_aclocal = $line =~ 'generated automatically by aclocal';
     }
 
-  my @ac_deps = ();
-
-  if (set_seen ('ACLOCAL_M4_SOURCES'))
-    {
-      push (@ac_deps, '$(ACLOCAL_M4_SOURCES)');
-      msg_var ('obsolete', 'ACLOCAL_M4_SOURCES',
-	       "'ACLOCAL_M4_SOURCES' is obsolete.\n"
-	       . "It should be safe to simply remove it");
-    }
-
   # Note that it might be possible that aclocal.m4 doesn't exist but
   # should be auto-generated.  This case probably isn't very
   # important.
 
-  return ($regen_aclocal, @ac_deps);
+  return $regen_aclocal;
 }
 
 
@@ -3976,10 +3967,9 @@ sub handle_configure ($$$@)
   my $colon_infile = ':' . join (':', @inputs);
   $colon_infile = '' if $colon_infile eq ":$makefile.in";
   my @rewritten = rewrite_inputs_into_dependencies ($makefile, @inputs);
-  my ($regen_aclocal_m4, @aclocal_m4_deps) = scan_aclocal_m4;
+  my $regen_aclocal_m4 = scan_aclocal_m4;
   define_pretty_variable ('am__aclocal_m4_deps', TRUE, INTERNAL,
-			  @configure_deps, @aclocal_m4_deps,
-			  '$(top_srcdir)/' . $configure_ac);
+			  @configure_deps, '$(top_srcdir)/' . $configure_ac);
   my @configuredeps = ('$(am__aclocal_m4_deps)', '$(CONFIGURE_DEPENDENCIES)');
   push @configuredeps, '$(ACLOCAL_M4)' if -f 'aclocal.m4';
   define_pretty_variable ('am__configure_deps', TRUE, INTERNAL,