Fix previous patch.

* lib/autotest/general.m4 (at_fn_check_prepare_notrace): Use
proper m4 quoting.
(_AT_DECIDE_TRACEABLE): Likewise.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 440e936207bd18fdbc6f082438e47af0ea241bd1..f5434bda7116df35036cb8f169d6c1b6a892c7c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-13  Eric Blake  <ebb9@byu.net>
+
+       Fix previous patch.
+       * lib/autotest/general.m4 (at_fn_check_prepare_notrace): Use
+       proper m4 quoting.
+       (_AT_DECIDE_TRACEABLE): Likewise.
+
 2009-07-13  Paolo Bonzini  <bonzini@gnu.org>
 
        * lib/autotest/general.m4 (at_fn_check_prepare_notrace): Use

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 59cce958e6c86cdef2b6e09dc2d6914c1d8183de..6032796668d832ce17d513b6e342a9bb0f94dd94 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -268,7 +268,7 @@ AS_FUNCTION_DESCRIBE([at_fn_check_prepare_notrace], [REASON LINE],
 untraceable command; REASON is the reason for disabling tracing.])
 at_fn_check_prepare_notrace ()
 {
-  $at_trace_echo "Not enabling shell tracing (command contains $1)"
+  $at_trace_echo "Not enabling shell tracing (command contains $[1])"
   AS_ECHO(["$[2]"]) >"$at_check_line_file"
   at_check_trace=: at_check_filter=:
   : >"$at_stdout"; : >"$at_stderr"
@@ -2015,7 +2015,7 @@ m4_cond([m4_eval(m4_index([$1], [`]) >= 0)], [1],
        []))]dnl No reason.
 [m4_if(m4_index(_m4_defn([at_reason]), [a]), [0],]dnl
 dnl We know at build time that tracing COMMANDS is never safe.
-[[at_fn_check_prepare_notrace 'm4_defn([at_reason])'],dnl
+[[at_fn_check_prepare_notrace '_m4_defn([at_reason])'],
        m4_index([$1], [$]), [-1],]dnl
 dnl We know at build time that tracing COMMANDS is always safe.
 [[at_fn_check_prepare_trace],]dnl