Hi Stepan,
* Stepan Kasal wrote on Thu, Jun 22, 2006 at 05:26:59PM CEST:
> On Wed, Jun 21, 2006 at 09:14:49PM +0200, Ralf Wildenhues wrote:
> > > > >> { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n
> > > > >> "$ac_out"; } &&
> > > > >> + { ac_out=`sed -n '/^[[ ]]*datarootdir[[ ]]*:*=/p'
> > > > >> "$tmp/out"`; test -z "$ac_out"; } &&
> We can replace the two sed calls by one:
I don't favor this, for two reasons: the first sed script is cheap, in
the sense that it's just searching for a plain pattern. The second one
will not be executed often -- only in the case where we don't care for
speed anyway. The other reason is readability. :-)
I have applied Alexandre's patch as follows, changing only space-tab to
tab-space to evade the corresponding syntax check.
Cheers,
Ralf
2006-06-22 Alexandre Julliard <[EMAIL PROTECTED]>
* lib/autoconf/status.m4 (_AC_OUTPUT_FILE): Avoid warning
about literal '${datarootdir}' if a definition is found in the
output file.
Index: lib/autoconf/status.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/status.m4,v
retrieving revision 1.114
diff -u -r1.114 status.m4
--- lib/autoconf/status.m4 30 May 2006 05:47:40 -0000 1.114
+++ lib/autoconf/status.m4 22 Jun 2006 17:11:52 -0000
@@ -555,6 +555,7 @@
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[[ ]]*datarootdir[[ ]]*:*=/p' "$tmp/out"`;
test -z "$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.])
