+2005-01-05 Akim Demaille <akim@epita.fr>
+
+ * aclocal.in ($ac_defun_rx): Match AU_ALIAS.
+ * tests/aclocal5.test (MORE_DEFS): Rename as...
+ (AM_TEST_SUBST): this so that undefined macros are caught.
+ And make it an alias of AC_SUBST.
+ Test AU_ALIAS.
+ Reported by Martin Bravenboer.
+
2005-01-03 Alexandre Duret-Lutz <adl@gnu.org>
Fix handling of per-target flags in link rules.
Mark Phillips msp@nortelnetworks.com
Markku Rossi mtr@ngs.fi
Markus F.X.J. Oberhumer k3040e4@wildsau.idv-edu.uni-linz.ac.at
+Martin Bravenboer martin@cs.uu.nl
Martin Frydl martin@idoox.com
Martin Waitz tali@admingilde.org
Mathias Doreille doreille@smr.ch
# except `]'. Otherwise macroname stops on the first `]', `,', `)',
# or `\n' encountered.
my $ac_defun_rx =
- "(?:A[CU]_DEFUN|AC_DEFUN_ONCE)\\((?:\\[([^]]+)\\]|([^],)\n]+))";
+ "(?:AU_ALIAS|A[CU]_DEFUN|AC_DEFUN_ONCE)\\((?:\\[([^]]+)\\]|([^],)\n]+))";
# Matches an AC_REQUIRE line.
my $ac_require_rx = "AC_REQUIRE\\((?:\\[([^]]+)\\]|([^],)\n]+))\\)";
#! /bin/sh
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
#
# This file is part of GNU Automake.
#
set -e
cat >> configure.in << 'END'
-MORE_DEFS
+AM_TEST([GREPME])
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
: > sub/Makefile.am
mkdir m4
-echo 'AC_DEFUN([MORE_DEFS], [])' > m4/moredefs.m4
+echo 'AC_DEFUN([AM_TEST], [echo $@])' > m4/moredefs.m4
$ACLOCAL -I m4
$AUTOCONF
./configure
$MAKE
-# Update an aclocal.m4 dependency, then make sure all Makefiles
-# are updated, even from a sub-directory.
-echo 'AC_DEFUN_ONCE([MORE_DEFS], [AC_SUBST([GREPME])])' > m4/moredefs.m4
+# Update an aclocal.m4 dependency, then make sure all Makefiles are
+# updated, even from a sub-directory. Check that AU_ALIAS is
+# recognized. Change the definition of AM_TEST to check that its new
+# definition is used.
+echo 'AU_ALIAS([AM_TEST], [AC_SUBST])' > m4/moredefs.m4
cd sub
$MAKE
cd ..
# Make sure configure dependencies are distributed.
$MAKE distdir
test -f aclocal5-1.0/m4/moredefs.m4
+
+# Change the definition of AM_TEST to check that its new definition is
+# used. Check that AC_DEFUN_ONCE is caught.
+echo 'AC_DEFUN_ONCE([AM_TEST], [AC_SUBST(__$1__)])' > m4/moredefs.m4
+$MAKE
+grep 'm4/moredefs\.m4' aclocal.m4
+grep '@__GREPME__@' configure