[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Have aclocal scan for AC_DEFUN_ONCE
From: |
Alexandre Duret-Lutz |
Subject: |
Re: Have aclocal scan for AC_DEFUN_ONCE |
Date: |
Sun, 10 Oct 2004 19:03:29 +0200 |
User-agent: |
Gnus/5.1003 (Gnus v5.10.3) Emacs/21.3.50 (gnu/linux) |
>>> "Kelley" == Kelley Cook <address@hidden> writes:
Kelley> Hi,
Kelley> In the course of converting various directories within GCC to use
Kelley> aclocal's nifty new m4_include feature I noticed that aclocal 1.9.2
Kelley> was not picking up any of our macros defined with AC_DEFUN_ONCE.
Thanks, I'm checking this in on HEAD and branch-1-9.
2004-10-10 Kelley Cook <address@hidden> (tiny change)
Alexandre Duret-Lutz <address@hidden>
* aclocal.in ($ac_defun_rx): Match AC_DEFUN_ONCE.
(trace_used_macros): Trace AC_DEFUN_ONCE.
* tests/aclocal5.test: Use AC_DEFUN_ONCE.
Index: THANKS
===================================================================
RCS file: /cvs/automake/automake/THANKS,v
retrieving revision 1.256.2.1
diff -u -r1.256.2.1 THANKS
--- THANKS 28 Sep 2004 22:02:53 -0000 1.256.2.1
+++ THANKS 10 Oct 2004 17:01:18 -0000
@@ -123,6 +123,7 @@
Juergen Keil address@hidden
Karl Berry address@hidden
Karl Heuer address@hidden
+Kelley Cook address@hidden
Kevin Dalley address@hidden
Kevin P. Fleming. address@hidden
Kevin Ryde address@hidden
Index: aclocal.in
===================================================================
RCS file: /cvs/automake/automake/aclocal.in,v
retrieving revision 1.104.2.1
diff -u -r1.104.2.1 aclocal.in
--- aclocal.in 1 Aug 2004 20:05:31 -0000 1.104.2.1
+++ aclocal.in 10 Oct 2004 17:01:18 -0000
@@ -101,7 +101,7 @@
# 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]+))\\)";
@@ -427,6 +427,7 @@
$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));
@@ -444,7 +445,9 @@
$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;
Index: tests/aclocal5.test
===================================================================
RCS file: /cvs/automake/automake/tests/aclocal5.test,v
retrieving revision 1.2
diff -u -r1.2 aclocal5.test
--- tests/aclocal5.test 24 Apr 2003 18:48:06 -0000 1.2
+++ tests/aclocal5.test 10 Oct 2004 17:01:18 -0000
@@ -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 @@
# 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 ..
--
Alexandre Duret-Lutz
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: Have aclocal scan for AC_DEFUN_ONCE,
Alexandre Duret-Lutz <=