* autoconf.sh (trace): Let translate_awk do the whole translation

from `$trace' to the m4 program.

diff --git a/ChangeLog b/ChangeLog
index affb02872a5805ed46b4b052562a2342b09d84e5..2654655c46fa0e46a9834801fc12336e8a92a249 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-27  Akim Demaille  <akim@epita.fr>
+
+       * autoconf.sh (trace): Let translate_awk do the whole translation
+       from `$trace' to the m4 program.
+
 2000-03-27  Akim Demaille  <akim@epita.fr>
 
        * acgeneral.m4 (AC_PACKAGE): Also define AC_PACKAGE_STRING.

diff --git a/autoconf.in b/autoconf.in
index bc329ff04613d1de846460ad79c155da335f4d9f..8e837e1287e9e844123be056a3c54c3062ca4421 100644 (file)
--- a/autoconf.in
+++ b/autoconf.in
@@ -362,6 +362,13 @@ function error (message)
 }
 
 END {
+  # Chomp.
+  request = substr (request, 1, length (request) - 1)
+  # The default request is `$f:$l:$n:$*'.
+  colon   = index (request, ":")
+  macro   = colon ? substr (request, 1, colon - 1) : request
+  request = colon ? substr (request, colon + 1)    : "$f:$l:$n:$*"
+
   res = ""
 
   for (cp = request; cp; cp = substr (cp, 2))
@@ -408,7 +415,9 @@ END {
       else
        res = res char
     }
-  print res
+
+  # Produce the definition of AT_<MACRO> = the translation of the request.
+  print "define([AT_" macro "], [[" res "]])"
   close("cat >&2")
 }
 EOF
@@ -419,17 +428,7 @@ EOF
   do
     # The request may be several lines long, hence sed has to quit.
     trace_opt="$trace_opt -t "`echo "$trace" | sed -e 's/:.*//;q'`
-    case "$trace" in
-      *:*)
-        # The `]])' are closing the `define' which is started by sed.
-        # This is to cope with multiple line requests.
-        echo "$trace]])" |
-          sed -e '1s/^\([^:]*\):\(.*\)$/define([AT_\1], [[\2/';;
-      *)
-        # Default request.
-        echo "define([AT_$trace], [[\$f:\$l:\$n:\$*]])";;
-    esac |
-      $AWK -f $translate_awk >>$trace_m4 || exit 1
+    echo "$trace" | $AWK -f $translate_awk >>$trace_m4 || exit 1
   done
   echo "divert(0)dnl" >>$trace_m4
 

diff --git a/autoconf.sh b/autoconf.sh
index bc329ff04613d1de846460ad79c155da335f4d9f..8e837e1287e9e844123be056a3c54c3062ca4421 100644 (file)
--- a/autoconf.sh
+++ b/autoconf.sh
@@ -362,6 +362,13 @@ function error (message)
 }
 
 END {
+  # Chomp.
+  request = substr (request, 1, length (request) - 1)
+  # The default request is `$f:$l:$n:$*'.
+  colon   = index (request, ":")
+  macro   = colon ? substr (request, 1, colon - 1) : request
+  request = colon ? substr (request, colon + 1)    : "$f:$l:$n:$*"
+
   res = ""
 
   for (cp = request; cp; cp = substr (cp, 2))
@@ -408,7 +415,9 @@ END {
       else
        res = res char
     }
-  print res
+
+  # Produce the definition of AT_<MACRO> = the translation of the request.
+  print "define([AT_" macro "], [[" res "]])"
   close("cat >&2")
 }
 EOF
@@ -419,17 +428,7 @@ EOF
   do
     # The request may be several lines long, hence sed has to quit.
     trace_opt="$trace_opt -t "`echo "$trace" | sed -e 's/:.*//;q'`
-    case "$trace" in
-      *:*)
-        # The `]])' are closing the `define' which is started by sed.
-        # This is to cope with multiple line requests.
-        echo "$trace]])" |
-          sed -e '1s/^\([^:]*\):\(.*\)$/define([AT_\1], [[\2/';;
-      *)
-        # Default request.
-        echo "define([AT_$trace], [[\$f:\$l:\$n:\$*]])";;
-    esac |
-      $AWK -f $translate_awk >>$trace_m4 || exit 1
+    echo "$trace" | $AWK -f $translate_awk >>$trace_m4 || exit 1
   done
   echo "divert(0)dnl" >>$trace_m4
 

diff --git a/bin/autoconf.in b/bin/autoconf.in
index bc329ff04613d1de846460ad79c155da335f4d9f..8e837e1287e9e844123be056a3c54c3062ca4421 100644 (file)
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -362,6 +362,13 @@ function error (message)
 }
 
 END {
+  # Chomp.
+  request = substr (request, 1, length (request) - 1)
+  # The default request is `$f:$l:$n:$*'.
+  colon   = index (request, ":")
+  macro   = colon ? substr (request, 1, colon - 1) : request
+  request = colon ? substr (request, colon + 1)    : "$f:$l:$n:$*"
+
   res = ""
 
   for (cp = request; cp; cp = substr (cp, 2))
@@ -408,7 +415,9 @@ END {
       else
        res = res char
     }
-  print res
+
+  # Produce the definition of AT_<MACRO> = the translation of the request.
+  print "define([AT_" macro "], [[" res "]])"
   close("cat >&2")
 }
 EOF
@@ -419,17 +428,7 @@ EOF
   do
     # The request may be several lines long, hence sed has to quit.
     trace_opt="$trace_opt -t "`echo "$trace" | sed -e 's/:.*//;q'`
-    case "$trace" in
-      *:*)
-        # The `]])' are closing the `define' which is started by sed.
-        # This is to cope with multiple line requests.
-        echo "$trace]])" |
-          sed -e '1s/^\([^:]*\):\(.*\)$/define([AT_\1], [[\2/';;
-      *)
-        # Default request.
-        echo "define([AT_$trace], [[\$f:\$l:\$n:\$*]])";;
-    esac |
-      $AWK -f $translate_awk >>$trace_m4 || exit 1
+    echo "$trace" | $AWK -f $translate_awk >>$trace_m4 || exit 1
   done
   echo "divert(0)dnl" >>$trace_m4