From: Akim Demaille <akim@epita.fr>
Date: Wed, 29 Mar 2000 16:18:52 +0000 (+0000)
Subject: silent.m4 depends upon the current quotation in m4, which changes
X-Git-Tag: autoconf-2.50~985
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e30614b9ae6433a8a2e39dd42b67f884418c3bb;p=thirdparty%2Fautoconf.git

silent.m4 depends upon the current quotation in m4, which changes
if `-i' is used or not.

* autoconf.sh (trace::silent.m4): Removed.
(trace::run_m4_trace): Pass -Derrprint.
---

diff --git a/ChangeLog b/ChangeLog
index cc109ca14..96bbb72fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-03-29  Akim Demaille  <akim@epita.fr>
+
+	silent.m4 depends upon the current quotation in m4, which changes
+	if `-i' is used or not.
+
+	* autoconf.sh (trace::silent.m4): Removed.
+	(trace::run_m4_trace): Pass -Derrprint.
+
 2000-03-29  Akim Demaille  <akim@epita.fr>
 
 	Use `mktemp -d' when possible to create securely a tmp work dir.
diff --git a/autoconf.in b/autoconf.in
index 9cb9fb495..e3e3693ed 100644
--- a/autoconf.in
+++ b/autoconf.in
@@ -299,11 +299,6 @@ case $task in
   ## Trace macros.  ##
   ## -------------- ##
   trace)
-  # `errprint' must be silent when we run `m4 --trace', otherwise there
-  # can be warnings mixed with traces in m4's stderr.
-  cat >$tmp/silent.m4 <<\EOF
-define(`errprint')dnl
-EOF
   # A program to trace m4 macros.
   cat >$tmp/trace.m4 <<\EOF
 divert(-1)
@@ -444,10 +439,12 @@ EOF
   echo "divert(0)dnl" >>$tmp/trace.m4
 
   # Do we trace the initialization?
+  # `errprint' must be silent, otherwise there can be warnings mixed
+  # with traces in m4's stderr.
   if $initialization; then
-    run_m4_trace="$run_m4 $trace_opt -daflq $tmp/silent.m4"
+    run_m4_trace="$run_m4 $trace_opt -daflq -Derrprint"
   else
-    run_m4_trace="$run_m4f $trace_opt -daflq $tmp/silent.m4"
+    run_m4_trace="$run_m4f $trace_opt -daflq -Derrprint"
   fi
 
   # Run m4 on the input file to get traces.
@@ -455,15 +452,15 @@ EOF
   $run_m4_trace $infile 2>&1 >/dev/null |
     sed -e 's/^m4trace:\([^:][^:]*\):\([0-9][0-9]*\): -\([0-9][0-9]*\)- \([^(][^(]*\)(\(.*\)$/AT_\4([\1], [\2], [\3], [\4], \5/' \
         -e 's/^m4trace:\([^:][^:]*\):\([0-9][0-9]*\): -\([0-9][0-9]*\)- \(.*\)$/AT_\4([\1], [\2], [\3], [\4])/' |
-  # Now we are ready to run m4 to process the trace file.
-  $M4 $tmp/trace.m4 - |
-  # It makes no sense to try to transform __oline__.
-  sed '
-    s/@<:@/[/g
-    s/@:>@/]/g
-    s/@S|@/$/g
-    s/@%:@/#/g
-    ' >&4
+    # Now we are ready to run m4 to process the trace file.
+    $M4 $tmp/trace.m4 - |
+    # It makes no sense to try to transform __oline__.
+    sed '
+      s/@<:@/[/g
+      s/@:>@/]/g
+      s/@S|@/$/g
+      s/@%:@/#/g
+      ' >&4
   ;;
 
 
diff --git a/autoconf.sh b/autoconf.sh
index 9cb9fb495..e3e3693ed 100644
--- a/autoconf.sh
+++ b/autoconf.sh
@@ -299,11 +299,6 @@ case $task in
   ## Trace macros.  ##
   ## -------------- ##
   trace)
-  # `errprint' must be silent when we run `m4 --trace', otherwise there
-  # can be warnings mixed with traces in m4's stderr.
-  cat >$tmp/silent.m4 <<\EOF
-define(`errprint')dnl
-EOF
   # A program to trace m4 macros.
   cat >$tmp/trace.m4 <<\EOF
 divert(-1)
@@ -444,10 +439,12 @@ EOF
   echo "divert(0)dnl" >>$tmp/trace.m4
 
   # Do we trace the initialization?
+  # `errprint' must be silent, otherwise there can be warnings mixed
+  # with traces in m4's stderr.
   if $initialization; then
-    run_m4_trace="$run_m4 $trace_opt -daflq $tmp/silent.m4"
+    run_m4_trace="$run_m4 $trace_opt -daflq -Derrprint"
   else
-    run_m4_trace="$run_m4f $trace_opt -daflq $tmp/silent.m4"
+    run_m4_trace="$run_m4f $trace_opt -daflq -Derrprint"
   fi
 
   # Run m4 on the input file to get traces.
@@ -455,15 +452,15 @@ EOF
   $run_m4_trace $infile 2>&1 >/dev/null |
     sed -e 's/^m4trace:\([^:][^:]*\):\([0-9][0-9]*\): -\([0-9][0-9]*\)- \([^(][^(]*\)(\(.*\)$/AT_\4([\1], [\2], [\3], [\4], \5/' \
         -e 's/^m4trace:\([^:][^:]*\):\([0-9][0-9]*\): -\([0-9][0-9]*\)- \(.*\)$/AT_\4([\1], [\2], [\3], [\4])/' |
-  # Now we are ready to run m4 to process the trace file.
-  $M4 $tmp/trace.m4 - |
-  # It makes no sense to try to transform __oline__.
-  sed '
-    s/@<:@/[/g
-    s/@:>@/]/g
-    s/@S|@/$/g
-    s/@%:@/#/g
-    ' >&4
+    # Now we are ready to run m4 to process the trace file.
+    $M4 $tmp/trace.m4 - |
+    # It makes no sense to try to transform __oline__.
+    sed '
+      s/@<:@/[/g
+      s/@:>@/]/g
+      s/@S|@/$/g
+      s/@%:@/#/g
+      ' >&4
   ;;
 
 
diff --git a/bin/autoconf.in b/bin/autoconf.in
index 9cb9fb495..e3e3693ed 100644
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -299,11 +299,6 @@ case $task in
   ## Trace macros.  ##
   ## -------------- ##
   trace)
-  # `errprint' must be silent when we run `m4 --trace', otherwise there
-  # can be warnings mixed with traces in m4's stderr.
-  cat >$tmp/silent.m4 <<\EOF
-define(`errprint')dnl
-EOF
   # A program to trace m4 macros.
   cat >$tmp/trace.m4 <<\EOF
 divert(-1)
@@ -444,10 +439,12 @@ EOF
   echo "divert(0)dnl" >>$tmp/trace.m4
 
   # Do we trace the initialization?
+  # `errprint' must be silent, otherwise there can be warnings mixed
+  # with traces in m4's stderr.
   if $initialization; then
-    run_m4_trace="$run_m4 $trace_opt -daflq $tmp/silent.m4"
+    run_m4_trace="$run_m4 $trace_opt -daflq -Derrprint"
   else
-    run_m4_trace="$run_m4f $trace_opt -daflq $tmp/silent.m4"
+    run_m4_trace="$run_m4f $trace_opt -daflq -Derrprint"
   fi
 
   # Run m4 on the input file to get traces.
@@ -455,15 +452,15 @@ EOF
   $run_m4_trace $infile 2>&1 >/dev/null |
     sed -e 's/^m4trace:\([^:][^:]*\):\([0-9][0-9]*\): -\([0-9][0-9]*\)- \([^(][^(]*\)(\(.*\)$/AT_\4([\1], [\2], [\3], [\4], \5/' \
         -e 's/^m4trace:\([^:][^:]*\):\([0-9][0-9]*\): -\([0-9][0-9]*\)- \(.*\)$/AT_\4([\1], [\2], [\3], [\4])/' |
-  # Now we are ready to run m4 to process the trace file.
-  $M4 $tmp/trace.m4 - |
-  # It makes no sense to try to transform __oline__.
-  sed '
-    s/@<:@/[/g
-    s/@:>@/]/g
-    s/@S|@/$/g
-    s/@%:@/#/g
-    ' >&4
+    # Now we are ready to run m4 to process the trace file.
+    $M4 $tmp/trace.m4 - |
+    # It makes no sense to try to transform __oline__.
+    sed '
+      s/@<:@/[/g
+      s/@:>@/]/g
+      s/@S|@/$/g
+      s/@%:@/#/g
+      ' >&4
   ;;