* quoting myself from Thu, May 25, 2006 at 10:23:49PM CEST:
>
> * lib/autoconf/status.m4 (_AC_OUTPUT_FILE): If we have not seen
> mention of `datarootdir' in the input file(s), but literal
> `${datarootdir}' in the output file, and we haven't warned yet,
> then warn as well: the user may have (erroneously) used
> `AC_SUBST([mydatadir], [$datadir/my])' instead of the correct
> `AC_SUBST([mydatadir], ['${datadir}/my'])'.
> * tests/torture.at (datarootdir workaround): Extend this test.
> * NEWS: Update.
* Paul Eggert wrote:
> Looks OK to me, but I'd trust Stepan's opinion more.
Thanks for the review. Stepan told me it was probably ok, so I
installed this...
...and then I installed this further patch, to get rid of `grep' again.
Cheers,
Ralf
* lib/autoconf/status.m4 (_AC_OUTPUT_FILE): Do not use `grep' on
the output file in the `${datarootdir}' test.
Index: lib/autoconf/status.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/status.m4,v
retrieving revision 1.111
diff -u -r1.111 status.m4
--- lib/autoconf/status.m4 28 May 2006 12:38:49 -0000 1.111
+++ lib/autoconf/status.m4 28 May 2006 12:44:32 -0000
@@ -552,7 +552,7 @@
" $ac_file_inputs m4_defn([_AC_SED_CMDS])>$tmp/out
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- grep '\${datarootdir}' "$tmp/out" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
AC_MSG_WARN([$ac_file contains a reference to the variable `datarootdir'
which seems to be undefined. Please make sure it is defined.])
