* 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.

diff --git a/ChangeLog b/ChangeLog
index 73d6b67c2e66269035b7b832c356a741ee534e51..bd661470006350c58eb752be9a705fa74c324c52 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-04-06  Stepan Kasal  <kasal@ucw.cz>
 
+       * 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.
+
        * lib/autoconf/general.m4 (AC_ARG_VAR): Do not use m4_divert_once
          inside m4_expand_once; it is redundant.
 

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index a26afddf572554758fe6f33617377ba3bed4fa26..b44dd92593a0738f3e6a088bb534872de3feb722 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1344,8 +1344,7 @@ AC_LANG_PUSH(C)
 # 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 @@ m4_define([_AC_ENABLE_IF_ACTION],
 # 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 @@ AU_DEFUN([AC_ENABLE],
 # 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]

diff --git a/man/autoreconf.1 b/man/autoreconf.1
index 7ea40652ba81dd59356a237f671de82fd2dcbb61..53af7d40b7510e367f4b2280d2aeb1e31f440674 100644 (file)
--- a/man/autoreconf.1
+++ b/man/autoreconf.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH AUTORECONF "1" "January 2006" "autoreconf 2.59c" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
+.TH AUTORECONF "1" "April 2006" "autoreconf 2.59c" "User Commands"
 .SH NAME
 autoreconf \- Update generated configuration files
 .SH SYNOPSIS

diff --git a/man/autoscan.1 b/man/autoscan.1
index 52f28097f45e668e50574221416d17cf52453e33..5b626e4a05cda2d7696b1e601c6215aa1611cb5c 100644 (file)
--- a/man/autoscan.1
+++ b/man/autoscan.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH AUTOSCAN "1" "January 2006" "autoscan 2.59c" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
+.TH AUTOSCAN "1" "April 2006" "autoscan 2.59c" "User Commands"
 .SH NAME
 autoscan \- Generate a preliminary configure.in
 .SH SYNOPSIS

diff --git a/man/autoupdate.1 b/man/autoupdate.1
index 545628df4ec2cbcbd768c785c18609fd0ce7fcd3..613d6739c59fa00c4f91884581c04d5a95413491 100644 (file)
--- a/man/autoupdate.1
+++ b/man/autoupdate.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH AUTOUPDATE "1" "January 2006" "autoupdate 2.59c" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
+.TH AUTOUPDATE "1" "April 2006" "autoupdate 2.59c" "User Commands"
 .SH NAME
 autoupdate \- Update a configure.in to a newer Autoconf
 .SH SYNOPSIS