From f7b16b4ce8c0095030481c9d4dd4425d65f89fc5 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 22 Jul 2012 18:26:55 +0200
Subject: [PATCH] [ng] rename: ACLOCAL_M4 -> am.remake.aclocal-m4

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---
 NG-NEWS             | 4 ++++
 automake.in         | 5 +++--
 lib/am/configure.am | 2 +-
 t/confdeps.sh       | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/NG-NEWS b/NG-NEWS
index ca919278a..48e466fab 100644
--- a/NG-NEWS
+++ b/NG-NEWS
@@ -273,6 +273,10 @@ Obsolete Features Removed
   'AM_SET_LEADING_DOT' and AC_SUBST'd variable 'am__leading_dot' have
   been removed.
 
+* The Automake-defined internal make variable '$(ACLOCAL_M4)' has been
+  renamed to '$(am.remake.aclocal-m4)', and should be considered an
+  internal detail.
+
 
 Source Files with Unknown Extensions
 ====================================
diff --git a/automake.in b/automake.in
index 7e988d889..7727fb3b2 100644
--- a/automake.in
+++ b/automake.in
@@ -3488,7 +3488,8 @@ sub scan_aclocal_m4 ()
 
   if (-f 'aclocal.m4')
     {
-      define_variable ("ACLOCAL_M4", INTERNAL, '$(top_srcdir)/aclocal.m4');
+      define_variable ("am.remake.aclocal-m4", INTERNAL,
+                       '$(top_srcdir)/aclocal.m4');
 
       my $aclocal = new Automake::XFile "< aclocal.m4";
       my $line = $aclocal->getline;
@@ -3620,7 +3621,7 @@ sub handle_configure ($$$@)
                    @configure_deps, '$(top_srcdir)/' . $configure_ac);
   my @configuredeps = ('$(am.remake.aclocal-m4-deps)',
                        '$(CONFIGURE_DEPENDENCIES)');
-  push @configuredeps, '$(ACLOCAL_M4)' if -f 'aclocal.m4';
+  push @configuredeps, '$(am.remake.aclocal-m4)' if -f 'aclocal.m4';
   define_variable ('am.remake.configure-deps', INTERNAL, @configuredeps);
 
   my $automake_options = '--' . $strictness_name .
diff --git a/lib/am/configure.am b/lib/am/configure.am
index bff38bfba..13a936b2f 100644
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -107,7 +107,7 @@ $(top_srcdir)/configure: %MAINTAINER-MODE% $(am.remake.configure-deps)
 ## we should hopefully be able to get rid of it in a not-so-distant
 ## future.
 if %?REGEN-ACLOCAL-M4%
-$(ACLOCAL_M4): %MAINTAINER-MODE% $(am.remake.aclocal-m4-deps)
+$(am.remake.aclocal-m4): %MAINTAINER-MODE% $(am.remake.aclocal-m4-deps)
 ?TOPDIR_P?	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 ?!TOPDIR_P?	cd $(top_builddir) && $(MAKE) .am/nil
 
diff --git a/t/confdeps.sh b/t/confdeps.sh
index 95e60f9ee..23d9cadd6 100755
--- a/t/confdeps.sh
+++ b/t/confdeps.sh
@@ -24,7 +24,7 @@ $ACLOCAL
 
 echo "$me: Generated by aclocal ..."
 $AUTOMAKE
-grep '^\$(ACLOCAL_M4):' Makefile.in
+grep '^\$(am\.remake\.aclocal-m4):' Makefile.in
 
 echo "$me: Not generated by aclocal ..."
 # Pretend it is not from aclocal (remove the signature),
@@ -32,6 +32,6 @@ echo "$me: Not generated by aclocal ..."
 sed -n '3,$p' aclocal.m4 >aclocal.m4t
 mv -f aclocal.m4t aclocal.m4
 $AUTOMAKE
-grep '^\$(ACLOCAL_M4):' Makefile.in && exit 1
+$FGREP '$(am.remake.aclocal-m4):' Makefile.in && exit 1
 
 :
-- 
2.47.2