2006-04-06  Stepan Kasal  <address@hidden>

	* lib/autoconf/general.m4 (AC_ARG_VAR): Do not use m4_divert_once
	  inside m4_expand_once; it is redundant.

Index: lib/autoconf/general.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/general.m4,v
retrieving revision 1.891
diff -u -r1.891 general.m4
--- lib/autoconf/general.m4	16 Mar 2006 13:33:18 -0000	1.891
+++ lib/autoconf/general.m4	20 Mar 2006 20:50:39 -0000
@@ -1405,7 +1405,7 @@
 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