* lib/autoconf/status.m4 (_AC_OUTPUT_FILE): Do not use `grep' on

the output file in the `${datarootdir}' test.

diff --git a/ChangeLog b/ChangeLog
index 179ba29d61d081012f6b1a3c9b750ec077821072..065eaf1cbe21b40b5191e0478a92d50a8ddfcbef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-28  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+       * lib/autoconf/status.m4 (_AC_OUTPUT_FILE): Do not use `grep' on
+       the output file in the `${datarootdir}' test.
+
 2005-05-28  Stepan Kasal  <kasal@ucw.cz>
        and Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index cfa0090b87322affcdaec1b762e41a8d7459440e..76a4fb998ce4648cddd1bc804a1c144940aaacf4 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -552,7 +552,7 @@ $ac_datarootdir_hack
 " $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.])