[PATCH util-macros] XORG_ENABLE_DOCS: Fix "Enable building the documentation (yes: yes)"

Dan Nicholson dbn.lists at gmail.com
Sun Nov 7 07:12:04 PST 2010


On Sat, Nov 6, 2010 at 5:55 PM, Gaetan Nadon <memsize at videotron.ca> wrote:
> The quoting did not prevent the m4 defined variable "default"
> to replace the text string "default" in the help text.
>
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
>  xorg-macros.m4.in |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
> index c7dbd41..fe29881 100644
> --- a/xorg-macros.m4.in
> +++ b/xorg-macros.m4.in
> @@ -811,12 +811,12 @@ AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes])
>  # parm1:       specify the default value, yes or no.
>  #
>  AC_DEFUN([XORG_ENABLE_DOCS],[
> -m4_define([default], m4_default([$1], [yes]))
> +m4_define([docs_default], m4_default([$1], [yes]))
>  AC_ARG_ENABLE(docs,
>        AS_HELP_STRING([--enable-docs],
> -          [Enable building the documentation (default: ]default[)]),
> -          [build_docs=$enableval], [build_docs=]default)
> -m4_undefine([default])
> +          [Enable building the documentation (default: ]docs_default[)]),
> +          [build_docs=$enableval], [build_docs=]docs_default)
> +m4_undefine([docs_default])
>  AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes])
>  AC_MSG_CHECKING([whether to build documentation])
>  AC_MSG_RESULT([$build_docs])

Huh, I wouldn't have suspected that. Usually you have to unquote the
m4 to use macros. Can't hurt I guess.

Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>


More information about the xorg-devel mailing list