* acgeneral.m4 (_AC_WARNING_ERROR_IFELSE)

(__AC_WARNING_ERROR_IFELSE): New macros for checking whether
warnings should be considered errors.
(_AC_DIAGNOSE): Use _AC_WARNING_ERROR_IFELSE.

diff --git a/ChangeLog b/ChangeLog
index 448d3b2d3bdcf3f7c80c54b0c2c0254807213c66..bb229a09bc69b020a55ec9c228e059f3db2a934a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-11  Pavel Roskin  <proski@gnu.org>
+
+       * acgeneral.m4 (_AC_WARNING_ERROR_IFELSE)
+       (__AC_WARNING_ERROR_IFELSE): New macros for checking whether
+       warnings should be considered errors.
+       (_AC_DIAGNOSE): Use _AC_WARNING_ERROR_IFELSE.
+
 2000-09-11  Pavel Roskin  <proski@gnu.org>
 
        * autoconf.sh: Proprerly report names of unexpanded macros that

diff --git a/acgeneral.m4 b/acgeneral.m4
index b703d65ee78d352aee342720a90b51250aff81d3..c9d62213783eb020b355ab6f5ab14636ac7ea430 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -2612,14 +2612,31 @@ define([_AC_WARNING_IFELSE],
         [$0([$1], [$2], [$3], m4_shiftn(4, $@))])])
 
 
+# _AC_WARNING_ERROR_IFELSE(IF-TRUE, IF-FALSE)
+# -------------------------------------------
+# The same as AC_WARNING_IFELSE, but scan for `error' only.
+define([_AC_WARNING_ERROR_IFELSE],
+[__AC_WARNING_ERROR_IFELSE([$1], [$2], _AC_WARNINGS)])
+
+
+# __AC_WARNING_ERROR_IFELSE(IF-TRUE, IF-FALSE)
+# --------------------------------------------
+# The same as _AC_WARNING_IFELSE, but scan for `error' only.
+define([__AC_WARNING_ERROR_IFELSE],
+[ifelse([$3],  [error],    [$1],
+        [$3],  [],         [$2],
+        [$3],  [no-error], [$2],
+        [$0([$1], [$2], m4_shiftn(3, $@))])])
+
+
+
 # _AC_DIAGNOSE(MESSAGE)
 # ---------------------
 # Report MESSAGE as a warning, unless the user requested -W error,
 # in which case report a fatal error.
 define([_AC_DIAGNOSE],
-[AC_WARNING_IFELSE([error],
-                   [m4_fatal([$1])],
-                   [m4_warn([$1])])])
+[_AC_WARNING_ERROR_IFELSE([m4_fatal([$1])],
+                          [m4_warn([$1])])])
 
 
 # AC_DIAGNOSE(CATEGORY, MESSAGE)

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index b703d65ee78d352aee342720a90b51250aff81d3..c9d62213783eb020b355ab6f5ab14636ac7ea430 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2612,14 +2612,31 @@ define([_AC_WARNING_IFELSE],
         [$0([$1], [$2], [$3], m4_shiftn(4, $@))])])
 
 
+# _AC_WARNING_ERROR_IFELSE(IF-TRUE, IF-FALSE)
+# -------------------------------------------
+# The same as AC_WARNING_IFELSE, but scan for `error' only.
+define([_AC_WARNING_ERROR_IFELSE],
+[__AC_WARNING_ERROR_IFELSE([$1], [$2], _AC_WARNINGS)])
+
+
+# __AC_WARNING_ERROR_IFELSE(IF-TRUE, IF-FALSE)
+# --------------------------------------------
+# The same as _AC_WARNING_IFELSE, but scan for `error' only.
+define([__AC_WARNING_ERROR_IFELSE],
+[ifelse([$3],  [error],    [$1],
+        [$3],  [],         [$2],
+        [$3],  [no-error], [$2],
+        [$0([$1], [$2], m4_shiftn(3, $@))])])
+
+
+
 # _AC_DIAGNOSE(MESSAGE)
 # ---------------------
 # Report MESSAGE as a warning, unless the user requested -W error,
 # in which case report a fatal error.
 define([_AC_DIAGNOSE],
-[AC_WARNING_IFELSE([error],
-                   [m4_fatal([$1])],
-                   [m4_warn([$1])])])
+[_AC_WARNING_ERROR_IFELSE([m4_fatal([$1])],
+                          [m4_warn([$1])])])
 
 
 # AC_DIAGNOSE(CATEGORY, MESSAGE)