* automake.in (scan_autoconf_traces): Honor sinclude.

* tests/sinclude.test: Check for sinclude.
Report from Roberto Bagnara.

diff --git a/ChangeLog b/ChangeLog
index 092bb28cadedb00f21d4f16ea4c7af0b0ef30c06..362a867c5f947a78738062f94715b78c8fa6a336 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-12  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * automake.in (scan_autoconf_traces): Honor sinclude.
+       * tests/sinclude.test: Check for sinclude.
+       Report from Roberto Bagnara.
+
 2003-11-11  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * Makefile.am: Do not rerun `make dist' after tagging, `make distcheck'

diff --git a/THANKS b/THANKS
index dd71c4f23c2db5f52da3ac01379cd3a80397a046..b08b93efc4d7ed29b058e645a853d150518bb196 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -198,6 +198,7 @@ Rob Savoye          rob@cygnus.com
 Robert Bihlmeyer       robbe@orcus.priv.at
 Robert Boehne          rboehne@ricardo-us.com
 Robert Collins         robert.collins@itdomain.com.au
+Roberto Bagnara                bagnara@cs.unipr.it
 Ronald Landheer                ronald@landheer.com
 Rusty Ballinger                rusty@rlyeh.engr.sgi.com
 Ryan T. Sammartino     ryants@shaw.ca

diff --git a/automake.in b/automake.in
index f53a044e5ca68caf6fc4eb6b55bd252d32335da5..1c83bbf31489b965a46a65bb036a317ad04d7c13 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4398,6 +4398,7 @@ sub scan_autoconf_traces ($)
                AM_PROG_CC_C_O => 0,
                m4_include => 1,
                m4_sinclude => 1,
+               sinclude => 1,
              );
 
   my $traces = ($ENV{AUTOCONF} || 'autoconf') . " ";
@@ -4531,7 +4532,9 @@ sub scan_autoconf_traces ($)
        {
          $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

diff --git a/tests/sinclude.test b/tests/sinclude.test
index 9bf1d701f5dd9a31ff340e1546be605fcc30fccb..45a2679ffad93eec446750b310e512e7ed6bf348 100755 (executable)
--- a/tests/sinclude.test
+++ b/tests/sinclude.test
@@ -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 @@ cat > sub/h.m4 << 'END'
 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 @@ $AUTOMAKE
 
 grep MAGICALPIG Makefile.in
 grep MAGICALHOG Makefile.in
+grep GREPME Makefile.in