* David Byron wrote on Mon, Jan 08, 2007 at 08:25:28PM CET:
> On Monday, January 8 @ 11:05a, Ralf Wildenhues wrote:
> > * David Byron wrote on Mon, Jan 08, 2007 at 07:40:02PM CET:
[...]
> > >
> > > AC_CONFIG_FILES([Makefile util/Makefile
> > > util/tests/Makefile:config/cppunit.mk.in:util/tests/Makefile.in
> > > testmain/Makefile])
> >
> > What's in config/cppunit.mk.in and what in util/tests/Makefile.am?
> > I'm assuming the latter file exists, otherwise automake would have
> > no business in util/tests.
>
> I've attached them both.
Darn, this looks like a regression of 1.10 over 1.9.6, due to the
sed 10q
in m4/depout.m4: because cppunit.mk is longer than 10 lines, it won't
get to the "generated by automake" line any more.
Here's a hacky workaround: insert a comment like this near the top of
cppunit.mk (and do not use it for non-automake substituted files,
otherwise you need another file, am-fake.mk or so):
# do not remove the following line, it helps Automake 1.10
# generated by automake.
Phew. Do things work then? Could you also try the Automake patch
below?
OK to apply this to Automake to fix the failure?
Cheers, and thanks,
Ralf
2007-01-08 Ralf Wildenhues <[EMAIL PROTECTED]>
* m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Again search
the whole file, but use sed to reduce the line length.
Fixes 1.10 regression. Report by David Byron.
* THANKS: Update.
Index: THANKS
===================================================================
RCS file: /cvs/automake/automake/THANKS,v
retrieving revision 1.297
diff -u -r1.297 THANKS
--- THANKS 28 Oct 2006 09:51:57 -0000 1.297
+++ THANKS 8 Jan 2007 19:44:41 -0000
@@ -55,6 +56,7 @@
Dave Brolley [EMAIL PROTECTED]
Dave Morrison [EMAIL PROTECTED]
David A. Swierczek [EMAIL PROTECTED]
+David Byron [EMAIL PROTECTED]
Davyd Madeley [EMAIL PROTECTED]
David Pashley [EMAIL PROTECTED]
David Zaroski [EMAIL PROTECTED]
Index: m4/depout.m4
===================================================================
RCS file: /cvs/automake/automake/m4/depout.m4,v
retrieving revision 1.19
diff -u -r1.19 depout.m4
--- m4/depout.m4 6 Jun 2006 20:39:22 -0000 1.19
+++ m4/depout.m4 8 Jan 2007 19:43:06 -0000
@@ -22,7 +22,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null
2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
