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

	* lib/autoconf/general.m4 (AC_PRESERVE_HELP_ORDER): Do not define
	  _AC_PRESERVE_HELP_ORDER, ...
	(AC_ARG_ENABLE, AC_ARG_WITH): ... use AC_PROVIDE_IFELSE insetad.

Index: lib/autoconf/general.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/general.m4,v
retrieving revision 1.898
diff -u -r1.898 general.m4
--- lib/autoconf/general.m4	6 Apr 2006 12:16:38 -0000	1.898
+++ lib/autoconf/general.m4	6 Apr 2006 13:12:55 -0000
@@ -1344,8 +1344,7 @@
 # Emit help strings in the order given, rather than grouping all --enable-FOO
 # and all --with-BAR.
 AC_DEFUN([AC_PRESERVE_HELP_ORDER],
-[m4_define([_AC_PRESERVE_HELP_ORDER], 1)
-m4_divert_once([HELP_ENABLE], [[
+[m4_divert_once([HELP_ENABLE], [[
 Optional Features and Packages:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
@@ -1371,7 +1370,8 @@
 # AC_ARG_ENABLE(FEATURE, HELP-STRING, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
 # ------------------------------------------------------------------------
 AC_DEFUN([AC_ARG_ENABLE],
-[m4_ifndef([_AC_PRESERVE_HELP_ORDER],
+[AC_PROVIDE_IFELSE([AC_PRESERVE_HELP_ORDER],
+[],
 [m4_divert_once([HELP_ENABLE], [[
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
@@ -1388,7 +1388,8 @@
 # AC_ARG_WITH(PACKAGE, HELP-STRING, ACTION-IF-TRUE, [ACTION-IF-FALSE])
 # --------------------------------------------------------------------
 AC_DEFUN([AC_ARG_WITH],
-[m4_ifndef([_AC_PRESERVE_HELP_ORDER],
+[AC_PROVIDE_IFELSE([AC_PRESERVE_HELP_ORDER],
+[],
 [m4_divert_once([HELP_WITH], [[
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]