From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Thu, 22 Jun 2006 17:16:42 +0000 (+0000)
Subject: * lib/autoconf/status.m4 (_AC_OUTPUT_FILE): Avoid warning
X-Git-Tag: AUTOCONF-2.60~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd56c8aa0f0edb00c4e14e5cb4f00a155354924a;p=thirdparty%2Fautoconf.git

* 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 34fe0a71c..d94fd92ac 100644
--- 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 7cca5d8d8..1dfd936f7 100755
--- 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 44516697f..71f23a87e 100644
--- 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.])