* acgeneral.m4 (AC_OUTPUT): In the AU_DEFUN definition, don't try

to issue an obsolete message, it can't work for macros being
defined both with AC_DEFUN and AU_DEFUN.
Hence do it in the AC_DEFUN definition.

diff --git a/BUGS b/BUGS
index 4a6a8a31dc01bb009f7f0ab9f634757de4550bad..9f531d92af9ba0abec839306360dbacce7d7795b 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -15,14 +15,6 @@ address them.
 
 * Status
 
-       /*-------------.
-       | Do not use.  |
-       `-------------*/
-
-* Serious Problems
-
-** Special characters and config.hin
-
-The handling of special characters, most notable backslashes, of
-course, might be nonportable in addition of being of clearly
-specified.
+       /*--------------------------.
+       | Good for production use.  |
+       `--------------------------*/

diff --git a/ChangeLog b/ChangeLog
index dd98c8e4d2a9b6a9a492e01ac8774e1177560f93..fb66f5a1c6ceebcdcfc99e0fe5e35a28151b8f53 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-08  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4 (AC_OUTPUT): In the AU_DEFUN definition, don't try
+       to issue an obsolete message, it can't work for macros being
+       defined both with AC_DEFUN and AU_DEFUN.
+       Hence do it in the AC_DEFUN definition.
+
 2001-03-06  Pavel Roskin  <proski@gnu.org>
 
        * tests/base.at (AC_TRY_*): Escape `^' - it's a pipe command

diff --git a/acgeneral.m4 b/acgeneral.m4
index f950addc22e644ec365ec2ecbca4bd345efb04e1..b8764a3f7e1f1812d4141e7ef0158135cfd8d7a8 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -3520,8 +3520,7 @@ AU_DEFUN([AC_OUTPUT],
            [AC_CONFIG_FILES([$1])])dnl
 m4_ifvaln([$2$3],
           [AC_CONFIG_COMMANDS(default, [[$2]], [[$3]])])dnl
-[AC_OUTPUT]],
-[`AC_OUTPUT' should be used without arguments.])
+[AC_OUTPUT]])
 
 
 # AC_OUTPUT([CONFIG_FILES...], [EXTRA-CMDS], [INIT-CMDS])
@@ -3537,6 +3536,10 @@ m4_ifval([$1],
          [AC_CONFIG_FILES([$1])])dnl
 m4_ifval([$2$3],
          [AC_CONFIG_COMMANDS(default, [$2], [$3])])dnl
+m4_ifval([$1$2$3],
+         [AC_DIAGNOSE([obsolete],
+                      [$0 should be used witout arguments.
+You should run autoupdate.])])dnl
 AC_CACHE_SAVE
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index f950addc22e644ec365ec2ecbca4bd345efb04e1..b8764a3f7e1f1812d4141e7ef0158135cfd8d7a8 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -3520,8 +3520,7 @@ AU_DEFUN([AC_OUTPUT],
            [AC_CONFIG_FILES([$1])])dnl
 m4_ifvaln([$2$3],
           [AC_CONFIG_COMMANDS(default, [[$2]], [[$3]])])dnl
-[AC_OUTPUT]],
-[`AC_OUTPUT' should be used without arguments.])
+[AC_OUTPUT]])
 
 
 # AC_OUTPUT([CONFIG_FILES...], [EXTRA-CMDS], [INIT-CMDS])
@@ -3537,6 +3536,10 @@ m4_ifval([$1],
          [AC_CONFIG_FILES([$1])])dnl
 m4_ifval([$2$3],
          [AC_CONFIG_COMMANDS(default, [$2], [$3])])dnl
+m4_ifval([$1$2$3],
+         [AC_DIAGNOSE([obsolete],
+                      [$0 should be used witout arguments.
+You should run autoupdate.])])dnl
 AC_CACHE_SAVE
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix