* lib/autoconf/status.m4 (_AC_OUTPUT_FILE): Avoid warning

about literal '${datarootdir}' if a definition is found in the
output file.

diff --git a/ChangeLog b/ChangeLog
index 34fe0a71cf59a80c3c9ade04f46ca9a578dd7272..d94fd92ac469dba86d27dc4af71846ca19e5eec2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-22  Alexandre Julliard <julliard@winehq.org>
+
+       * lib/autoconf/status.m4 (_AC_OUTPUT_FILE): Avoid warning
+       about literal '${datarootdir}' if a definition is found in the
+       output file.
+
 2006-06-20  Paul Eggert  <eggert@cs.ucla.edu>
 
        * NEWS: Use "M4" rather than "m4" when appropriate.

diff --git a/configure b/configure
index 7cca5d8d86a71f9a0e05a18a2b8e79ea6c0fbb92..1dfd936f716b2735e06b48b9cf53d1cfc6c648ad 100755 (executable)
--- a/configure
+++ b/configure
@@ -3801,6 +3801,7 @@ $ac_datarootdir_hack
 
 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"; } &&
   { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
 echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 44516697f7d0c82eef8f06907ed3d35745c79465..71f23a87ea68aa8e7a0408f5be88a755d1b3d425 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -555,6 +555,7 @@ $ac_datarootdir_hack
 
 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.])