* m4sugar.m4 (m4_errprint, divnum, errprint, esyscmd): Rename as...

(m4_errprintn, m4_divnum, m4errprint, m4_esyscmd): this.
* autoconf.m4: Restore them.

diff --git a/ChangeLog b/ChangeLog
index 433c96d7ea22ad8c69b7880ecff99c7275f1a319..3a6aa0a369ec53eb88e6eb86f35801bb42d19ae5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-29  Akim Demaille  <akim@epita.fr>
+
+       * m4sugar.m4 (m4_errprint, divnum, errprint, esyscmd): Rename as...
+       (m4_errprintn, m4_divnum, m4errprint, m4_esyscmd): this.
+       * autoconf.m4: Restore them.
+
 2000-11-28  Pavel Roskin  <proski@gnu.org>
 
        * doc/autoconf.texi (Fortran 77 Compiler Characteristics):

diff --git a/autoconf.m4 b/autoconf.m4
index 23bf8212e064472d490ce579790e61f9a515287b..820a009b3416920f4f2cb91e527a9e4e30f82c6f 100644 (file)
--- a/autoconf.m4
+++ b/autoconf.m4
@@ -43,6 +43,9 @@ m4_copy_unm4([m4_decr])
 m4_copy_unm4([m4_define])
 m4_copy_unm4([m4_defn])
 m4_copy_unm4([m4_divert])
+m4_copy_unm4([m4_divnum])
+m4_copy_unm4([m4_errprint])
+m4_copy_unm4([m4_esyscmd])
 m4_copy_unm4([m4_incr])
 m4_copy_unm4([m4_index])
 m4_copy_unm4([m4_indir])

diff --git a/lib/autoconf/autoconf.m4 b/lib/autoconf/autoconf.m4
index 23bf8212e064472d490ce579790e61f9a515287b..820a009b3416920f4f2cb91e527a9e4e30f82c6f 100644 (file)
--- a/lib/autoconf/autoconf.m4
+++ b/lib/autoconf/autoconf.m4
@@ -43,6 +43,9 @@ m4_copy_unm4([m4_decr])
 m4_copy_unm4([m4_define])
 m4_copy_unm4([m4_defn])
 m4_copy_unm4([m4_divert])
+m4_copy_unm4([m4_divnum])
+m4_copy_unm4([m4_errprint])
+m4_copy_unm4([m4_esyscmd])
 m4_copy_unm4([m4_incr])
 m4_copy_unm4([m4_index])
 m4_copy_unm4([m4_indir])

diff --git a/lib/m4sugar/m4sugar.m4 b/lib/m4sugar/m4sugar.m4
index cccb5c99d23ebc7a356c2f5a5c41e3e488d27c62..81fcc53b2c608c9b311fe77c0387e3ce316712c1 100644 (file)
--- a/lib/m4sugar/m4sugar.m4
+++ b/lib/m4sugar/m4sugar.m4
@@ -115,7 +115,10 @@ m4_rename_m4([debugfile])
 m4_rename_m4([debugmode])
 m4_rename_m4([decr])
 m4_undefine([divert])
+m4_rename_m4([divnum])
 m4_rename_m4([dumpdef])
+m4_rename_m4([errprint])
+m4_rename_m4([esyscmd])
 m4_rename_m4([eval])
 m4_rename_m4([format])
 m4_rename_m4([incr])
@@ -150,10 +153,10 @@ m4_undefine([undivert])
 m4_define([m4_location], [__file__:__line__])
 
 
-# m4_errprint(MSG)
-# ----------------
+# m4_errprintn(MSG)
+# -----------------
 # Same as `errprint', but with the missing end of line.
-m4_define([m4_errprint], [errprint([$1
+m4_define([m4_errprintn], [m4_errprint([$1
 ])])
 
 
@@ -161,14 +164,14 @@ m4_define([m4_errprint], [errprint([$1
 # ---------------
 # Warn the user.
 m4_define([m4_warning],
-[m4_errprint(m4_location[: warning: $1])])
+[m4_errprintn(m4_location[: warning: $1])])
 
 
 # m4_fatal(MSG, [EXIT-STATUS])
 # ----------------------------
 # Fatal the user.                                                      :)
 m4_define([m4_fatal],
-[m4_errprint(m4_location[: error: $1])dnl
+[m4_errprintn(m4_location[: error: $1])dnl
 m4_expansion_stack_dump()dnl
 m4_exit(ifelse([$2],, 1, [$2]))])
 
@@ -1044,10 +1047,10 @@ m4_define([_m4_divert(GROW)],       10000)
 # Dump the expansion stack.
 m4_define([m4_expansion_stack_dump],
 [ifdef([_m4_expansion_stack],
-       [m4_errprint(m4_defn([_m4_expansion_stack]))dnl
+       [m4_errprintn(m4_defn([_m4_expansion_stack]))dnl
 m4_popdef([_m4_expansion_stack])dnl
 m4_expansion_stack_dump()],
-       [m4_errprint(m4_location[: the top level])])])
+       [m4_errprintn(m4_location[: the top level])])])
 
 
 # _m4_defun_pro(MACRO-NAME)

diff --git a/m4sugar.m4 b/m4sugar.m4
index cccb5c99d23ebc7a356c2f5a5c41e3e488d27c62..81fcc53b2c608c9b311fe77c0387e3ce316712c1 100644 (file)
--- a/m4sugar.m4
+++ b/m4sugar.m4
@@ -115,7 +115,10 @@ m4_rename_m4([debugfile])
 m4_rename_m4([debugmode])
 m4_rename_m4([decr])
 m4_undefine([divert])
+m4_rename_m4([divnum])
 m4_rename_m4([dumpdef])
+m4_rename_m4([errprint])
+m4_rename_m4([esyscmd])
 m4_rename_m4([eval])
 m4_rename_m4([format])
 m4_rename_m4([incr])
@@ -150,10 +153,10 @@ m4_undefine([undivert])
 m4_define([m4_location], [__file__:__line__])
 
 
-# m4_errprint(MSG)
-# ----------------
+# m4_errprintn(MSG)
+# -----------------
 # Same as `errprint', but with the missing end of line.
-m4_define([m4_errprint], [errprint([$1
+m4_define([m4_errprintn], [m4_errprint([$1
 ])])
 
 
@@ -161,14 +164,14 @@ m4_define([m4_errprint], [errprint([$1
 # ---------------
 # Warn the user.
 m4_define([m4_warning],
-[m4_errprint(m4_location[: warning: $1])])
+[m4_errprintn(m4_location[: warning: $1])])
 
 
 # m4_fatal(MSG, [EXIT-STATUS])
 # ----------------------------
 # Fatal the user.                                                      :)
 m4_define([m4_fatal],
-[m4_errprint(m4_location[: error: $1])dnl
+[m4_errprintn(m4_location[: error: $1])dnl
 m4_expansion_stack_dump()dnl
 m4_exit(ifelse([$2],, 1, [$2]))])
 
@@ -1044,10 +1047,10 @@ m4_define([_m4_divert(GROW)],       10000)
 # Dump the expansion stack.
 m4_define([m4_expansion_stack_dump],
 [ifdef([_m4_expansion_stack],
-       [m4_errprint(m4_defn([_m4_expansion_stack]))dnl
+       [m4_errprintn(m4_defn([_m4_expansion_stack]))dnl
 m4_popdef([_m4_expansion_stack])dnl
 m4_expansion_stack_dump()],
-       [m4_errprint(m4_location[: the top level])])])
+       [m4_errprintn(m4_location[: the top level])])])
 
 
 # _m4_defun_pro(MACRO-NAME)