* m4sugar.m4 (m4_fatal): Dump the expansion stack.

* acgeneral.m4 (AC_FATAL): Use m4_fatal.

diff --git a/ChangeLog b/ChangeLog
index 620a07054da327944b270999290ed1011201e8ca..5a9ff7b990abe83498877e05c14a2682740780e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-01  Akim Demaille  <akim@epita.fr>
+
+       * m4sugar.m4 (m4_fatal): Dump the expansion stack.
+       * acgeneral.m4 (AC_FATAL): Use m4_fatal.
+
 2000-11-01  Akim Demaille  <akim@epita.fr>
 
        Move the `defun' handling into M4sugar.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 2f2fd838cd617fd44bd2acbd995307901d4cde18..b4cc3e9804e1ae80c6026286cdf69a2b0288a9de 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -2208,9 +2208,7 @@ define([AC_WARNING],
 # AC_FATAL(MESSAGE, [EXIT-STATUS])
 # --------------------------------
 define([AC_FATAL],
-[m4_errprint(m4_location[: $1])
-_m4_expansion_stack_dump()
-m4exit(m4_default([$2], [1]))])
+[m4_fatal($@)])
 
 
 

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 2f2fd838cd617fd44bd2acbd995307901d4cde18..b4cc3e9804e1ae80c6026286cdf69a2b0288a9de 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2208,9 +2208,7 @@ define([AC_WARNING],
 # AC_FATAL(MESSAGE, [EXIT-STATUS])
 # --------------------------------
 define([AC_FATAL],
-[m4_errprint(m4_location[: $1])
-_m4_expansion_stack_dump()
-m4exit(m4_default([$2], [1]))])
+[m4_fatal($@)])
 
 
 

diff --git a/lib/m4sugar/m4sugar.m4 b/lib/m4sugar/m4sugar.m4
index ccae0a743a705a073dff249ada82751b559ed611..53d8614cc67618fe97e28c843a90405ba9eb13de 100644 (file)
--- a/lib/m4sugar/m4sugar.m4
+++ b/lib/m4sugar/m4sugar.m4
@@ -110,6 +110,7 @@ define([m4_warning],
 # Fatal the user.                                                      :)
 define([m4_fatal],
 [m4_errprint(m4_location[: error: $1])dnl
+m4_expansion_stack_dump()dnl
 m4exit(ifelse([$2],, 1, [$2]))])
 
 

diff --git a/m4sugar.m4 b/m4sugar.m4
index ccae0a743a705a073dff249ada82751b559ed611..53d8614cc67618fe97e28c843a90405ba9eb13de 100644 (file)
--- a/m4sugar.m4
+++ b/m4sugar.m4
@@ -110,6 +110,7 @@ define([m4_warning],
 # Fatal the user.                                                      :)
 define([m4_fatal],
 [m4_errprint(m4_location[: error: $1])dnl
+m4_expansion_stack_dump()dnl
 m4exit(ifelse([$2],, 1, [$2]))])