Re: [Xen-devel] [PATCH] autoconf: change AX_ARG_{DISABLE/ENABLE}_AND_EXPORT to make more sense

[Roger Pau Monnà <roger.pau@xxxxxxxxxxxxx>]

2012/3/15 Ian Campbell <Ian.Campbell@xxxxxxxxxx>:
> On Thu, 2012-02-23 at 05:46 +0000, Roger Pau Monne wrote:
>> # HG changeset patch
>> # User Roger Pau Monne <roger.pau@xxxxxxxxxxxxx>
>> # Date 1329975951 -3600
>> # Node ID 18fea25a3f0c56cd06fb823c7d4cbc4f05397e42
>> # Parent Â64f5cd4aa2a273d4b84c382b8ef484eab7905631
>> autoconf: change AX_ARG_{DISABLE/ENABLE}_AND_EXPORT to make more sense
>>
>> Change disable/enable feature macros to have a more significative name
>> of what they actually do, to avoid confusions.
>>
>> New macros have the following names:
>>
>> AX_ARG_DEFAULT_ENABLE: feature is enabled by default, provides the
>> --disable-{feature} option to disable it.
>>
>> AX_ARG_DEFAULT_DISABLE: feature is disabled by default, provides the
>> --enable-{feature] option to enable it.
>>
>> Signed-off-by: Roger Pau Monne <roger.pau@xxxxxxxxxxxxx>
>
> Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
>
>>
>> diff -r 64f5cd4aa2a2 -r 18fea25a3f0c tools/configure
>> --- a/tools/configure Tue Mar 13 17:30:50 2012 +0000
>> +++ b/tools/configure Thu Feb 23 06:45:51 2012 +0100
>> @@ -1371,7 +1371,7 @@ Optional Features:
>>  Â--disable-ocamltools  ÂDisable Ocaml tools
>>  Â--enable-miniterm    Enable miniterm
>>  Â--enable-lomount    ÂEnable lomount
>> - Â--disable-debug     Disable debug build of tools
>> + Â--disable-debug     Disable debug build of Xen and tools
>>
>> ÂSome influential environment variables:
>> Â ÂCC Â Â Â Â ÂC compiler command
>> @@ -3805,6 +3805,9 @@ case $host_os in *\ *) host_os=`echo "$h
>>
>>
>>
>> +# This function should not be called outside of this file
>>+
>>+
>
> I think you need "dnl This function..." in the m4 source instead of "#
> This function..." to avoid this spurious comment in the output.

Done.

>
>> [...]
>
>> diff -r 64f5cd4aa2a2 -r 18fea25a3f0c tools/configure.ac
>> --- a/tools/configure.ac   ÂTue Mar 13 17:30:50 2012 +0000
>> +++ b/tools/configure.ac   ÂThu Feb 23 06:45:51 2012 +0100
>> @@ -23,8 +23,7 @@ AC_USE_SYSTEM_EXTENSIONS
>> ÂAC_CANONICAL_HOST
>>
>> Â# M4 Macro includes
>> -m4_include([m4/enable_feature.m4])
>> -m4_include([m4/disable_feature.m4])
>> +m4_include([m4/features.m4])
>> Âm4_include([m4/path_or_fail.m4])
>> Âm4_include([m4/python_version.m4])
>> Âm4_include([m4/python_devel.m4])
>> @@ -36,16 +35,15 @@ m4_include([m4/pkg.m4])
>> Âm4_include([m4/curses.m4])
>>
>> Â# Enable/disable options
>> -AX_ARG_ENABLE_AND_EXPORT([githttp], [Download GIT repositories via HTTP])
>> -AX_ARG_DISABLE_AND_EXPORT([monitors],
>> - Â Â[Disable xenstat and xentop monitoring tools])
>> -AX_ARG_ENABLE_AND_EXPORT([vtpm], [Enable Virtual Trusted Platform Module])
>> -AX_ARG_ENABLE_AND_EXPORT([xapi], [Enable Xen API Bindings])
>> -AX_ARG_DISABLE_AND_EXPORT([pythontools], [Disable Python tools])
>> -AX_ARG_DISABLE_AND_EXPORT([ocamltools], [Disable Ocaml tools])
>> -AX_ARG_ENABLE_AND_EXPORT([miniterm], [Enable miniterm])
>> -AX_ARG_ENABLE_AND_EXPORT([lomount], [Enable lomount])
>> -AX_ARG_DISABLE_AND_EXPORT([debug], [Disable debug build of tools])
>> +AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP])
>> +AX_ARG_DEFAULT_ENABLE([monitors], [Disable xenstat and xentop monitoring 
>> tools])
>> +AX_ARG_DEFAULT_DISABLE([vtpm], [Enable Virtual Trusted Platform Module])
>> +AX_ARG_DEFAULT_DISABLE([xapi], [Enable Xen API Bindings])
>
> Perhaps call this one "xenapi" or "xenapi-bindings" or something so it
> is not confused with "xapi" the toolstack (which implements a much newer
> and incompatible Xen API)

I've renamed it to xenapi, because I think xenapi-bindings is too
long, but if you think it is still misleading we can change it.

>> +AX_ARG_DEFAULT_ENABLE([pythontools], [Disable Python tools])
>> +AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools])
>> +AX_ARG_DEFAULT_DISABLE([miniterm], [Enable miniterm])
>> +AX_ARG_DEFAULT_DISABLE([lomount], [Enable lomount])
>> +AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of Xen and tools])
>>
>> ÂAC_ARG_VAR([PREPEND_INCLUDES],
>> Â Â Â[List of include folders to prepend to CFLAGS (without -I)])
>
> Ian.
>
>

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel