Tag
Hash :
ab57cf28
Author :
Date :
2003-04-24T18:48:07
* automake.in (scan_aclocal_m4): Do not parse ACLOCAL_AMFLAGS and glob for m4_files (We've got all local m4 files while tracing m4_include's). Diagnose ACLOCAL_M4_SOURCES as obsolete. Distribute aclocal.m4 only at the top-level. (my_glob): Remove. This fixes PR automake/11. (handle_dist): Strip leading `./' from directories. * aclocal.in (add_file): Output 'm4_include([file.m4])' instead of copying local files. (write_aclocal, parse_arguments): Bump copyright date. * configure.in: De not build m4/amversion.m4 from here ... * m4/Makefile.am ($(srcdir)/amversion.m4): ... do this here. (nodist_m4data_DATA): Use $(srcdir)/amversion.m4 instead of amversion.m4. * tests/Makefile.am (XFAIL_TESTS): Remove aclocal5.test. (TESTS): Remove aclocal2.test. Do not test aclocal.test twice. * tests/aclocal2.test: Delete (pointless). * tests/aclocal5.test: Make sure configure's dependencies are distributed. * tests/acinclude.test: Adjust to search for m4_include. * tests/dirlist.test, tests/dup3.test: Run $AUTOCONF and grep configure instead of aclocal.m4.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
#! /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.
# Test to make sure that aclocal.m4's dependencies are honored
# in sub-directories.
# This test assumes that the `make' utility is able to start
# over and reload Makefiles which have been remade (a non-POSIX feature).
required='GNUmake'
. ./defs || exit 1
set -e
cat >> configure.in << 'END'
MORE_DEFS
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
cat > Makefile.am << 'END'
SUBDIRS = sub
ACLOCAL_AMFLAGS = -I m4
END
mkdir sub
: > sub/Makefile.am
mkdir m4
echo 'AC_DEFUN([MORE_DEFS], [])' > m4/moredefs.m4
$ACLOCAL -I m4
$AUTOCONF
$AUTOMAKE --copy --add-missing
./configure
$MAKE
# Update an aclocal.m4 dependency, then make sure all Makefiles
# are updated, even from a sub-directory.
echo 'AC_DEFUN([MORE_DEFS], [AC_SUBST([GREPME])])' > m4/moredefs.m4
cd sub
$MAKE
cd ..
grep GREPME Makefile
grep GREPME sub/Makefile
# Make sure configure dependencies are distributed.
$MAKE distdir
test -f aclocal5-1.0/m4/moredefs.m4