From 1b3a0187b0af188200b17ed4dc3d14bf9f5f2fec Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Wed, 12 Nov 2003 19:29:53 +0000 Subject: [PATCH] * automake.in (scan_autoconf_traces): Honor sinclude. * tests/sinclude.test: Check for sinclude. Report from Roberto Bagnara. --- ChangeLog | 6 ++++++ THANKS | 1 + automake.in | 5 ++++- tests/sinclude.test | 9 ++++++++- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 092bb28ca..362a867c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-11-12 Alexandre Duret-Lutz + + * automake.in (scan_autoconf_traces): Honor sinclude. + * tests/sinclude.test: Check for sinclude. + Report from Roberto Bagnara. + 2003-11-11 Alexandre Duret-Lutz * Makefile.am: Do not rerun `make dist' after tagging, `make distcheck' diff --git a/THANKS b/THANKS index dd71c4f23..b08b93efc 100644 --- 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 f53a044e5..1c83bbf31 100755 --- 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 9bf1d701f..45a2679ff 100755 --- 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 -- 2.47.2