* lib/m4sugar/m4sh.m4 (_AS_ECHO_N_PREPARE): m4_defun, not

m4_define, since...
(_AS_ECHO_N): AS_REQUIREs it.

diff --git a/ChangeLog b/ChangeLog
index 3d47ca5f4394ea890e3feed0845bc42eb758e7c1..693d311e820abdb181ca0543484bd2c285519636 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-10  Akim Demaille  <akim@epita.fr>
+
+       * lib/m4sugar/m4sh.m4 (_AS_ECHO_N_PREPARE): m4_defun, not
+       m4_define, since...
+       (_AS_ECHO_N): AS_REQUIREs it.
+
+       
 2001-10-10  Akim Demaille  <akim@epita.fr>
 
        * lib/autoconf/general.m4 (_AC_INCLUDES_DEFAULT_REQUIREMENTS)

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 1c0ed9e1f35bce84c2932f21eec53b066b6b20c2..8cf3c9baee5e7ef0e0e7ff9d632912767a35c062 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -328,7 +328,7 @@ m4_define([_AS_ECHO],
 # has little interest.
 # Idea borrowed from dist 3.0.  Use `*c*,', not `*c,' because if `\c'
 # failed there is also a new-line to match.
-m4_define([_AS_ECHO_N_PREPARE],
+m4_defun([_AS_ECHO_N_PREPARE],
 [case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
   *c*,-n*) ECHO_N= ECHO_C='
 ' ECHO_T='     ' ;;
@@ -342,7 +342,8 @@ esac
 # ----------------------------------------
 # Same as _AS_ECHO, but echo doesn't return to a new line.
 m4_define([_AS_ECHO_N],
-[echo $ECHO_N "_AS_QUOTE([$1])$ECHO_C" >&m4_default([$2],
+[AS_REQUIRE([_AS_ECHO_N_PREPARE])dnl
+echo $ECHO_N "_AS_QUOTE([$1])$ECHO_C" >&m4_default([$2],
                                                     [AS_MESSAGE_FD])])
 
 
@@ -812,7 +813,7 @@ m4_defun([AS_TR_SH],
 [AS_REQUIRE([_$0_PREPARE])dnl
 AS_LITERAL_IF([$1],
               [m4_bpatsubst(m4_translit([[$1]], [*+], [pp]),
-                           [[^a-zA-Z0-9_]], [_])],
+                            [[^a-zA-Z0-9_]], [_])],
               [`echo "$1" | $as_tr_sh`])])
 
 
@@ -834,8 +835,8 @@ m4_defun([AS_TR_CPP],
 [AS_REQUIRE([_$0_PREPARE])dnl
 AS_LITERAL_IF([$1],
               [m4_bpatsubst(m4_translit([[$1]],
-                                       [*abcdefghijklmnopqrstuvwxyz],
-                                       [PABCDEFGHIJKLMNOPQRSTUVWXYZ]),
+                                        [*abcdefghijklmnopqrstuvwxyz],
+                                        [PABCDEFGHIJKLMNOPQRSTUVWXYZ]),
                            [[^A-Z0-9_]], [_])],
               [`echo "$1" | $as_tr_cpp`])])