* lib/autoconf/general.m4 (AC_ARG_VAR): Do not use m4_divert_once

  inside m4_expand_once; it is redundant.

diff --git a/ChangeLog b/ChangeLog
index 6be7b1c161d47dfdda5646d8cc3cab4ffeb15943..73d6b67c2e66269035b7b832c356a741ee534e51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-04-06  Stepan Kasal  <kasal@ucw.cz>
 
+       * lib/autoconf/general.m4 (AC_ARG_VAR): Do not use m4_divert_once
+         inside m4_expand_once; it is redundant.
+
        * lib/autoconf/general.m4 (_AC_INIT_HELP): Remove the broken support
          for --help from Cygnus `configure.'
 

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 0c6956e1ddc82faf2fa38d9cc33156da4b560d29..a26afddf572554758fe6f33617377ba3bed4fa26 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1417,7 +1417,7 @@ Some influential environment variables:]])dnl
 m4_divert_once([HELP_VAR_END], [[
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.]])dnl
-m4_expand_once([m4_divert_once([HELP_VAR],
+m4_expand_once([m4_divert_text([HELP_VAR],
                               [AS_HELP_STRING([$1], [$2], [              ])])],
               [$0($1)])dnl
 AC_SUBST([$1])dnl