FYI: handle sinclude (Was: Re: Automake 1.7b uploaded (beta for Automake 1.8))

[Alexandre Duret-Lutz]

>>> "adl" == Alexandre Duret-Lutz <address@hidden> writes:

>>> "Roberto" == Roberto Bagnara <address@hidden> writes:
 adl> [...]

 Roberto> --trace=m4_include:\$f:\$l::\$n::\${::}%
 Roberto> automake: ####################
 Roberto> automake: ## Internal Error ##
 Roberto> automake: ####################
 Roberto> automake: unrequested trace `sinclude'
 Roberto> automake: Please contact <address@hidden>.

 adl> Thanks for the report.  This will be easy to fix, I'll do it tonight.

 adl> The problem is that sinclude is an obsolete name for m4_include,
 adl> and Automake isn't aware of that.  You could as well change your
 adl> acinclude.m4 file to use m4_include instead of sinclude; or
 adl> better: delete acinclude.m4 and add `ACLOCAL_AMFLAGS = -I m4' to
 adl> your top-level Makefile.am.  (aclocal is expected to add this
 adl> list of m4_includes to aclocal.m4 automatically)

I'm checking this in.

2003-11-12  Alexandre Duret-Lutz  <address@hidden>

        * automake.in (scan_autoconf_traces): Honor sinclude.
        * tests/sinclude.test: Check for sinclude.
        Report from Roberto Bagnara.

Index: THANKS
===================================================================
RCS file: /cvs/automake/automake/THANKS,v
retrieving revision 1.225
diff -u -r1.225 THANKS
--- THANKS      8 Nov 2003 16:07:44 -0000       1.225
+++ THANKS      12 Nov 2003 19:27:51 -0000
@@ -198,6 +198,7 @@
 Robert Bihlmeyer       address@hidden
 Robert Boehne          address@hidden
 Robert Collins         address@hidden
+Roberto Bagnara                address@hidden
 Ronald Landheer                address@hidden
 Rusty Ballinger                address@hidden
 Ryan T. Sammartino     address@hidden
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1513
diff -u -r1.1513 automake.in
--- automake.in 10 Nov 2003 20:55:30 -0000      1.1513
+++ automake.in 12 Nov 2003 19:27:56 -0000
@@ -4398,6 +4398,7 @@
                AM_PROG_CC_C_O => 0,
                m4_include => 1,
                m4_sinclude => 1,
+               sinclude => 1,
              );
 
   my $traces = ($ENV{AUTOCONF} || 'autoconf') . " ";
@@ -4531,7 +4532,9 @@
        {
          $seen_cc_c_o = $where;
        }
-      elsif ($macro eq 'm4_include' || $macro eq 'm4_sinclude')
+      elsif ($macro eq 'm4_include'
+            || $macro eq 'm4_sinclude'
+            || $macro eq 'sinclude')
        {
          # Some modified versions of Autoconf don't use
          # forzen files.  Consequently it's possible that we see all
Index: tests/sinclude.test
===================================================================
RCS file: /cvs/automake/automake/tests/sinclude.test,v
retrieving revision 1.8
diff -u -r1.8 sinclude.test
--- tests/sinclude.test 8 Sep 2002 13:07:56 -0000       1.8
+++ tests/sinclude.test 12 Nov 2003 19:27:59 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1998, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2002, 2003  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -42,8 +42,14 @@
 AC_SUBST(MAGICALHOG)
 END
 
+cat > sub/g.m4 << 'END'
+AC_SUBST(GREPME)
+END
+
 : > Makefile.am
 
+echo 'sinclude(sub/g.m4)' >> acinclude.m4
+
 $ACLOCAL
 
 echo 'm4_sinclude(sub/p.m4)' >> aclocal.m4
@@ -53,3 +59,4 @@
 
 grep MAGICALPIG Makefile.in
 grep MAGICALHOG Makefile.in
+grep GREPME Makefile.in
-- 
Alexandre Duret-Lutz