From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Sun, 27 Apr 2003 18:14:37 +0000 (+0000)
Subject: * automake.in (@common_files): Remove acinclude.m4 since
X-Git-Tag: Release-1-7b~191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2736db9fd27fbdd2e8a2cf6eb1f859d99a83152a;p=thirdparty%2Fautomake.git

* automake.in (@common_files): Remove acinclude.m4 since
it will be m4_included by aclocal.m4 and files are always
distributed.
(scan_aclocal_m4): Do not bother about acinclude.m4 anymore.
We will get this dependency when tracing m4_includes.
* tests/aclocal6.test: Make sure acinclude.m4 is distributed
when used.
* tests/acinclude.test: Delete.
* tests/Makefile.am (TESTS): Remove acinclude.test.
---

diff --git a/ChangeLog b/ChangeLog
index ca5285245..d9ba91e0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-04-27  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* automake.in (@common_files): Remove acinclude.m4 since
+	it will be m4_included by aclocal.m4 and files are always
+	distributed.
+	(scan_aclocal_m4): Do not bother about acinclude.m4 anymore.
+	We will get this dependency when tracing m4_includes.
+	* tests/aclocal6.test: Make sure acinclude.m4 is distributed
+	when used.
+	* tests/acinclude.test: Delete.
+	* tests/Makefile.am (TESTS): Remove acinclude.test.
+
 2003-04-25  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* automake.in (handle_configure): Don't add @configure_deps to
diff --git a/automake.in b/automake.in
index 87842d250..6682be2de 100755
--- a/automake.in
+++ b/automake.in
@@ -221,7 +221,7 @@ my @libtool_sometimes = qw(ltconfig ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh);
 # DISTFILES.
 my @common_files =
     (qw(ABOUT-GNU ABOUT-NLS AUTHORS BACKLOG COPYING COPYING.DOC COPYING.LIB
-	COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO acinclude.m4
+	COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO
 	ansi2knr.1 ansi2knr.c compile config.guess config.rpath config.sub
 	configure configure.ac configure.in depcomp elisp-comp
 	install-sh libversion.in mdate-sh missing mkinstalldirs
@@ -4312,12 +4312,6 @@ sub scan_aclocal_m4
 
     my @ac_deps = ();
 
-    if (-f 'acinclude.m4')
-    {
-	$regen_aclocal = 1;
-	push @ac_deps, 'acinclude.m4';
-    }
-
     if (variable_defined ('ACLOCAL_M4_SOURCES'))
     {
 	push (@ac_deps, '$(ACLOCAL_M4_SOURCES)');
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4eb5cc9e7..379ab7acb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,7 +3,6 @@
 XFAIL_TESTS = auxdir2.test cond17.test txinfo5.test
 
 TESTS =	\
-acinclude.test \
 aclibobj.test \
 aclocal.test \
 aclocal3.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 2f0381138..794d46d7f 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -114,7 +114,6 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 XFAIL_TESTS = auxdir2.test cond17.test txinfo5.test
 TESTS = \
-acinclude.test \
 aclibobj.test \
 aclocal.test \
 aclocal3.test \
diff --git a/tests/acinclude.test b/tests/acinclude.test
deleted file mode 100755
index 930058d7e..000000000
--- a/tests/acinclude.test
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2002, 2003  Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with autoconf; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# Test to make sure acinclude is actually included.
-# Report from Jim Meyering.
-
-. ./defs || exit 1
-
-set -e
-: > acinclude.m4
-
-$ACLOCAL
-grep 'm4_include.*acinclude\.m4' aclocal.m4
diff --git a/tests/aclocal6.test b/tests/aclocal6.test
index c0a150f75..fe28a5ef1 100755
--- a/tests/aclocal6.test
+++ b/tests/aclocal6.test
@@ -19,7 +19,7 @@
 # Boston, MA 02111-1307, USA.
 
 # Make sure aclocal.m4 is rebuilt whenever a configure
-# dependency changes.  Test for VPATH too.
+# dependency changes.  Test for acinclude.m4 and VPATH too.
 
 required='GNUmake'
 . ./defs || exit 1
@@ -57,13 +57,21 @@ $MAKE
 # Update an aclocal.m4 dependency, then make sure all Makefiles
 # are updated, even from a sub-directory.
 echo 'AC_DEFUN([SOME_DEFS], [MORE_DEFS])' > ../m4/somedefs.m4
+# Because aclocal will run again, it should also pick up acinclude.m4.
+echo 'AC_SUBST([METOO])' > ../acinclude.m4
+
 cd sub
 $MAKE
 cd ..
 grep GREPME Makefile
 grep GREPME sub/Makefile
+grep GREPME sub/Makefile
+grep METOO Makefile
+grep METOO sub/Makefile
+grep METOO sub/Makefile
 
 # Make sure configure dependencies are distributed.
 $MAKE distdir
 test -f aclocal6-1.0/m4/moredefs.m4
 test -f aclocal6-1.0/m4/somedefs.m4
+test -f aclocal6-1.0/acinclude.m4