autoconf -W error does not work.

* acgeneral.m4 (_AC_DIAGNOSE): use _AC_WARNING_IFELSE,
_AC_WARNING_ENABLE is dead.

diff --git a/ChangeLog b/ChangeLog
index a7425097393d6c45d5d97470cdcf8a5f0c059f3c..1a2a0b62b3ff51f87902597ecff6f8afc8c22846 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-19  Akim Demaille  <akim@epita.fr>
+
+       autoconf -W error does not work.
+
+       * acgeneral.m4 (_AC_DIAGNOSE): use _AC_WARNING_IFELSE,
+       _AC_WARNING_ENABLE is dead.
+
 2000-07-19  Akim Demaille  <akim@epita.fr>
 
        Martin Wilck found a Fortran 77 compiler which always exits with

diff --git a/acgeneral.m4 b/acgeneral.m4
index 93b854ef6ac925794c1020377c682f2abd974c77..5b26dd77221fbdda6a5b436652875a62e4807308 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -2507,8 +2507,7 @@ s,@$1@,,;t t])])
 # AC_WARNING_IFELSE(CATEGORY, IF-TRUE, IF-FALSE)
 # ----------------------------------------------
 # If the CATEGORY of warnings is enabled, expand IF_TRUE otherwise
-# IF-FALSE.  CATEGORY is enabled iff `AC_WARNING_ENABLE(CATEGORY)' or
-# `AC_WARNING_ENABLE(all)' is defined.
+# IF-FALSE.
 #
 # The variable `_AC_WARNINGS' contains a comma separated list of
 # warnings which order is the converse from the one specified by
@@ -2539,9 +2538,9 @@ define([_AC_WARNING_IFELSE],
 # Report MESSAGE as a warning, unless the user requested -W error,
 # in which case report a fatal error.
 define([_AC_DIAGNOSE],
-[ifdef([AC_WARNING_ENABLE(error)],
-       [m4_fatal([$1])],
-       [m4_warn([$1])])])
+[AC_WARNING_IFELSE([error],
+                   [m4_fatal([$1])],
+                   [m4_warn([$1])])])
 
 
 # AC_DIAGNOSE(CATEGORY, MESSAGE)

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 93b854ef6ac925794c1020377c682f2abd974c77..5b26dd77221fbdda6a5b436652875a62e4807308 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2507,8 +2507,7 @@ s,@$1@,,;t t])])
 # AC_WARNING_IFELSE(CATEGORY, IF-TRUE, IF-FALSE)
 # ----------------------------------------------
 # If the CATEGORY of warnings is enabled, expand IF_TRUE otherwise
-# IF-FALSE.  CATEGORY is enabled iff `AC_WARNING_ENABLE(CATEGORY)' or
-# `AC_WARNING_ENABLE(all)' is defined.
+# IF-FALSE.
 #
 # The variable `_AC_WARNINGS' contains a comma separated list of
 # warnings which order is the converse from the one specified by
@@ -2539,9 +2538,9 @@ define([_AC_WARNING_IFELSE],
 # Report MESSAGE as a warning, unless the user requested -W error,
 # in which case report a fatal error.
 define([_AC_DIAGNOSE],
-[ifdef([AC_WARNING_ENABLE(error)],
-       [m4_fatal([$1])],
-       [m4_warn([$1])])])
+[AC_WARNING_IFELSE([error],
+                   [m4_fatal([$1])],
+                   [m4_warn([$1])])])
 
 
 # AC_DIAGNOSE(CATEGORY, MESSAGE)