* 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.
This commit is contained in:
Stepan Kasal 2006-04-06 13:49:08 +00:00
parent 19de93e293
commit b2d1fdf998
5 changed files with 15 additions and 10 deletions

View File

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

View File

@ -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]

View File

@ -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

View File

@ -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

View File

@ -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