Hello,
On Mon, Apr 03, 2006 at 12:23:11PM -0700, Noah Misch wrote:
> Note that naming a macro directory `m4sugar' causes autoupdate to misbehave,
all we need is to distinguish the m4sugar macros.
What about the following?
Stepan
2006-04-03 Stepan Kasal <kasal@xxxxxx>
* bin/autoupdate.in (handle_autoconf_patches): Change the way we
distinguish m4sugar macros.
Index: bin/autoupdate.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autoupdate.in,v
retrieving revision 1.60
diff -u -r1.60 autoupdate.in
--- bin/autoupdate.in 1 Apr 2006 15:58:43 -0000 1.60
+++ bin/autoupdate.in 3 Apr 2006 21:01:36 -0000
@@ -145,21 +145,11 @@
{
chomp;
my ($domain, $file, $macro) = /^(AC|AU):(.*):([^:]*)$/ or next;
- # ../lib/m4sugar/m4sugar.m4 -> m4sugar
- # ../lib/m4sugar/version.m4 -> m4sugar
- # ../lib/autoconf/general.m4 -> autoconf
- # aclocal.m4 -> aclocal
- # ../lib/m4sugar/m4sh.m4 -> m4sh
- my $set = basename (dirname ($file));
- $set = 'aclocal' if $file eq 'aclocal.m4';
- $set = 'm4sh' if basename($file) eq 'm4sh.m4';
- error "unknown set: $set: $_"
- unless $set =~ /^(m4sugar|m4sh|aclocal|autoconf)$/;
if ($domain eq "AU")
{
$au_macros{$macro} = 1;
}
- elsif ($set eq "m4sugar")
+ elsif ($file =~ /(^|\/)m4sugar\/(m4sugar|version)\.m4$/)
{
# Add the m4sugar macros to m4_builtins.
$m4_builtins{$macro} = 1;
_______________________________________________
Autoconf mailing list
Autoconf@xxxxxxx
http://lists.gnu.org/mailman/listinfo/autoconf
