Re: [libvirt] [PATCH 2/4] Standardise options reporting on ./configure --help

Always use AS_HELP_STRING to define the help string for the options, fix proper quoting and quadrigraphs for brackets, and always use the [default=$foo] syntax to show the default (in line with autoconf's own defaults). ---  configure.in |   98 +++++++++++++++++++++++++++++-----------------------------  1 files changed, 49 insertions(+), 49 deletions(-) diff --git a/configure.in b/configure.in index 06ab82c..b03b8e3 100644 --- a/configure.in +++ b/configure.in @@ -195,33 +195,33 @@ fi  dnl Allow to build without Xen, QEMU/KVM, test or remote driver  AC_ARG_WITH([xen], -[  --with-xen              add XEN support (on)],[],[with_xen=yes]) +  AS_HELP_STRING([--with-xen], [add XEN support @<:@default=yes@:>@]),[],[with_xen=yes])  AC_ARG_WITH([xen-inotify], -[  --with-xen-inotify      add XEN inotify support (on)],[],[with_xen_inotify=check]) +  AS_HELP_STRING([--with-xen-inotify], [add XEN inotify support @<:@default=yes@:>@]),[],[with_xen_inotify=check])

 AC_ARG_WITH([qemu], -[  --with-qemu             add QEMU/KVM support (on)],[],[with_qemu=yes]) +  AS_HELP_STRING([--with-qemu], [add QEMU/KVM support @<:@default=yes@:>@]),[],[with_qemu=yes])  AC_ARG_WITH([uml], -[  --with-uml              add UML support (on)],[],[with_uml=check]) +  AS_HELP_STRING([--with-uml], [add UML support @<:@default=yes@:>@]),[],[with_uml=check])

 AC_ARG_WITH([openvz], -[  --with-openvz           add OpenVZ support (on)],[],[with_openvz=yes]) +  AS_HELP_STRING([--with-openvz], [add OpenVZ support @<:@default=yes@:>@]),[],[with_openvz=yes])  AC_ARG_WITH([libssh2], -[  --with-libssh2=[PFX]       libssh2 location],[],[with_libssh2=yes]) +  AS_HELP_STRING([--with-libssh2=@<:@PFX@:>@], [libssh2 location]),[],[with_libssh2=yes])  AC_ARG_WITH([phyp], -[  --with-phyp=[PFX]         add PHYP support (on)],[],[with_phyp=check]) +  AS_HELP_STRING([--with-phyp=@<:@PFX@:>@], [add PHYP support @<:@default=yes@:>@]),[],[with_phyp=check])

 AC_ARG_WITH([vbox], -[  --with-vbox             add VirtualBox support (on)],[],[with_vbox=yes]) +  AS_HELP_STRING([--with-vbox], [add VirtualBox support @<:@default=yes@:>@]),[],[with_vbox=yes])  AC_ARG_WITH([lxc], -[  --with-lxc              add Linux Container support (on)],[],[with_lxc=check]) +  AS_HELP_STRING([--with-lxc], [add Linux Container support @<:@default=yes@:>@]),[],[with_lxc=check])

 AC_ARG_WITH([one], -[  --with-one              add ONE support (on)],[],[with_one=check]) +  AS_HELP_STRING([--with-one], [add ONE support @<:@default=yes@:>@]),[],[with_one=check])

 AC_ARG_WITH([esx], -[  --with-esx              add ESX support (on)],[],[with_esx=check]) +  AS_HELP_STRING([--with-esx], [add ESX support @<:@default=yes@:>@]),[],[with_esx=check])

 AC_ARG_WITH([test], -[  --with-test             add test driver support (on)],[],[with_test=yes]) +  AS_HELP_STRING([--with-test], [add test driver support @<:@default=yes@:>@]),[],[with_test=yes])  AC_ARG_WITH([remote], -[  --with-remote           add remote driver support (on)],[],[with_remote=yes]) +  AS_HELP_STRING([--with-remote], [add remote driver support @<:@default=yes@:>@]),[],[with_remote=yes])  AC_ARG_WITH([libvirtd], -[  --with-libvirtd         add libvirtd support (on)],[],[with_libvirtd=yes]) +  AS_HELP_STRING([--with-libvirtd], [add libvirtd support @<:@default=yes@:>@]),[],[with_libvirtd=yes])  dnl  dnl specific tests to setup DV devel environments with debug etc ... @@ -235,7 +235,7 @@ AC_SUBST([STATIC_BINARIES])  dnl --enable-debug=(yes|no)  AC_ARG_ENABLE([debug], -              [AC_HELP_STRING([--enable-debug=no/yes], +              [AS_HELP_STRING([--enable-debug=@<:@no|yes@:>@],                              [enable debugging output])],[],[enable_debug=yes])

 AM_CONDITIONAL([ENABLE_DEBUG], test x"$enable_debug" = x"yes")  if test x"$enable_debug" = x"yes"; then @@ -244,7 +244,7 @@ fi  AC_MSG_CHECKING([where to write libvirtd PID file]) -AC_ARG_WITH([remote-pid-file], [AC_HELP_STRING([--with-remote-pid-file=[pidfile|none]], [PID file for libvirtd])]) +AC_ARG_WITH([remote-pid-file], [AS_HELP_STRING([--with-remote-pid-file=@<:@pidfile|none@:>@], [PID file for libvirtd])])  if test "x$with_remote_pid_file" == "x" ; then    REMOTE_PID_FILE="$localstatedir/run/libvirtd.pid"  elif test "x$with_remote_pid_file" == "xnone" ; then @@ -260,8 +260,8 @@ dnl init script flavor  dnl  AC_MSG_CHECKING([for init script flavor])  AC_ARG_WITH([init-script], -            [AC_HELP_STRING([--with-init-script=[redhat|auto|none]], -                    [Style of init script to install (defaults to auto)])]) +            [AS_HELP_STRING([--with-init-script=@<:@redhat|auto|none@:>@], +                    [Style of init script to install @<:@default=auto@:>@])])  if test "x$with_init_script" = "x" -o "x$with_init_script" = "xauto"; then     if test -f /etc/redhat-release ; then         with_init_script=redhat @@ -274,8 +274,8 @@ AC_MSG_RESULT($with_init_script)  dnl RHEL-5 has a peculiar version of Xen, which requires some special casing  AC_ARG_WITH([rhel5-api], -       [AC_HELP_STRING([--with-rhel5-api=[ARG]], -               [build for the RHEL-5 API [default=no]])]) +       [AS_HELP_STRING([--with-rhel5-api=@<:@ARG@:>@], +               [build for the RHEL-5 API @<:@default=no@:>@])])  if test x"$with_rhel5_api" = x"yes"; then    AC_DEFINE([WITH_RHEL5_API], [1], [whether building for the RHEL-5 API])  fi @@ -499,7 +499,7 @@ LIBXML_CFLAGS=""  LIBXML_LIBS=""  LIBXML_FOUND="no" -AC_ARG_WITH([libxml], [  --with-libxml=[PFX]       libxml2 location]) +AC_ARG_WITH([libxml], AS_HELP_STRING([--with-libxml=@<:@PFX@:>@], [libxml2 location]))  if test "x$with_libxml" = "xno" ; then     AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_REQUIRED)     AC_MSG_ERROR([libxml2 >= $LIBXML_REQUIRED is required for libvirt]) @@ -586,7 +586,7 @@ LIBS="$old_libs"  dnl Cyrus SASL  AC_ARG_WITH([sasl], -  [  --with-sasl         use cyrus SASL for authentication], +  AS_HELP_STRING([--with-sasl], [use cyrus SASL for authentication]),   [],   [with_sasl=check])

@@ -641,7 +641,7 @@ AC_SUBST([SASL_LIBS])  dnl YAJL JSON library http://lloyd.github.com/yajl/  AC_ARG_WITH([yajl], -  [  --with-yajl         use YAJL for JSON parsing/formatting], +  AS_HELP_STRING([--with-yajl], [use YAJL for JSON parsing/formatting]),   [],   [with_yajl=check])

@@ -694,7 +694,7 @@ POLKIT_CFLAGS=  POLKIT_LIBS=  PKCHECK_PATH=  AC_ARG_WITH([polkit], -  [  --with-polkit         use PolicyKit for UNIX socket access checks], +  AS_HELP_STRING([--with-polkit], [use PolicyKit for UNIX socket access checks]),   [],   [with_polkit=check])

@@ -752,7 +752,7 @@ AC_SUBST([POLKIT_LIBS])  dnl Avahi library  AC_ARG_WITH([avahi], -  [  --with-avahi         use avahi to advertise remote daemon], +  AS_HELP_STRING([--with-avahi], [use avahi to advertise remote daemon]),   [],   [with_avahi=check])

@@ -779,7 +779,7 @@ AC_SUBST([AVAHI_LIBS])  dnl SELinux  AC_ARG_WITH([selinux], -  [  --with-selinux         use SELinux to manage security], +  AS_HELP_STRING([--with-selinux], [use SELinux to manage security]),   [],   [with_selinux=check])

@@ -814,7 +814,7 @@ AC_SUBST([SELINUX_LIBS])  AC_ARG_WITH([secdriver-selinux], -  [  --with-secdriver-selinux         use SELinux security driver], +  AS_HELP_STRING([--with-secdriver-selinux], [use SELinux security driver]),   [],   [with_secdriver_selinux=check])

@@ -852,7 +852,7 @@ AM_CONDITIONAL([WITH_SECDRIVER_SELINUX], [test "$with_secdriver_selinux" != "no"  dnl AppArmor  AC_ARG_WITH([apparmor], -  [  --with-apparmor        use AppArmor to manage security], +  AS_HELP_STRING([--with-apparmor], [use AppArmor to manage security]),   [],   [with_apparmor=check])

@@ -891,7 +891,7 @@ AC_SUBST([APPARMOR_LIBS])  AC_ARG_WITH([secdriver-apparmor], -  [  --with-secdriver-apparmor         use AppArmor security driver], +  AS_HELP_STRING([--with-secdriver-apparmor], [use AppArmor security driver]),   [],   [with_secdriver_apparmor=check])

@@ -930,7 +930,7 @@ AM_CONDITIONAL([WITH_SECDRIVER_APPARMOR], [test "$with_secdriver_apparmor" != "n  dnl NUMA lib  AC_ARG_WITH([numactl], -  [  --with-numactl         use numactl for host topology info], +  AS_HELP_STRING([--with-numactl], [use numactl for host topology info]),   [],   [with_numactl=check])

@@ -1065,7 +1065,7 @@ AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" = "yes"])  dnl libcap-ng  AC_ARG_WITH([capng], -  [  --with-capng         use libcap-ng to reduce libvirtd privileges], +  AS_HELP_STRING([--with-capng], [use libcap-ng to reduce libvirtd privileges]),   [],   [with_capng=check])

@@ -1148,7 +1148,7 @@ AC_SUBST([VIRSH_LIBS])  AC_ARG_WITH([network], -[  --with-network              with virtual network driver (on)],[],[with_network=yes]) +  AS_HELP_STRING([--with-network], [with virtual network driver @<:@default=yes@:>@]),[],[with_network=yes])  if test "$with_libvirtd" = "no" ; then   with_network=no  fi @@ -1166,7 +1166,7 @@ AM_CONDITIONAL([WITH_BRIDGE], [test "$with_bridge" = "yes"])  dnl netcf library  AC_ARG_WITH([netcf], -[  --with-netcf         libnetcf support to configure physical host network interfaces], +  AS_HELP_STRING([--with-netcf], [libnetcf support to configure physical host network interfaces]),  [], [with_netcf=check])

 NETCF_CFLAGS= @@ -1202,17 +1202,17 @@ AM_CONDITIONAL([WITH_SECRETS], [test "$with_secrets" = "yes"])  AC_ARG_WITH([storage-fs], -[  --with-storage-fs           with FileSystem backend for the storage driver (on)],[],[with_storage_fs=check]) +  AS_HELP_STRING([--with-storage-fs], [with FileSystem backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_fs=check])

 AC_ARG_WITH([storage-lvm], -[  --with-storage-lvm          with LVM backend for the storage driver (on)],[],[with_storage_lvm=check]) +  AS_HELP_STRING([--with-storage-lvm], [with LVM backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_lvm=check])

 AC_ARG_WITH([storage-iscsi], -[  --with-storage-iscsi        with iSCSI backend for the storage driver (on)],[],[with_storage_iscsi=check]) +  AS_HELP_STRING([--with-storage-iscsi], [with iSCSI backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_iscsi=check])

 AC_ARG_WITH([storage-scsi], -[  --with-storage-scsi         with SCSI backend for the storage driver (on)],[],[with_storage_scsi=check]) +  AS_HELP_STRING([--with-storage-scsi], [with SCSI backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_scsi=check])

 AC_ARG_WITH([storage-mpath], -[  --with-storage-mpath        with mpath backend for the storage driver (on)],[],[with_storage_mpath=check]) +  AS_HELP_STRING([--with-storage-mpath], [with mpath backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_mpath=check])

 AC_ARG_WITH([storage-disk], -[  --with-storage-disk         with GPartd Disk backend for the storage driver (on)],[],[with_storage_disk=check]) +  AS_HELP_STRING([--with-storage-disk], [with GPartd Disk backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_disk=check])

 with_storage_dir=yes  if test "$with_libvirtd" = "no"; then @@ -1454,7 +1454,7 @@ dnl check for python  dnl  AC_ARG_WITH([python], -[  --with-python              Build python bindings (on)],[],[with_python=yes]) +  AS_HELP_STRING([--with-python], [Build python bindings @<:@default=yes@:>@]),[],[with_python=yes])  if test "$enable_shared:$with_python" = no:yes; then   AC_MSG_WARN([Disabling shared libraries is incompatible with building Python extensions.]) @@ -1551,7 +1551,7 @@ AC_MSG_RESULT($RUNNING_XEND)  AM_CONDITIONAL([ENABLE_XEN_TESTS], [test "$RUNNING_XEN" != "no" -a "$RUNNING_XEND" != "no"])  AC_ARG_ENABLE([test-coverage], -[  --enable-test-coverage  turn on code coverage instrumentation], +  AS_HELP_STRING([--enable-test-coverage], [turn on code coverage instrumentation]),

 [case "${enableval}" in    yes|no) ;;    *)      AC_MSG_ERROR([bad value ${enableval} for test-coverage option]) ;; @@ -1568,7 +1568,7 @@ if test "${enable_coverage}" = yes; then  fi  AC_ARG_ENABLE([test-oom], -[  --enable-test-oom       memory allocation failure checking], +  AS_HELP_STRING([--enable-test-oom], [memory allocation failure checking]),

 [case "${enableval}" in    yes|no) ;;    *)      AC_MSG_ERROR([bad value ${enableval} for test-oom option]) ;; @@ -1588,7 +1588,7 @@ fi  AC_ARG_ENABLE([test-locking], -[  --enable-test-locking       thread locking tests using CIL], +  AS_HELP_STRING([--enable-test-locking], [thread locking tests using CIL]),

 [case "${enableval}" in    yes|no) ;;    *)      AC_MSG_ERROR([bad value ${enableval} for test-locking option]) ;; @@ -1605,7 +1605,7 @@ AM_CONDITIONAL([WITH_CIL],[test "$enable_locking" = "yes"])  dnl Enable building the proxy?  AC_ARG_WITH([xen-proxy], -[  --with-xen-proxy              add XEN setuid proxy support (on)],[],[with_xen_proxy=auto]) +  AS_HELP_STRING([--with-xen-proxy], [add XEN setuid proxy support @<:@default=yes@:>@]),[],[with_xen_proxy=auto])

 AC_MSG_CHECKING([if Xen setuid proxy is needed])  if test "$with_xen_proxy" = "auto"; then @@ -1665,7 +1665,7 @@ AM_CONDITIONAL([WITH_WIN_ICON], [test "$WINDRES" != "no"])  dnl Driver-Modules library  AC_ARG_WITH([driver-modules], -  [  --with-driver-modules       build drivers as loadable modules], +  AS_HELP_STRING([--with-driver-modules], [build drivers as loadable modules]),   [],   [with_driver_modules=no])

@@ -1704,7 +1704,7 @@ dnl HAL library check for host device enumeration  HAL_CFLAGS=  HAL_LIBS=  AC_ARG_WITH([hal], -  [  --with-hal         use HAL for host device enumeration], +  AS_HELP_STRING([--with-hal], [use HAL for host device enumeration]),   [],   [with_hal=check])

@@ -1747,7 +1747,7 @@ UDEV_LIBS=  PCIACCESS_CFLAGS=  PCIACCESS_LIBS=  AC_ARG_WITH([udev], -  [  --with-udev        use libudev for host device enumeration], +  AS_HELP_STRING([--with-udev], [use libudev for host device enumeration]),   [],   [with_udev=check])

@@ -1799,11 +1799,11 @@ AM_CONDITIONAL([WITH_LINUX], [test `uname -s` = "Linux"])  AC_ARG_WITH([qemu-user], -  [  --with-qemu-user       username to run QEMU system instance as], +  AS_HELP_STRING([--with-qemu-user], [username to run QEMU system instance as]),   [QEMU_USER=${withval}],   [QEMU_USER=root])

 AC_ARG_WITH([qemu-group], -  [  --with-qemu-group      groupname to run QEMU system instance as], +  AS_HELP_STRING([--with-qemu-group], [groupname to run QEMU system instance as]),   [QEMU_GROUP=${withval}],   [QEMU_GROUP=root])

 AC_DEFINE_UNQUOTED([QEMU_USER], ["$QEMU_USER"], [QEMU user account]) -- 1.6.6