On Fri, Dec 16, 2011 at 3:02 PM, Stefano Lattarini < stefano.lattar...@gmail.com> wrote:
> Hi Eric. > > On Friday 16 December 2011, Eric Blake wrote: > > On 12/16/2011 03:26 AM, Stefano Lattarini wrote: > > > +++ b/tests/defs.in > > > @@ -103,6 +103,17 @@ test -z "$AUTORECONF" && > AUTORECONF="@am_AUTORECONF@" > > > test -z "$AUTOHEADER" && AUTOHEADER="@am_AUTOHEADER@" > > > test -z "$AUTOUPDATE" && AUTOUPDATE="@am_AUTOUPDATE@" > > > test -z "$MISSING" && MISSING=`pwd`/../lib/missing > > > + > > > +# This is an hack to seamlessly support the infamous "autoconf > wrappers", > > > > s/an hack/a hack/ (in English, when the 'h' is pronounced, you use 'a'; > > 'an' is only for silent 'h', such as 'an hour'). > > > Never-ending fun with the english spelling rules :-) Consider this fixed. > > > > +# that might dispatch different autoconf versions depending on the > name > > > +# of the input files and/or the command-line options used. See: > > > +# <http://lists.gnu.org/archive/html/automake/2011-12/msg00039.html> > > > +# FIXME: in the long run, the better fix will be to convert our > testsuite > > > +# to use `configure.ac' instead of `configure.in' as autoconf input. > > > > Agreed with this comment, since automake now requires new enough > > autoconf to always support configure.ac. > > > > > $(srcdir)/foobar.am: > > > -## Creative quoting to avoid spurious matches in the grepping > > > -## of Makefile.in, later. > > > - echo '#' 'foobar' 'was 'here' '#' > $@ > > > +## Use of escape sequences with printf instead of literal `#' > characters > > > +## is to avoid issues with FreeBSD make. Creative quoting and > spacing is > > > +## to avoid spurious matches in the grepping of Makefile.in, later. > > > + printf '\043 %s %s \043\n' foobar "was here" > $@ > > > > This is ASCII-centric; is there any way we can come up with a solution > > that also works on EBCDIC machines? > > > What about the following? It also seems simpler ... > > diff --git a/tests/remake-am-pr10111.test b/tests/remake-am-pr10111.test > index f7ad771..888c9dd 100755 > --- a/tests/remake-am-pr10111.test > +++ b/tests/remake-am-pr10111.test > @@ -35,10 +35,9 @@ END > cat > Makefile.am <<'END' > include $(srcdir)/foobar.am > $(srcdir)/foobar.am: > -## Use of escape sequences with printf instead of literal `#' characters > -## is to avoid issues with FreeBSD make. Creative quoting and spacing is > -## to avoid spurious matches in the grepping of Makefile.in, later. > - printf '\043 %s %s \043\n' foobar "was here" > $@ > +## Creative quoting is to avoid spurious matches in the grepping > +## of Makefile.in, later. > + echo "mu =" foobar "was here =" > $@ > END > > $ACLOCAL > @@ -59,7 +58,7 @@ cd build > # included by configure.in works also in VPATH builds. > rm -f ../foobar.am > $MAKE > -grep '# foobar was here #' ../Makefile.in > +grep '= foobar was here =' ../Makefile.in > $MAKE distcheck > > : > > Thanks, > Stefano > > > I've pushed these two patches now. Regards, Stefano
