Roger Pau Monne
2012-Feb-23 07:32 UTC
[PATCH v2] autoconf: change AX_ARG_{DISABLE/ENABLE}_AND_EXPORT to make more sense
# HG changeset patch
# User Roger Pau Monne <roger.pau@entel.upc.edu>
# Date 1329981765 -3600
# Node ID 50317ae2a56d66e39079b8758ee2755fac268748
# 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.
Changes since v1:
* Change comment to "dnl"
* Change xapi to xenapi
* Add help string regarding default value of enable/disable options
Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
diff -r 64f5cd4aa2a2 -r 50317ae2a56d config/Tools.mk.in
--- a/config/Tools.mk.in Tue Mar 13 17:30:50 2012 +0000
+++ b/config/Tools.mk.in Thu Feb 23 08:22:45 2012 +0100
@@ -32,7 +32,7 @@ GIT_HTTP := @githttp@
# Optional components
XENSTAT_XENTOP := @monitors@
VTPM_TOOLS := @vtpm@
-LIBXENAPI_BINDINGS := @xapi@
+LIBXENAPI_BINDINGS := @xenapi@
PYTHON_TOOLS := @pythontools@
OCAML_TOOLS := @ocamltools@
CONFIG_MINITERM := @miniterm@
diff -r 64f5cd4aa2a2 -r 50317ae2a56d tools/configure
--- a/tools/configure Tue Mar 13 17:30:50 2012 +0000
+++ b/tools/configure Thu Feb 23 08:22:45 2012 +0100
@@ -649,7 +649,7 @@ lomount
miniterm
ocamltools
pythontools
-xapi
+xenapi
vtpm
monitors
githttp
@@ -715,7 +715,7 @@ enable_option_checking
enable_githttp
enable_monitors
enable_vtpm
-enable_xapi
+enable_xenapi
enable_pythontools
enable_ocamltools
enable_miniterm
@@ -1363,15 +1363,18 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-githttp Download GIT repositories via HTTP
- --disable-monitors Disable xenstat and xentop monitoring tools
- --enable-vtpm Enable Virtual Trusted Platform Module
- --enable-xapi Enable Xen API Bindings
- --disable-pythontools Disable Python tools
- --disable-ocamltools Disable Ocaml tools
- --enable-miniterm Enable miniterm
- --enable-lomount Enable lomount
- --disable-debug Disable debug build of tools
+ --enable-githttp Download GIT repositories via HTTP (default is
+ DISABLED)
+ --disable-monitors Disable xenstat and xentop monitoring tools (default
+ is ENABLED)
+ --enable-vtpm Enable Virtual Trusted Platform Module (default is
+ DISABLED)
+ --enable-xenapi Enable Xen API Bindings (default is DISABLED)
+ --disable-pythontools Disable Python tools (default is ENABLED)
+ --disable-ocamltools Disable Ocaml tools (default is ENABLED)
+ --enable-miniterm Enable miniterm (default is DISABLED)
+ --enable-lomount Enable lomount (default is DISABLED)
+ --disable-debug Disable debug build of tools (default is ENABLED)
Some influential environment variables:
CC C compiler command
@@ -3843,6 +3846,8 @@ case $host_os in *\ *) host_os=`echo "$h
+
+
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 1 (pkg-config-0.24)
#
@@ -3908,27 +3913,30 @@ case $host_os in *\ *) host_os=`echo "$h
# Enable/disable options
+
# Check whether --enable-githttp was given.
if test "${enable_githttp+set}" = set; then :
enableval=$enable_githttp;
fi
-if test "x$enable_githttp" = "xyes"; then :
+if test "x$enable_githttp" = "xno"; then :
+
+ ax_cv_githttp="n"
+
+elif test "x$enable_githttp" = "xyes"; then :
ax_cv_githttp="y"
-elif test "x$enable_githttp" = "xno"; then :
+elif test -z $ax_cv_githttp; then :
ax_cv_githttp="n"
-elif test -z $ax_cv_githttp; then :
-
- ax_cv_githttp="n"
-
fi
githttp=$ax_cv_githttp
+
+
# Check whether --enable-monitors was given.
if test "${enable_monitors+set}" = set; then :
enableval=$enable_monitors;
@@ -3950,47 +3958,53 @@ elif test -z $ax_cv_monitors; then :
fi
monitors=$ax_cv_monitors
+
+
# Check whether --enable-vtpm was given.
if test "${enable_vtpm+set}" = set; then :
enableval=$enable_vtpm;
fi
-if test "x$enable_vtpm" = "xyes"; then :
+if test "x$enable_vtpm" = "xno"; then :
+
+ ax_cv_vtpm="n"
+
+elif test "x$enable_vtpm" = "xyes"; then :
ax_cv_vtpm="y"
-elif test "x$enable_vtpm" = "xno"; then :
+elif test -z $ax_cv_vtpm; then :
ax_cv_vtpm="n"
-elif test -z $ax_cv_vtpm; then :
-
- ax_cv_vtpm="n"
-
fi
vtpm=$ax_cv_vtpm
-# Check whether --enable-xapi was given.
-if test "${enable_xapi+set}" = set; then :
- enableval=$enable_xapi;
-fi
-
-
-if test "x$enable_xapi" = "xyes"; then :
-
- ax_cv_xapi="y"
-
-elif test "x$enable_xapi" = "xno"; then :
-
- ax_cv_xapi="n"
-
-elif test -z $ax_cv_xapi; then :
-
- ax_cv_xapi="n"
-
-fi
-xapi=$ax_cv_xapi
+
+
+# Check whether --enable-xenapi was given.
+if test "${enable_xenapi+set}" = set; then :
+ enableval=$enable_xenapi;
+fi
+
+
+if test "x$enable_xenapi" = "xno"; then :
+
+ ax_cv_xenapi="n"
+
+elif test "x$enable_xenapi" = "xyes"; then :
+
+ ax_cv_xenapi="y"
+
+elif test -z $ax_cv_xenapi; then :
+
+ ax_cv_xenapi="n"
+
+fi
+xenapi=$ax_cv_xenapi
+
+
# Check whether --enable-pythontools was given.
if test "${enable_pythontools+set}" = set; then :
@@ -4013,6 +4027,8 @@ elif test -z $ax_cv_pythontools; then :
fi
pythontools=$ax_cv_pythontools
+
+
# Check whether --enable-ocamltools was given.
if test "${enable_ocamltools+set}" = set; then :
enableval=$enable_ocamltools;
@@ -4034,48 +4050,54 @@ elif test -z $ax_cv_ocamltools; then :
fi
ocamltools=$ax_cv_ocamltools
+
+
# Check whether --enable-miniterm was given.
if test "${enable_miniterm+set}" = set; then :
enableval=$enable_miniterm;
fi
-if test "x$enable_miniterm" = "xyes"; then :
+if test "x$enable_miniterm" = "xno"; then :
+
+ ax_cv_miniterm="n"
+
+elif test "x$enable_miniterm" = "xyes"; then :
ax_cv_miniterm="y"
-elif test "x$enable_miniterm" = "xno"; then :
+elif test -z $ax_cv_miniterm; then :
ax_cv_miniterm="n"
-elif test -z $ax_cv_miniterm; then :
-
- ax_cv_miniterm="n"
-
fi
miniterm=$ax_cv_miniterm
+
+
# Check whether --enable-lomount was given.
if test "${enable_lomount+set}" = set; then :
enableval=$enable_lomount;
fi
-if test "x$enable_lomount" = "xyes"; then :
+if test "x$enable_lomount" = "xno"; then :
+
+ ax_cv_lomount="n"
+
+elif test "x$enable_lomount" = "xyes"; then :
ax_cv_lomount="y"
-elif test "x$enable_lomount" = "xno"; then :
+elif test -z $ax_cv_lomount; then :
ax_cv_lomount="n"
-elif test -z $ax_cv_lomount; then :
-
- ax_cv_lomount="n"
-
fi
lomount=$ax_cv_lomount
+
+
# Check whether --enable-debug was given.
if test "${enable_debug+set}" = set; then :
enableval=$enable_debug;
@@ -4103,6 +4125,7 @@ debug=$ax_cv_debug
+
for cflag in $PREPEND_INCLUDES
do
PREPEND_CFLAGS+=" -I$cflag"
diff -r 64f5cd4aa2a2 -r 50317ae2a56d tools/configure.ac
--- a/tools/configure.ac Tue Mar 13 17:30:50 2012 +0000
+++ b/tools/configure.ac Thu Feb 23 08:22:45 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([xenapi], [Enable Xen API Bindings])
+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 tools])
AC_ARG_VAR([PREPEND_INCLUDES],
[List of include folders to prepend to CFLAGS (without -I)])
diff -r 64f5cd4aa2a2 -r 50317ae2a56d tools/m4/disable_feature.m4
--- a/tools/m4/disable_feature.m4 Tue Mar 13 17:30:50 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-AC_DEFUN([AX_ARG_DISABLE_AND_EXPORT],
-[AC_ARG_ENABLE([$1],
- AS_HELP_STRING([--disable-$1], [$2]))
-
-AS_IF([test "x$enable_$1" = "xno"], [
- ax_cv_$1="n"
-], [test "x$enable_$1" = "xyes"], [
- ax_cv_$1="y"
-], [test -z $ax_cv_$1], [
- ax_cv_$1="y"
-])
-$1=$ax_cv_$1
-AC_SUBST($1)])
diff -r 64f5cd4aa2a2 -r 50317ae2a56d tools/m4/enable_feature.m4
--- a/tools/m4/enable_feature.m4 Tue Mar 13 17:30:50 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-AC_DEFUN([AX_ARG_ENABLE_AND_EXPORT],
-[AC_ARG_ENABLE([$1],
- AS_HELP_STRING([--enable-$1], [$2]))
-
-AS_IF([test "x$enable_$1" = "xyes"], [
- ax_cv_$1="y"
-], [test "x$enable_$1" = "xno"], [
- ax_cv_$1="n"
-], [test -z $ax_cv_$1], [
- ax_cv_$1="n"
-])
-$1=$ax_cv_$1
-AC_SUBST($1)])
diff -r 64f5cd4aa2a2 -r 50317ae2a56d tools/m4/features.m4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/m4/features.m4 Thu Feb 23 08:22:45 2012 +0100
@@ -0,0 +1,21 @@
+AC_DEFUN([AX_ARG_DEFAULT_ENABLE], [
+AC_ARG_ENABLE([$1], AS_HELP_STRING([--disable-$1], [$2 (default is ENABLED)]))
+AX_PARSE_VALUE([$1], [y])
+])
+
+AC_DEFUN([AX_ARG_DEFAULT_DISABLE], [
+AC_ARG_ENABLE([$1], AS_HELP_STRING([--enable-$1], [$2 (default is DISABLED)]))
+AX_PARSE_VALUE([$1], [n])
+])
+
+dnl This function should not be called outside of this file
+AC_DEFUN([AX_PARSE_VALUE], [
+AS_IF([test "x$enable_$1" = "xno"], [
+ ax_cv_$1="n"
+], [test "x$enable_$1" = "xyes"], [
+ ax_cv_$1="y"
+], [test -z $ax_cv_$1], [
+ ax_cv_$1="$2"
+])
+$1=$ax_cv_$1
+AC_SUBST($1)])
Olaf Hering
2012-Mar-15 12:28 UTC
Re: [PATCH v2] autoconf: change AX_ARG_{DISABLE/ENABLE}_AND_EXPORT to make more sense
On Thu, Feb 23, Roger Pau Monne wrote:> # HG changeset patch > # User Roger Pau Monne <roger.pau@entel.upc.edu> > # Date 1329981765 -3600 > # Node ID 50317ae2a56d66e39079b8758ee2755fac268748 > # 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. > > Changes since v1: > > * Change comment to "dnl" > > * Change xapi to xenapi > > * Add help string regarding default value of enable/disable options > > Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu> > Acked-by: Ian Campbell <ian.campbell@citrix.com>Acked-by: Olaf Hering <olaf@aepfle.de>
Ian Jackson
2012-Apr-03 17:13 UTC
Re: [PATCH v2] autoconf: change AX_ARG_{DISABLE/ENABLE}_AND_EXPORT to make more sense [and 1 more messages]
Roger Pau Monne writes ("[Xen-devel] [PATCH v2] autoconf: change
AX_ARG_{DISABLE/ENABLE}_AND_EXPORT to make more
sense"):> autoconf: change AX_ARG_{DISABLE/ENABLE}_AND_EXPORT to make more sense
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>