* tests/aclocal4.test: New file. Test for the ACLOCAL_M4 bug below.

* tests/Makefile.am (TESTS): Add aclocal4.test.

diff --git a/ChangeLog b/ChangeLog
index 8a35c2b09b5940d241bf03fdb95756a7e818e2b1..7d4171c86e564b561bc777ace262af505b2be94e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-14  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * tests/aclocal4.test: New file.  Test for the ACLOCAL_M4 bug below.
+       * tests/Makefile.am (TESTS): Add aclocal4.test.
+
 2003-03-14  Jim Meyering  <jim@meyering.net>
 
        * automake.in (scan_aclocal_m4): Define ACLOCAL_M4 even in

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2439a3b9945892669cf65720f130b38d2b35db30..a35752138d43ee7df86e32478ec8924e650c1d10 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,6 +10,7 @@ aclocal2.test \
 aclocal.test \
 aclocal2.test \
 aclocal3.test \
+aclocal4.test \
 acoutnoq.test \
 acoutpt.test \
 acoutpt2.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index aeeb6473bf6935b6222483dd573e5ddda54e570e..9eebb14f02e4f427f2c4324ad8c6ff8fe6772e93 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -104,6 +104,7 @@ aclocal2.test \
 aclocal.test \
 aclocal2.test \
 aclocal3.test \
+aclocal4.test \
 acoutnoq.test \
 acoutpt.test \
 acoutpt2.test \
@@ -560,6 +561,7 @@ EXTRA_DIST = ChangeLog-old $(TESTS)
 # Each test case depends on defs.
 check_SCRIPTS = defs
 subdir = tests
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs
 CONFIG_CLEAN_FILES = defs
 DIST_SOURCES =

diff --git a/tests/aclocal4.test b/tests/aclocal4.test
new file mode 100755 (executable)
index 0000000..74aecd3
--- /dev/null
+++ b/tests/aclocal4.test
@@ -0,0 +1,79 @@
+#! /bin/sh
+# Copyright (C) 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 Automake; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Make sure dependencies on aclocal.m4 are set correctly.
+# Report from Jim Meyering.
+
+# We need GNU make for the `rebuild rules' to be triggered.
+required=make
+. ./defs || exit 1
+
+set -e
+
+cat >>configure.in <<EOF
+AC_PROG_RANLIB
+AC_PROG_CC
+MY_MACRO
+AC_CONFIG_FILES([lib/Makefile])
+AC_OUTPUT
+EOF
+
+mkdir m4
+cat >m4/mymacro.m4 <<EOF
+AC_DEFUN([MY_MACRO], [])
+EOF
+
+mkdir lib
+: > lib/foo.c
+: > lib/bar.c
+cat >lib/Makefile.am <<'EOF'
+noinst_LIBRARIES = liberi.a
+liberi_a_SOURCES = bar.c
+liberi_a_LIBADD = $(LIBOBJS)
+EOF
+
+cat >Makefile.am <<'EOF'
+SUBDIRS = lib
+EXTRA_DIST = m4/mymacro.m4
+ACLOCAL_AMFLAGS = -I m4
+check-foo: distdir
+       test -f $(distdir)/lib/foo.c
+       test -f $(distdir)/lib/bar.c
+
+check-not-foo: distdir
+       test ! -f $(distdir)/lib/foo.c
+       test -f $(distdir)/lib/bar.c
+EOF
+
+$ACLOCAL -I m4
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE check-not-foo
+
+# Update one of the macros.  This should cause ./configure, Makefile.in,
+# Makefile, lib/Makefile.in, and lib/Makfile to be updated.  This assumes
+# GNU make.
+
+cat >m4/mymacro.m4 <<'EOF'
+AC_DEFUN([MY_MACRO], [AC_LIBOBJ([foo])])
+EOF
+
+$MAKE check-foo