* aclocal.in ($ac_defun_rx): Match AC_DEFUN_ONCE.

(trace_used_macros): Trace AC_DEFUN_ONCE.
* tests/aclocal5.test: Use AC_DEFUN_ONCE.

diff --git a/ChangeLog b/ChangeLog
index 55672d2..e305464 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-10  Kelley Cook  <kcook@gcc.gnu.org>  (tiny change)
+           Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * aclocal.in ($ac_defun_rx): Match AC_DEFUN_ONCE.
+       (trace_used_macros): Trace AC_DEFUN_ONCE.
+       * tests/aclocal5.test: Use AC_DEFUN_ONCE.
+
 2004-10-10  Stepan Kasal  <kasal@ucw.cz>  (tiny change)
 
        * doc/automake.texi (Extending): Typo.

diff --git a/THANKS b/THANKS
index 8e30d57..0302ad2 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -123,6 +123,7 @@ Juergen A. Erhard   jae@laden.ilk.de
 Juergen Keil           jk@tools.de
 Karl Berry             kb@cs.umb.edu
 Karl Heuer             kwzh@gnu.org
+Kelley Cook            kcook@gcc.gnu.org
 Kevin Dalley           kevin@aimnet.com
 Kevin P. Fleming.      kpfleming@cox.net
 Kevin Ryde             user42@zip.com.au

diff --git a/aclocal.in b/aclocal.in
index 50e9d1c..8443281 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -102,7 +102,7 @@ $verbose = 0;
 # When macroname is `['-quoted , we accept any character in the name,
 # except `]'.  Otherwise macroname stops on the first `]', `,', `)',
 # or `\n' encountered.
-$ac_defun_rx = "A[CU]_DEFUN\\((?:\\[([^]]+)\\]|([^],)\n]+))";
+$ac_defun_rx = "(?:A[CU]_DEFUN|AC_DEFUN_ONCE)\\((?:\\[([^]]+)\\]|([^],)\n]+))";
 
 # Matches an AC_REQUIRE line.
 $ac_require_rx = "AC_REQUIRE\\((?:\\[([^]]+)\\]|([^],)\n]+))\\)";
@@ -409,6 +409,7 @@ sub trace_used_macros ()
   $traces .= join (' ', grep { exists $files{$_} } @file_order) . " ";
   # All candidate macros.
   $traces .= join (' ', map { "--trace='$_:\$f:\$n:\$1'" } ('AC_DEFUN',
+                                                           'AC_DEFUN_ONCE',
                                                            'AU_DEFUN',
                                                            keys %macro_seen));
 
@@ -426,7 +427,9 @@ sub trace_used_macros ()
       $traced{$macro} = 1 if $macro_seen{$macro};
 
       $map_traced_defs{$arg1} = $file
-       if $macro eq 'AC_DEFUN' || $macro eq 'AU_DEFUN';
+       if ($macro eq 'AC_DEFUN'
+           || $macro eq 'AC_DEFUN_ONCE'
+           || $macro eq 'AU_DEFUN');
     }
 
   $tracefh->close;

diff --git a/tests/aclocal5.test b/tests/aclocal5.test
index 4bcbe22..950ce1d 100755 (executable)
--- a/tests/aclocal5.test
+++ b/tests/aclocal5.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -53,7 +53,7 @@ $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
+echo 'AC_DEFUN_ONCE([MORE_DEFS], [AC_SUBST([GREPME])])' > m4/moredefs.m4
 cd sub
 $MAKE
 cd ..