* lib/am/configure.am (%?REGEN-ACLOCAL-M4%): New target

$(am__aclocal_m4_deps) without any dependencies, to avoid the
"deleted .m4 file" problem.
* tests/acloca22.test: New test.
* tests/Makefile.am: Update.
* NEWS: Update.

diff --git a/ChangeLog b/ChangeLog
index d3df998039dbca00ac4f098c1b35c91ac0e1c456..406a6609a079dd62a9fff9e03a81ac3531a91035 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-07-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+           Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * lib/am/configure.am (%?REGEN-ACLOCAL-M4%): New target
+       $(am__aclocal_m4_deps) without any dependencies, to avoid the
+       "deleted .m4 file" problem.
+       * tests/acloca22.test: New test.
+       * tests/Makefile.am: Update.
+       * NEWS: Update.
+
 2007-07-22  Francesco Salvestrini  <salvestrini@gmail.com>
            Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 

diff --git a/Makefile.in b/Makefile.in
index e2cd6067d15f2cb4067756334a6dd37287e89932..5c72e2669ad9476ebc0d09ae3da660ad0b442fc0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -234,6 +234,7 @@ $(top_srcdir)/configure:  $(am__configure_deps)
        cd $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
 install-binSCRIPTS: $(bin_SCRIPTS)
        @$(NORMAL_INSTALL)
        test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"

diff --git a/NEWS b/NEWS
index 4fd57de632a68e5fb721e17c149cba1e0d7b5e7a..6304757ec3c2c7de8b8c6c81c2984ebeb8c5adfd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,10 @@ New in 1.10a:
   - install-sh supports -C, which does not update the installed file
     (and its time stamps) if the contents did not change.
 
+  - The "deleted header file problem" for *.m4 files is avoided by
+    stub rules.  This allows `make' to trigger a rerun of `aclocal'
+    also if some previously needed macro file has been removed.
+
 Bugs fixed in 1.10a:
 
 * Long standing bugs:

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6c1e4b6cd74eaf20cd77835010cea34ea6042582..35a0897cfd6c0239d92ebbac908919dd7d7dd745 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -222,6 +222,7 @@ $(top_srcdir)/configure:  $(am__configure_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 .texi.info:
        restore=: && backupdir="$(am__leading_dot)am$$$$" && \

diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 5c7f96056114e590eb9001c09420282741276ed8..6385f5e6c9494ea777e4a75c0419b4135bc5d5e1 100644 (file)
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -226,6 +226,7 @@ $(top_srcdir)/configure:  $(am__configure_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-dist_perllibDATA: $(dist_perllib_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(perllibdir)" || $(MKDIR_P) "$(DESTDIR)$(perllibdir)"

diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 836facfaec78795033b76c074dcc7dacece31de8..f03165ccdf684d6860618f1ff090db44f5cfdf69 100644 (file)
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -173,6 +173,7 @@ $(top_srcdir)/configure:  $(am__configure_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 9a97c45d2a2f27d17686fc645aa8f073cb8b3273..902a1520f09028e9f98f1b28220caa05ad1a3489 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -202,6 +202,7 @@ $(top_srcdir)/configure:  $(am__configure_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-dist_pkgvdataDATA: $(dist_pkgvdata_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(pkgvdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgvdatadir)"

diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index d895e6c5f7d5340ff97b76da37f5435543df2a72..b90071b57e189b0b709cea2fc3f04b1e0b1cf2c8 100644 (file)
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -218,6 +218,7 @@ $(top_srcdir)/configure:  $(am__configure_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-dist_amDATA: $(dist_am_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(amdir)" || $(MKDIR_P) "$(DESTDIR)$(amdir)"

diff --git a/lib/am/configure.am b/lib/am/configure.am
index b2926e3d4ca48540eef36758b8989becea6e27c9..1e10de856c4bbf4f95eb73f2450a527378fb89f4 100644 (file)
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -1,5 +1,6 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2002, 2003, 2004, 2006  Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007  Free Software
+## Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -117,6 +118,9 @@ if %?REGEN-ACLOCAL-M4%
 $(ACLOCAL_M4): %MAINTAINER-MODE% $(am__aclocal_m4_deps)
 ?TOPDIR_P?     cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 ?!TOPDIR_P?    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+## Avoid the "deleted header file" problem for the dependencies.
+$(am__aclocal_m4_deps):
 endif %?REGEN-ACLOCAL-M4%
 
 

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 21181eb6d5d5b50c7f6056ed7b0c3d4052c40d94..3864844837b5dadf54b5fb226b406b5a5528cb59 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -214,6 +214,7 @@ $(top_srcdir)/configure:  $(am__configure_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-dist_m4dataDATA: $(dist_m4data_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(m4datadir)" || $(MKDIR_P) "$(DESTDIR)$(m4datadir)"

diff --git a/tests/Makefile.am b/tests/Makefile.am
index df6ff8760c5b294f74cb4acbcd4096f1e4136b09..7dbdc390b522cad33548f9150c28738314b19b83 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,6 +24,7 @@ acloca18.test \
 acloca19.test \
 acloca20.test \
 acloca21.test \
+acloca22.test \
 acoutnoq.test \
 acoutpt.test \
 acoutpt2.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index f45ba3ea0d3db7e64591684dcd3da46f1770c479..0fb651e47c44f9388945139f821bce3a83703b59 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -157,6 +157,7 @@ acloca18.test \
 acloca19.test \
 acloca20.test \
 acloca21.test \
+acloca22.test \
 acoutnoq.test \
 acoutpt.test \
 acoutpt2.test \
@@ -785,6 +786,7 @@ $(top_srcdir)/configure:  $(am__configure_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 defs: $(top_builddir)/config.status $(srcdir)/defs.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 aclocal-${APIVERSION}: $(top_builddir)/config.status $(srcdir)/aclocal.in

diff --git a/tests/acloca22.test b/tests/acloca22.test
new file mode 100755 (executable)
index 0000000..f5514cd
--- /dev/null
+++ b/tests/acloca22.test
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2007  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 Automake; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+# Make sure the "deleted header file" issue is fixed wrt. aclocal.m4
+# dependencies.
+
+. ./defs || exit 1
+
+set -e
+
+cat >>configure.in <<EOF
+FOO
+AC_OUTPUT
+EOF
+cat >foo.m4 <<EOF
+AC_DEFUN([FOO], [AC_SUBST([GREPFOO])])
+EOF
+cat >bar.m4 <<EOF
+AC_DEFUN([BAR], [AC_SUBST([GREPBAR])])
+EOF
+cat >Makefile.am <<EOF
+ACLOCAL_AMFLAGS = -I .
+EOF
+$ACLOCAL -I .
+$AUTOMAKE
+$AUTOCONF
+./configure
+$MAKE
+grep GREPFOO Makefile
+grep GREPBAR Makefile && exit 1
+sed 's/FOO/BAR/' < configure.in > t
+mv -f t configure.in
+rm -f foo.m4
+$MAKE
+grep GREPFOO Makefile && exit 1
+grep GREPBAR Makefile