LIBVIRT_ARG_WITH_ALT is more generic than LIBVIRT_ARG_WITH, which
is tailored at switching features on and off.
Rename the macros according to their intended purpose, and add
some documentation to help developers pick between the two.
---
configure.ac | 16 ++++++-------
m4/virt-apparmor.m4 | 4 ++--
m4/virt-arg.m4 | 56 +++++++++++++++++++++++++------------------
m4/virt-attr.m4 | 2 +-
m4/virt-audit.m4 | 2 +-
m4/virt-avahi.m4 | 2 +-
m4/virt-blkid.m4 | 2 +-
m4/virt-capng.m4 | 2 +-
m4/virt-chrdev-lock-files.m4 | 8 +++----
m4/virt-curl.m4 | 2 +-
m4/virt-dbus.m4 | 2 +-
m4/virt-default-editor.m4 | 4 ++--
m4/virt-driver-bhyve.m4 | 2 +-
m4/virt-driver-esx.m4 | 2 +-
m4/virt-driver-hyperv.m4 | 2 +-
m4/virt-driver-interface.m4 | 2 +-
m4/virt-driver-libvirtd.m4 | 2 +-
m4/virt-driver-libxl.m4 | 2 +-
m4/virt-driver-lxc.m4 | 2 +-
m4/virt-driver-modules.m4 | 4 ++--
m4/virt-driver-network.m4 | 2 +-
m4/virt-driver-openvz.m4 | 2 +-
m4/virt-driver-phyp.m4 | 2 +-
m4/virt-driver-qemu.m4 | 10 ++++----
m4/virt-driver-remote.m4 | 2 +-
m4/virt-driver-test.m4 | 2 +-
m4/virt-driver-uml.m4 | 2 +-
m4/virt-driver-vbox.m4 | 2 +-
m4/virt-driver-vmware.m4 | 2 +-
m4/virt-driver-vz.m4 | 2 +-
m4/virt-driver-xen.m4 | 4 ++--
m4/virt-driver-xenapi.m4 | 2 +-
m4/virt-dtrace.m4 | 2 +-
m4/virt-firewalld.m4 | 2 +-
m4/virt-fuse.m4 | 2 +-
m4/virt-gluster.m4 | 2 +-
m4/virt-gnutls.m4 | 2 +-
m4/virt-hal.m4 | 2 +-
m4/virt-host-validate.m4 | 2 +-
m4/virt-init-script.m4 | 6 ++---
m4/virt-libpcap.m4 | 2 +-
m4/virt-libssh.m4 | 2 +-
m4/virt-libxml.m4 | 2 +-
m4/virt-loader-nvram.m4 | 8 +++----
m4/virt-login-shell.m4 | 2 +-
m4/virt-macvtap.m4 | 2 +-
m4/virt-netcf.m4 | 2 +-
m4/virt-nss.m4 | 6 ++---
m4/virt-numactl.m4 | 2 +-
m4/virt-numad.m4 | 4 ++--
m4/virt-openwsman.m4 | 2 +-
m4/virt-pciaccess.m4 | 2 +-
m4/virt-pm-utils.m4 | 2 +-
m4/virt-polkit.m4 | 4 ++--
m4/virt-readline.m4 | 2 +-
m4/virt-sanlock.m4 | 2 +-
m4/virt-sasl.m4 | 2 +-
m4/virt-secdriver-apparmor.m4 | 4 ++--
m4/virt-secdriver-selinux.m4 | 2 +-
m4/virt-selinux.m4 | 4 ++--
m4/virt-ssh2.m4 | 2 +-
m4/virt-storage-dir.m4 | 2 +-
m4/virt-storage-disk.m4 | 4 ++--
m4/virt-storage-fs.m4 | 4 ++--
m4/virt-storage-gluster.m4 | 4 ++--
m4/virt-storage-iscsi.m4 | 4 ++--
m4/virt-storage-lvm.m4 | 2 +-
m4/virt-storage-mpath.m4 | 4 ++--
m4/virt-storage-rbd.m4 | 4 ++--
m4/virt-storage-scsi.m4 | 2 +-
m4/virt-storage-sheepdog.m4 | 4 ++--
m4/virt-storage-zfs.m4 | 2 +-
m4/virt-sysctl.m4 | 2 +-
m4/virt-tls-priority.m4 | 6 ++---
m4/virt-udev.m4 | 2 +-
m4/virt-virtualport.m4 | 2 +-
m4/virt-wireshark.m4 | 8 +++----
m4/virt-xml-catalog.m4 | 6 ++---
m4/virt-yajl.m4 | 2 +-
79 files changed, 154 insertions(+), 144 deletions(-)
diff --git a/configure.ac b/configure.ac
index b080970..9a05075 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,8 +96,8 @@ AC_SUBST([LIBVIRT_VERSION])
AC_SUBST([LIBVIRT_VERSION_INFO])
AC_SUBST([LIBVIRT_VERSION_NUMBER])
-LIBVIRT_ARG_WITH_ALT([PACKAGER], [Extra packager name], [no])
-LIBVIRT_ARG_WITH_ALT([PACKAGER_VERSION], [Extra packager version], [no])
+LIBVIRT_ARG_WITH([PACKAGER], [Extra packager name], [no])
+LIBVIRT_ARG_WITH([PACKAGER_VERSION], [Extra packager version], [no])
if test "x$with_packager" != "xno"
then
AC_DEFINE_UNQUOTED([PACKAGER], ["$with_packager"],
@@ -373,10 +373,10 @@ LIBVIRT_CHECK_EXTERNAL_PROGRAMS
dnl Specific dir for HTML output ?
-LIBVIRT_ARG_WITH_ALT([HTML_DIR], [path to base html directory],
- ['$(datadir)/doc'])
-LIBVIRT_ARG_WITH_ALT([HTML_SUBDIR], [directory used under html-dir],
- ['$(PACKAGE)-$(VERSION)/html'])
+LIBVIRT_ARG_WITH([HTML_DIR], [path to base html directory],
+ ['$(datadir)/doc'])
+LIBVIRT_ARG_WITH([HTML_SUBDIR], [directory used under html-dir],
+ ['$(PACKAGE)-$(VERSION)/html'])
if test "x$with_html_subdir" != "x" ; then
HTML_DIR="$with_html_dir/$with_html_subdir"
else
@@ -544,7 +544,7 @@ LIBVIRT_SECDRIVER_CHECK_SELINUX
LIBVIRT_SECDRIVER_CHECK_APPARMOR
-LIBVIRT_ARG_WITH([SECRETS], [local secrets management driver], [yes])
+LIBVIRT_ARG_WITH_FEATURE([SECRETS], [local secrets management driver], [yes])
if test "$with_libvirtd" = "no"; then
with_secrets=no
@@ -639,7 +639,7 @@ if test -z "$PERL"; then
AC_MSG_ERROR([Failed to find perl.])
fi
-LIBVIRT_ARG_WITH_ALT([TEST_SUITE], [build test suite by default], [check])
+LIBVIRT_ARG_WITH([TEST_SUITE], [build test suite by default], [check])
case "$with_test_suite" in
yes|no|check) ;;
*) AC_MSG_ERROR([bad value ${withval} for tests option]) ;;
diff --git a/m4/virt-apparmor.m4 b/m4/virt-apparmor.m4
index 22818f2..ebddfce 100644
--- a/m4/virt-apparmor.m4
+++ b/m4/virt-apparmor.m4
@@ -18,8 +18,8 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_APPARMOR],[
- LIBVIRT_ARG_WITH([APPARMOR], [AppArmor], [check])
- LIBVIRT_ARG_WITH_ALT([APPARMOR_MOUNT], [set AppArmor mount point], [check])
+ LIBVIRT_ARG_WITH_FEATURE([APPARMOR], [AppArmor], [check])
+ LIBVIRT_ARG_WITH([APPARMOR_MOUNT], [set AppArmor mount point], [check])
])
AC_DEFUN([LIBVIRT_CHECK_APPARMOR],[
diff --git a/m4/virt-arg.m4 b/m4/virt-arg.m4
index 8747038..d626d72 100644
--- a/m4/virt-arg.m4
+++ b/m4/virt-arg.m4
@@ -22,22 +22,22 @@ dnl
dnl
dnl To be used instead of AC_ARG_WITH
dnl
-dnl LIBVIRT_ARG_WITH([CHECK_NAME], [HELP_NAME], [DEFAULT_ACTION], [MIN_VERSION])
+dnl See LIBVIRT_ARG_WITH_FEATURE if the argument you're adding is going to
+dnl be used for switching a feature on and off.
+dnl
+dnl LIBVIRT_ARG_WITH([CHECK_NAME], [HELP_DESC], [DEFAULT_ACTION])
dnl
dnl CHECK_NAME: Suffix/prefix used for variables/flags, in uppercase.
-dnl HELP_NAME: Name that will appear in configure --help
+dnl HELP_DESC: Description that will appear in configure --help
dnl DEFAULT_ACTION: Default configure action
-dnl MIN_VERSION: Specify minimal version that will be added to
-dnl configure --help (optional)
dnl
-dnl LIBVIRT_ARG_WITH([SELINUX], [SeLinux], [check])
-dnl LIBVIRT_ARG_WITH([GLUSTERFS], [glusterfs], [check], [3.4.1])
+dnl LIBVIRT_ARG_WITH([PACKAGER], [Extra packager name], [no])
+dnl LIBVIRT_ARG_WITH([HTML_DIR], [path to base html directory], [$(datadir)/doc])
dnl
AC_DEFUN([LIBVIRT_ARG_WITH], [
m4_pushdef([check_name], [$1])
- m4_pushdef([help_name], [[$2]])
+ m4_pushdef([help_desc], [[$2]])
m4_pushdef([default_action], [$3])
- m4_pushdef([min_version], [$4])
m4_pushdef([check_name_lc], m4_tolower(check_name))
m4_pushdef([check_name_dash], m4_translit(check_name_lc, [_], [-]))
@@ -45,14 +45,10 @@ AC_DEFUN([LIBVIRT_ARG_WITH], [
m4_pushdef([arg_var], [with-]check_name_dash)
m4_pushdef([with_var], [with_]check_name_lc)
- m4_pushdef([version_text], m4_ifnblank(min_version, [[ (>= ]]min_version[[)]]))
-
m4_divert_text([DEFAULTS], [with_var][[=]][default_action])
AC_ARG_WITH([check_name_lc],
[AS_HELP_STRING([[--]arg_var],
- [with ]]m4_dquote(help_name)m4_dquote(version_text)[[ support @<:@default=]]m4_dquote(default_action)[[@:>@])])
-
- m4_popdef([version_text])
+ ]m4_dquote(help_desc)[[ @<:@default=]]m4_dquote(default_action)[[@:>@])])
m4_popdef([with_var])
m4_popdef([arg_var])
@@ -60,28 +56,37 @@ AC_DEFUN([LIBVIRT_ARG_WITH], [
m4_popdef([check_name_dash])
m4_popdef([check_name_lc])
- m4_popdef([min_version])
m4_popdef([default_action])
- m4_popdef([help_name])
+ m4_popdef([help_desc])
m4_popdef([check_name])
])
dnl
dnl To be used instead of AC_ARG_WITH
dnl
-dnl LIBVIRT_ARG_WITH_ALT([CHECK_NAME], [HELP_DESC], [DEFAULT_ACTION])
+dnl The difference between LIBVIRT_ARG_WITH and this macro is that the former
+dnl is mostly an enhanced drop-in replacement for AC_ARG_WITH, whereas the
+dnl latter is tailored for adding an argument that is going to be used to
+dnl switch a feature on and off: as a consequence, it optionally supports
+dnl specifying the minimum version for libraries the feature depends on and
+dnl automatically builds a suitable description from the feature name.
+dnl
+dnl LIBVIRT_ARG_WITH_FEATURE([CHECK_NAME], [HELP_NAME], [DEFAULT_ACTION], [MIN_VERSION])
dnl
dnl CHECK_NAME: Suffix/prefix used for variables/flags, in uppercase.
-dnl HELP_DESC: Description that will appear in configure --help
+dnl HELP_NAME: Name that will appear in configure --help
dnl DEFAULT_ACTION: Default configure action
+dnl MIN_VERSION: Specify minimal version that will be added to
+dnl configure --help (optional)
dnl
-dnl LIBVIRT_ARG_WITH_ALT([PACKAGER], [Extra packager name], [no])
-dnl LIBVIRT_ARG_WITH_ALT([HTML_DIR], [path to base html directory], [$(datadir)/doc])
+dnl LIBVIRT_ARG_WITH_FEATURE([SELINUX], [SeLinux], [check])
+dnl LIBVIRT_ARG_WITH_FEATURE([GLUSTERFS], [glusterfs], [check], [3.4.1])
dnl
-AC_DEFUN([LIBVIRT_ARG_WITH_ALT], [
+AC_DEFUN([LIBVIRT_ARG_WITH_FEATURE], [
m4_pushdef([check_name], [$1])
- m4_pushdef([help_desc], [[$2]])
+ m4_pushdef([help_name], [[$2]])
m4_pushdef([default_action], [$3])
+ m4_pushdef([min_version], [$4])
m4_pushdef([check_name_lc], m4_tolower(check_name))
m4_pushdef([check_name_dash], m4_translit(check_name_lc, [_], [-]))
@@ -89,10 +94,14 @@ AC_DEFUN([LIBVIRT_ARG_WITH_ALT], [
m4_pushdef([arg_var], [with-]check_name_dash)
m4_pushdef([with_var], [with_]check_name_lc)
+ m4_pushdef([version_text], m4_ifnblank(min_version, [[ (>= ]]min_version[[)]]))
+
m4_divert_text([DEFAULTS], [with_var][[=]][default_action])
AC_ARG_WITH([check_name_lc],
[AS_HELP_STRING([[--]arg_var],
- ]m4_dquote(help_desc)[[ @<:@default=]]m4_dquote(default_action)[[@:>@])])
+ [with ]]m4_dquote(help_name)m4_dquote(version_text)[[ support @<:@default=]]m4_dquote(default_action)[[@:>@])])
+
+ m4_popdef([version_text])
m4_popdef([with_var])
m4_popdef([arg_var])
@@ -100,8 +109,9 @@ AC_DEFUN([LIBVIRT_ARG_WITH_ALT], [
m4_popdef([check_name_dash])
m4_popdef([check_name_lc])
+ m4_popdef([min_version])
m4_popdef([default_action])
- m4_popdef([help_desc])
+ m4_popdef([help_name])
m4_popdef([check_name])
])
diff --git a/m4/virt-attr.m4 b/m4/virt-attr.m4
index dcb2678..c55bd7d 100644
--- a/m4/virt-attr.m4
+++ b/m4/virt-attr.m4
@@ -1,7 +1,7 @@
dnl The libattr.so library
AC_DEFUN([LIBVIRT_ARG_ATTR],[
- LIBVIRT_ARG_WITH([ATTR], [attr], [check])
+ LIBVIRT_ARG_WITH_FEATURE([ATTR], [attr], [check])
])
AC_DEFUN([LIBVIRT_CHECK_ATTR],[
diff --git a/m4/virt-audit.m4 b/m4/virt-audit.m4
index 68b6f57..f2e855e 100644
--- a/m4/virt-audit.m4
+++ b/m4/virt-audit.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_AUDIT],[
- LIBVIRT_ARG_WITH([AUDIT], [audit], [check])
+ LIBVIRT_ARG_WITH_FEATURE([AUDIT], [audit], [check])
])
AC_DEFUN([LIBVIRT_CHECK_AUDIT],[
diff --git a/m4/virt-avahi.m4 b/m4/virt-avahi.m4
index f36af6d..d4b3fc6 100644
--- a/m4/virt-avahi.m4
+++ b/m4/virt-avahi.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_AVAHI],[
- LIBVIRT_ARG_WITH([AVAHI], [avahi-client], [check], [0.6.0])
+ LIBVIRT_ARG_WITH_FEATURE([AVAHI], [avahi-client], [check], [0.6.0])
])
AC_DEFUN([LIBVIRT_CHECK_AVAHI],[
diff --git a/m4/virt-blkid.m4 b/m4/virt-blkid.m4
index db225a1..609d0d5 100644
--- a/m4/virt-blkid.m4
+++ b/m4/virt-blkid.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_BLKID],[
- LIBVIRT_ARG_WITH([BLKID], [blkid], [check], [2.17])
+ LIBVIRT_ARG_WITH_FEATURE([BLKID], [blkid], [check], [2.17])
])
AC_DEFUN([LIBVIRT_CHECK_BLKID],[
diff --git a/m4/virt-capng.m4 b/m4/virt-capng.m4
index 3fbc795..bf9fcd2 100644
--- a/m4/virt-capng.m4
+++ b/m4/virt-capng.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_CAPNG],[
- LIBVIRT_ARG_WITH([CAPNG], [cap-ng], [check])
+ LIBVIRT_ARG_WITH_FEATURE([CAPNG], [cap-ng], [check])
])
AC_DEFUN([LIBVIRT_CHECK_CAPNG],[
diff --git a/m4/virt-chrdev-lock-files.m4 b/m4/virt-chrdev-lock-files.m4
index 8a44e4d..7d85c0e 100644
--- a/m4/virt-chrdev-lock-files.m4
+++ b/m4/virt-chrdev-lock-files.m4
@@ -18,10 +18,10 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_CHRDEV_LOCK_FILES], [
- LIBVIRT_ARG_WITH_ALT([CHRDEV_LOCK_FILES],
- [location for UUCP style lock files for character devices ]
- [(use auto for default paths on some platforms)],
- [auto])
+ LIBVIRT_ARG_WITH([CHRDEV_LOCK_FILES],
+ [location for UUCP style lock files for character devices ]
+ [(use auto for default paths on some platforms)],
+ [auto])
])
AC_DEFUN([LIBVIRT_CHECK_CHRDEV_LOCK_FILES], [
diff --git a/m4/virt-curl.m4 b/m4/virt-curl.m4
index 7194d7a..84fcd69 100644
--- a/m4/virt-curl.m4
+++ b/m4/virt-curl.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_CURL],[
- LIBVIRT_ARG_WITH([CURL], [libcurl], [check], [7.18.0])
+ LIBVIRT_ARG_WITH_FEATURE([CURL], [libcurl], [check], [7.18.0])
])
AC_DEFUN([LIBVIRT_CHECK_CURL],[
diff --git a/m4/virt-dbus.m4 b/m4/virt-dbus.m4
index 8e1fad1..f5af1a8 100644
--- a/m4/virt-dbus.m4
+++ b/m4/virt-dbus.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_DBUS],[
- LIBVIRT_ARG_WITH([DBUS], [dbus-1], [check], [1.0.0])
+ LIBVIRT_ARG_WITH_FEATURE([DBUS], [dbus-1], [check], [1.0.0])
])
AC_DEFUN([LIBVIRT_CHECK_DBUS],[
diff --git a/m4/virt-default-editor.m4 b/m4/virt-default-editor.m4
index 0d50c35..0c8e1e0 100644
--- a/m4/virt-default-editor.m4
+++ b/m4/virt-default-editor.m4
@@ -18,8 +18,8 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_DEFAULT_EDITOR], [
- LIBVIRT_ARG_WITH_ALT([DEFAULT_EDITOR],
- [Editor to use for interactive commands], [vi])
+ LIBVIRT_ARG_WITH([DEFAULT_EDITOR],
+ [Editor to use for interactive commands], [vi])
])
AC_DEFUN([LIBVIRT_CHECK_DEFAULT_EDITOR], [
diff --git a/m4/virt-driver-bhyve.m4 b/m4/virt-driver-bhyve.m4
index 1927929..f89a5f8 100644
--- a/m4/virt-driver-bhyve.m4
+++ b/m4/virt-driver-bhyve.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_ARG_BHYVE],[
- LIBVIRT_ARG_WITH([BHYVE], [BHyVe], [check])
+ LIBVIRT_ARG_WITH_FEATURE([BHYVE], [BHyVe], [check])
])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_BHYVE],[
diff --git a/m4/virt-driver-esx.m4 b/m4/virt-driver-esx.m4
index c751d6d..4a2944b 100644
--- a/m4/virt-driver-esx.m4
+++ b/m4/virt-driver-esx.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_ARG_ESX], [
- LIBVIRT_ARG_WITH([ESX], [ESX], [check])
+ LIBVIRT_ARG_WITH_FEATURE([ESX], [ESX], [check])
])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_ESX], [
diff --git a/m4/virt-driver-hyperv.m4 b/m4/virt-driver-hyperv.m4
index d99f8f6..f276a88 100644
--- a/m4/virt-driver-hyperv.m4
+++ b/m4/virt-driver-hyperv.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_ARG_HYPERV], [
- LIBVIRT_ARG_WITH([HYPERV], [Hyper-V], [check])
+ LIBVIRT_ARG_WITH_FEATURE([HYPERV], [Hyper-V], [check])
])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_HYPERV], [
diff --git a/m4/virt-driver-interface.m4 b/m4/virt-driver-interface.m4
index 5b38516..68a0219 100644
--- a/m4/virt-driver-interface.m4
+++ b/m4/virt-driver-interface.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_ARG_INTERFACE], [
- LIBVIRT_ARG_WITH([INTERFACE], [host interface driver], [check])
+ LIBVIRT_ARG_WITH_FEATURE([INTERFACE], [host interface driver], [check])
])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_INTERFACE], [
diff --git a/m4/virt-driver-libvirtd.m4 b/m4/virt-driver-libvirtd.m4
index 5d82c15..090f953 100644
--- a/m4/virt-driver-libvirtd.m4
+++ b/m4/virt-driver-libvirtd.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_ARG_LIBVIRTD], [
- LIBVIRT_ARG_WITH([LIBVIRTD], [libvirtd], [yes])
+ LIBVIRT_ARG_WITH_FEATURE([LIBVIRTD], [libvirtd], [yes])
])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBVIRTD], [
diff --git a/m4/virt-driver-libxl.m4 b/m4/virt-driver-libxl.m4
index 0430ea3..96a9d47 100644
--- a/m4/virt-driver-libxl.m4
+++ b/m4/virt-driver-libxl.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_ARG_LIBXL], [
- LIBVIRT_ARG_WITH([LIBXL], [libxenlight], [check])
+ LIBVIRT_ARG_WITH_FEATURE([LIBXL], [libxenlight], [check])
])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [
diff --git a/m4/virt-driver-lxc.m4 b/m4/virt-driver-lxc.m4
index c8448ee..d2951b5 100644
--- a/m4/virt-driver-lxc.m4
+++ b/m4/virt-driver-lxc.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_ARG_LXC], [
- LIBVIRT_ARG_WITH([LXC], [Linux Container], [check])
+ LIBVIRT_ARG_WITH_FEATURE([LXC], [Linux Container], [check])
])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_LXC], [
diff --git a/m4/virt-driver-modules.m4 b/m4/virt-driver-modules.m4
index d2f6668..ba65c3b 100644
--- a/m4/virt-driver-modules.m4
+++ b/m4/virt-driver-modules.m4
@@ -18,8 +18,8 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_DRIVER_MODULES], [
- LIBVIRT_ARG_WITH_ALT([DRIVER_MODULES], [build drivers as loadable modules],
- [check])
+ LIBVIRT_ARG_WITH([DRIVER_MODULES], [build drivers as loadable modules],
+ [check])
])
AC_DEFUN([LIBVIRT_CHECK_DRIVER_MODULES], [
diff --git a/m4/virt-driver-network.m4 b/m4/virt-driver-network.m4
index ab7b901..1fc9b20 100644
--- a/m4/virt-driver-network.m4
+++ b/m4/virt-driver-network.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_ARG_NETWORK], [
- LIBVIRT_ARG_WITH_ALT([NETWORK], [with virtual network driver], [yes])
+ LIBVIRT_ARG_WITH([NETWORK], [with virtual network driver], [yes])
])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_NETWORK], [
diff --git a/m4/virt-driver-openvz.m4 b/m4/virt-driver-openvz.m4
index bd00f69..3ad682b 100644
--- a/m4/virt-driver-openvz.m4
+++ b/m4/virt-driver-openvz.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_ARG_OPENVZ], [
- LIBVIRT_ARG_WITH([OPENVZ], [OpenVZ], [check])
+ LIBVIRT_ARG_WITH_FEATURE([OPENVZ], [OpenVZ], [check])
])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_OPENVZ], [
diff --git a/m4/virt-driver-phyp.m4 b/m4/virt-driver-phyp.m4
index fb4189e..7861bf2 100644
--- a/m4/virt-driver-phyp.m4
+++ b/m4/virt-driver-phyp.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_ARG_PHYP], [
- LIBVIRT_ARG_WITH([PHYP], [PHYP], [check])
+ LIBVIRT_ARG_WITH_FEATURE([PHYP], [PHYP], [check])
])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_PHYP], [
diff --git a/m4/virt-driver-qemu.m4 b/m4/virt-driver-qemu.m4
index 6586be0..b9bafda 100644
--- a/m4/virt-driver-qemu.m4
+++ b/m4/virt-driver-qemu.m4
@@ -18,11 +18,11 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_ARG_QEMU], [
- LIBVIRT_ARG_WITH([QEMU], [QEMU/KVM], [yes])
- LIBVIRT_ARG_WITH_ALT([QEMU_USER], [username to run QEMU system instance as],
- ['platform dependent'])
- LIBVIRT_ARG_WITH_ALT([QEMU_GROUP], [groupname to run QEMU system instance as],
- ['platform dependent'])
+ LIBVIRT_ARG_WITH_FEATURE([QEMU], [QEMU/KVM], [yes])
+ LIBVIRT_ARG_WITH([QEMU_USER], [username to run QEMU system instance as],
+ ['platform dependent'])
+ LIBVIRT_ARG_WITH([QEMU_GROUP], [groupname to run QEMU system instance as],
+ ['platform dependent'])
])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_QEMU], [
diff --git a/m4/virt-driver-remote.m4 b/m4/virt-driver-remote.m4
index 0b1f02e..c7af5b3 100644
--- a/m4/virt-driver-remote.m4
+++ b/m4/virt-driver-remote.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_ARG_REMOTE], [
- LIBVIRT_ARG_WITH([REMOTE], [remote driver], [yes])
+ LIBVIRT_ARG_WITH_FEATURE([REMOTE], [remote driver], [yes])
])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_REMOTE], [
diff --git a/m4/virt-driver-test.m4 b/m4/virt-driver-test.m4
index fd218f0..460d1f4 100644
--- a/m4/virt-driver-test.m4
+++ b/m4/virt-driver-test.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_ARG_TEST], [
- LIBVIRT_ARG_WITH([TEST], [test driver], [yes])
+ LIBVIRT_ARG_WITH_FEATURE([TEST], [test driver], [yes])
])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_TEST], [
diff --git a/m4/virt-driver-uml.m4 b/m4/virt-driver-uml.m4
index 24ca938..9b406a5 100644
--- a/m4/virt-driver-uml.m4
+++ b/m4/virt-driver-uml.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_ARG_UML],[
- LIBVIRT_ARG_WITH([UML], [UML], [check])
+ LIBVIRT_ARG_WITH_FEATURE([UML], [UML], [check])
])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_UML],[
diff --git a/m4/virt-driver-vbox.m4 b/m4/virt-driver-vbox.m4
index b84ce22..589b1c3 100644
--- a/m4/virt-driver-vbox.m4
+++ b/m4/virt-driver-vbox.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_ARG_VBOX], [
- LIBVIRT_ARG_WITH([VBOX], [VirtualBox XPCOMC], [yes])
+ LIBVIRT_ARG_WITH_FEATURE([VBOX], [VirtualBox XPCOMC], [yes])
])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_VBOX], [
diff --git a/m4/virt-driver-vmware.m4 b/m4/virt-driver-vmware.m4
index ed73087..06504eb 100644
--- a/m4/virt-driver-vmware.m4
+++ b/m4/virt-driver-vmware.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_ARG_VMWARE], [
- LIBVIRT_ARG_WITH([VMWARE], [VMware], [yes])
+ LIBVIRT_ARG_WITH_FEATURE([VMWARE], [VMware], [yes])
])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_VMWARE], [
diff --git a/m4/virt-driver-vz.m4 b/m4/virt-driver-vz.m4
index b377749..9a8bc42 100644
--- a/m4/virt-driver-vz.m4
+++ b/m4/virt-driver-vz.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_ARG_VZ],[
- LIBVIRT_ARG_WITH([VZ], [Virtuozzo], [check])
+ LIBVIRT_ARG_WITH_FEATURE([VZ], [Virtuozzo], [check])
])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_VZ],[
diff --git a/m4/virt-driver-xen.m4 b/m4/virt-driver-xen.m4
index 896e669..2a26863 100644
--- a/m4/virt-driver-xen.m4
+++ b/m4/virt-driver-xen.m4
@@ -18,8 +18,8 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_ARG_XEN], [
- LIBVIRT_ARG_WITH([XEN], [XEN], [check])
- LIBVIRT_ARG_WITH([XEN_INOTIFY], [XEN inotify], [check])
+ LIBVIRT_ARG_WITH_FEATURE([XEN], [XEN], [check])
+ LIBVIRT_ARG_WITH_FEATURE([XEN_INOTIFY], [XEN inotify], [check])
])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_XEN], [
diff --git a/m4/virt-driver-xenapi.m4 b/m4/virt-driver-xenapi.m4
index 28c092d..d2181a2 100644
--- a/m4/virt-driver-xenapi.m4
+++ b/m4/virt-driver-xenapi.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_DRIVER_ARG_XENAPI], [
- LIBVIRT_ARG_WITH([XENAPI], [XenAPI], [check])
+ LIBVIRT_ARG_WITH_FEATURE([XENAPI], [XenAPI], [check])
])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_XENAPI], [
diff --git a/m4/virt-dtrace.m4 b/m4/virt-dtrace.m4
index 6dee416..e072b63 100644
--- a/m4/virt-dtrace.m4
+++ b/m4/virt-dtrace.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_DTRACE], [
- LIBVIRT_ARG_WITH_ALT([DTRACE], [use dtrace for static probing], [check])
+ LIBVIRT_ARG_WITH([DTRACE], [use dtrace for static probing], [check])
])
AC_DEFUN([LIBVIRT_CHECK_DTRACE], [
diff --git a/m4/virt-firewalld.m4 b/m4/virt-firewalld.m4
index f028304..08d2ff8 100644
--- a/m4/virt-firewalld.m4
+++ b/m4/virt-firewalld.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_FIREWALLD], [
- LIBVIRT_ARG_WITH([FIREWALLD], [firewalld], [check])
+ LIBVIRT_ARG_WITH_FEATURE([FIREWALLD], [firewalld], [check])
])
AC_DEFUN([LIBVIRT_CHECK_FIREWALLD], [
diff --git a/m4/virt-fuse.m4 b/m4/virt-fuse.m4
index 5f25b32..cc5726f 100644
--- a/m4/virt-fuse.m4
+++ b/m4/virt-fuse.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_FUSE],[
- LIBVIRT_ARG_WITH([FUSE], [fuse], [check], [2.8.6])
+ LIBVIRT_ARG_WITH_FEATURE([FUSE], [fuse], [check], [2.8.6])
])
AC_DEFUN([LIBVIRT_CHECK_FUSE],[
diff --git a/m4/virt-gluster.m4 b/m4/virt-gluster.m4
index 5398cc3..7edff40 100644
--- a/m4/virt-gluster.m4
+++ b/m4/virt-gluster.m4
@@ -20,7 +20,7 @@ dnl
dnl Currently tested against Fedora 19 with glusterfs 3.4.1; earlier
dnl versions may be possible but only with further testing
AC_DEFUN([LIBVIRT_ARG_GLUSTER],[
- LIBVIRT_ARG_WITH([GLUSTERFS], [glusterfs], [check], [3.4.1])
+ LIBVIRT_ARG_WITH_FEATURE([GLUSTERFS], [glusterfs], [check], [3.4.1])
])
AC_DEFUN([LIBVIRT_CHECK_GLUSTER],[
diff --git a/m4/virt-gnutls.m4 b/m4/virt-gnutls.m4
index 77122c1..e7cfb6a 100644
--- a/m4/virt-gnutls.m4
+++ b/m4/virt-gnutls.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_GNUTLS],[
- LIBVIRT_ARG_WITH([GNUTLS], [gnutls], [check], [2.2.0])
+ LIBVIRT_ARG_WITH_FEATURE([GNUTLS], [gnutls], [check], [2.2.0])
])
AC_DEFUN([LIBVIRT_CHECK_GNUTLS],[
diff --git a/m4/virt-hal.m4 b/m4/virt-hal.m4
index 7ed4488..e37bbf9 100644
--- a/m4/virt-hal.m4
+++ b/m4/virt-hal.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_HAL],[
- LIBVIRT_ARG_WITH([HAL], [hal], [check], [0.5.0])
+ LIBVIRT_ARG_WITH_FEATURE([HAL], [hal], [check], [0.5.0])
])
AC_DEFUN([LIBVIRT_CHECK_HAL],[
diff --git a/m4/virt-host-validate.m4 b/m4/virt-host-validate.m4
index 0970fa1..643cd8f 100644
--- a/m4/virt-host-validate.m4
+++ b/m4/virt-host-validate.m4
@@ -16,7 +16,7 @@ dnl License along with this library. If not, see
dnl <http://www.gnu.org/licenses/>.
AC_DEFUN([LIBVIRT_ARG_HOST_VALIDATE], [
- LIBVIRT_ARG_WITH_ALT([HOST_VALIDATE], [build virt-host-validate], [check])
+ LIBVIRT_ARG_WITH([HOST_VALIDATE], [build virt-host-validate], [check])
])
AC_DEFUN([LIBVIRT_CHECK_HOST_VALIDATE], [
diff --git a/m4/virt-init-script.m4 b/m4/virt-init-script.m4
index cebac93..757fd10 100644
--- a/m4/virt-init-script.m4
+++ b/m4/virt-init-script.m4
@@ -18,9 +18,9 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_INIT_SCRIPT],[
- LIBVIRT_ARG_WITH_ALT([INIT_SCRIPT],
- [Style of init script to install: redhat, systemd,
- systemd+redhat, upstart, check, none], [check])
+ LIBVIRT_ARG_WITH([INIT_SCRIPT],
+ [Style of init script to install: redhat, systemd,
+ systemd+redhat, upstart, check, none], [check])
])
AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[
diff --git a/m4/virt-libpcap.m4 b/m4/virt-libpcap.m4
index 1175c19..8fa4889 100644
--- a/m4/virt-libpcap.m4
+++ b/m4/virt-libpcap.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_LIBPCAP], [
- LIBVIRT_ARG_WITH_ALT([LIBPCAP], [libpcap location], [check])
+ LIBVIRT_ARG_WITH([LIBPCAP], [libpcap location], [check])
])
AC_DEFUN([LIBVIRT_CHECK_LIBPCAP], [
diff --git a/m4/virt-libssh.m4 b/m4/virt-libssh.m4
index 4107385..7e39277 100644
--- a/m4/virt-libssh.m4
+++ b/m4/virt-libssh.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_LIBSSH],[
- LIBVIRT_ARG_WITH([LIBSSH], [libssh], [check], [0.7])
+ LIBVIRT_ARG_WITH_FEATURE([LIBSSH], [libssh], [check], [0.7])
])
AC_DEFUN([LIBVIRT_CHECK_LIBSSH],[
diff --git a/m4/virt-libxml.m4 b/m4/virt-libxml.m4
index 6a9d911..65012d5 100644
--- a/m4/virt-libxml.m4
+++ b/m4/virt-libxml.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_LIBXML], [
- LIBVIRT_ARG_WITH_ALT([LIBXML], [libxml-2.0 (>= 2.6.0) location], [check])
+ LIBVIRT_ARG_WITH([LIBXML], [libxml-2.0 (>= 2.6.0) location], [check])
])
AC_DEFUN([LIBVIRT_CHECK_LIBXML], [
diff --git a/m4/virt-loader-nvram.m4 b/m4/virt-loader-nvram.m4
index e3e8b82..0eb77fa 100644
--- a/m4/virt-loader-nvram.m4
+++ b/m4/virt-loader-nvram.m4
@@ -18,10 +18,10 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_LOADER_NVRAM], [
- LIBVIRT_ARG_WITH_ALT([LOADER_NVRAM],
- [Pass list of pairs of <loader>:<nvram> paths.
- Both pairs and list items are separated by a colon.],
- [''])
+ LIBVIRT_ARG_WITH([LOADER_NVRAM],
+ [Pass list of pairs of <loader>:<nvram> paths.
+ Both pairs and list items are separated by a colon.],
+ [''])
])
AC_DEFUN([LIBVIRT_CHECK_LOADER_NVRAM], [
diff --git a/m4/virt-login-shell.m4 b/m4/virt-login-shell.m4
index c922e37..3baec54 100644
--- a/m4/virt-login-shell.m4
+++ b/m4/virt-login-shell.m4
@@ -16,7 +16,7 @@ dnl License along with this library. If not, see
dnl <http://www.gnu.org/licenses/>.
AC_DEFUN([LIBVIRT_ARG_LOGIN_SHELL], [
- LIBVIRT_ARG_WITH_ALT([LOGIN_SHELL], [build virt-login-shell], [check])
+ LIBVIRT_ARG_WITH([LOGIN_SHELL], [build virt-login-shell], [check])
])
AC_DEFUN([LIBVIRT_CHECK_LOGIN_SHELL], [
diff --git a/m4/virt-macvtap.m4 b/m4/virt-macvtap.m4
index daf48b0..c5da96e 100644
--- a/m4/virt-macvtap.m4
+++ b/m4/virt-macvtap.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_MACVTAP], [
- LIBVIRT_ARG_WITH_ALT([MACVTAP], [enable macvtap device], [check])
+ LIBVIRT_ARG_WITH([MACVTAP], [enable macvtap device], [check])
])
AC_DEFUN([LIBVIRT_CHECK_MACVTAP], [
diff --git a/m4/virt-netcf.m4 b/m4/virt-netcf.m4
index 19374b2..588b5e7 100644
--- a/m4/virt-netcf.m4
+++ b/m4/virt-netcf.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_NETCF],[
- LIBVIRT_ARG_WITH([NETCF], [netcf], [check], [0.1.4])
+ LIBVIRT_ARG_WITH_FEATURE([NETCF], [netcf], [check], [0.1.4])
])
AC_DEFUN([LIBVIRT_CHECK_NETCF],[
diff --git a/m4/virt-nss.m4 b/m4/virt-nss.m4
index 15030ca..f50b1b9 100644
--- a/m4/virt-nss.m4
+++ b/m4/virt-nss.m4
@@ -18,9 +18,9 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_NSS],[
- LIBVIRT_ARG_WITH_ALT([NSS_PLUGIN],
- [enable Name Service Switch plugin for resolving guest
- IP addresses], [check])
+ LIBVIRT_ARG_WITH([NSS_PLUGIN],
+ [enable Name Service Switch plugin for resolving guest
+ IP addresses], [check])
])
AC_DEFUN([LIBVIRT_CHECK_NSS],[
diff --git a/m4/virt-numactl.m4 b/m4/virt-numactl.m4
index 7dbb1bb..f93ffd5 100644
--- a/m4/virt-numactl.m4
+++ b/m4/virt-numactl.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_NUMACTL],[
- LIBVIRT_ARG_WITH([NUMACTL], [numa], [check])
+ LIBVIRT_ARG_WITH_FEATURE([NUMACTL], [numa], [check])
])
AC_DEFUN([LIBVIRT_CHECK_NUMACTL],[
diff --git a/m4/virt-numad.m4 b/m4/virt-numad.m4
index 5df8cc6..e760dcc 100644
--- a/m4/virt-numad.m4
+++ b/m4/virt-numad.m4
@@ -18,8 +18,8 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_NUMAD], [
- LIBVIRT_ARG_WITH_ALT([NUMAD], [use numad to manage CPU placement dynamically],
- [check])
+ LIBVIRT_ARG_WITH([NUMAD], [use numad to manage CPU placement dynamically],
+ [check])
])
AC_DEFUN([LIBVIRT_CHECK_NUMAD], [
diff --git a/m4/virt-openwsman.m4 b/m4/virt-openwsman.m4
index cd7e9e2..c952ef8 100644
--- a/m4/virt-openwsman.m4
+++ b/m4/virt-openwsman.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_OPENWSMAN],[
- LIBVIRT_ARG_WITH([OPENWSMAN], [openwsman], [check], [2.2.3])
+ LIBVIRT_ARG_WITH_FEATURE([OPENWSMAN], [openwsman], [check], [2.2.3])
])
AC_DEFUN([LIBVIRT_CHECK_OPENWSMAN],[
diff --git a/m4/virt-pciaccess.m4 b/m4/virt-pciaccess.m4
index d96af8b..da92647 100644
--- a/m4/virt-pciaccess.m4
+++ b/m4/virt-pciaccess.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_PCIACCESS],[
- LIBVIRT_ARG_WITH([PCIACCESS], [pciaccess], [check], [0.10.0])
+ LIBVIRT_ARG_WITH_FEATURE([PCIACCESS], [pciaccess], [check], [0.10.0])
])
AC_DEFUN([LIBVIRT_CHECK_PCIACCESS],[
diff --git a/m4/virt-pm-utils.m4 b/m4/virt-pm-utils.m4
index 654aba3..02bf41e 100644
--- a/m4/virt-pm-utils.m4
+++ b/m4/virt-pm-utils.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_PM_UTILS], [
- LIBVIRT_ARG_WITH_ALT([PM_UTILS], [use pm-utils for power management], [check])
+ LIBVIRT_ARG_WITH([PM_UTILS], [use pm-utils for power management], [check])
])
AC_DEFUN([LIBVIRT_CHECK_PM_UTILS], [
diff --git a/m4/virt-polkit.m4 b/m4/virt-polkit.m4
index fb03194..7bdbf80 100644
--- a/m4/virt-polkit.m4
+++ b/m4/virt-polkit.m4
@@ -18,8 +18,8 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_POLKIT], [
- LIBVIRT_ARG_WITH_ALT([POLKIT], [use PolicyKit for UNIX socket access checks],
- [check])
+ LIBVIRT_ARG_WITH([POLKIT], [use PolicyKit for UNIX socket access checks],
+ [check])
])
AC_DEFUN([LIBVIRT_CHECK_POLKIT], [
diff --git a/m4/virt-readline.m4 b/m4/virt-readline.m4
index e32f5f5..ee70ea3 100644
--- a/m4/virt-readline.m4
+++ b/m4/virt-readline.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_READLINE],[
- LIBVIRT_ARG_WITH([READLINE], [readline], [check])
+ LIBVIRT_ARG_WITH_FEATURE([READLINE], [readline], [check])
])
AC_DEFUN([LIBVIRT_CHECK_READLINE],[
diff --git a/m4/virt-sanlock.m4 b/m4/virt-sanlock.m4
index 97bdf0c..e4476ca 100644
--- a/m4/virt-sanlock.m4
+++ b/m4/virt-sanlock.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_SANLOCK],[
- LIBVIRT_ARG_WITH([SANLOCK], [sanlock-client], [check])
+ LIBVIRT_ARG_WITH_FEATURE([SANLOCK], [sanlock-client], [check])
])
AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[
diff --git a/m4/virt-sasl.m4 b/m4/virt-sasl.m4
index 15b1ce9..6ef24fd 100644
--- a/m4/virt-sasl.m4
+++ b/m4/virt-sasl.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_SASL],[
- LIBVIRT_ARG_WITH([SASL], [sasl], [check])
+ LIBVIRT_ARG_WITH_FEATURE([SASL], [sasl], [check])
])
AC_DEFUN([LIBVIRT_CHECK_SASL],[
diff --git a/m4/virt-secdriver-apparmor.m4 b/m4/virt-secdriver-apparmor.m4
index d3d96ec..1894e66 100644
--- a/m4/virt-secdriver-apparmor.m4
+++ b/m4/virt-secdriver-apparmor.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_SECDRIVER_ARG_APPARMOR], [
- LIBVIRT_ARG_WITH_ALT([SECDRIVER_APPARMOR], [use AppArmor security driver], [check])
+ LIBVIRT_ARG_WITH([SECDRIVER_APPARMOR], [use AppArmor security driver], [check])
])
AC_DEFUN([LIBVIRT_SECDRIVER_CHECK_APPARMOR], [
@@ -37,7 +37,7 @@ AC_DEFUN([LIBVIRT_SECDRIVER_CHECK_APPARMOR], [
fi
AM_CONDITIONAL([WITH_SECDRIVER_APPARMOR], [test "$with_secdriver_apparmor" != "no"])
- LIBVIRT_ARG_WITH_ALT([APPARMOR_PROFILES], [install apparmor profiles], [no])
+ LIBVIRT_ARG_WITH([APPARMOR_PROFILES], [install apparmor profiles], [no])
if test "$with_apparmor" = "no"; then
with_apparmor_profiles="no"
fi
diff --git a/m4/virt-secdriver-selinux.m4 b/m4/virt-secdriver-selinux.m4
index f7220cb..a48569f 100644
--- a/m4/virt-secdriver-selinux.m4
+++ b/m4/virt-secdriver-selinux.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_SECDRIVER_ARG_SELINUX], [
- LIBVIRT_ARG_WITH_ALT([SECDRIVER_SELINUX], [use SELinux security driver], [check])
+ LIBVIRT_ARG_WITH([SECDRIVER_SELINUX], [use SELinux security driver], [check])
])
AC_DEFUN([LIBVIRT_SECDRIVER_CHECK_SELINUX], [
diff --git a/m4/virt-selinux.m4 b/m4/virt-selinux.m4
index 2f5b10b..fe274fa 100644
--- a/m4/virt-selinux.m4
+++ b/m4/virt-selinux.m4
@@ -18,8 +18,8 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_SELINUX],[
- LIBVIRT_ARG_WITH([SELINUX], [SELinux], [check])
- LIBVIRT_ARG_WITH_ALT([SELINUX_MOUNT], [set SELinux mount point], [check])
+ LIBVIRT_ARG_WITH_FEATURE([SELINUX], [SELinux], [check])
+ LIBVIRT_ARG_WITH([SELINUX_MOUNT], [set SELinux mount point], [check])
])
AC_DEFUN([LIBVIRT_CHECK_SELINUX],[
diff --git a/m4/virt-ssh2.m4 b/m4/virt-ssh2.m4
index da8ec5a..f712f81 100644
--- a/m4/virt-ssh2.m4
+++ b/m4/virt-ssh2.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_SSH2],[
- LIBVIRT_ARG_WITH([SSH2], [libssh2], [check], [1.3])
+ LIBVIRT_ARG_WITH_FEATURE([SSH2], [libssh2], [check], [1.3])
])
AC_DEFUN([LIBVIRT_CHECK_SSH2],[
diff --git a/m4/virt-storage-dir.m4 b/m4/virt-storage-dir.m4
index 0f6880d..798bf93 100644
--- a/m4/virt-storage-dir.m4
+++ b/m4/virt-storage-dir.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_STORAGE_ARG_DIR], [
- LIBVIRT_ARG_WITH([STORAGE_DIR], [directory backend for the storage driver], [yes])
+ LIBVIRT_ARG_WITH_FEATURE([STORAGE_DIR], [directory backend for the storage driver], [yes])
])
AC_DEFUN([LIBVIRT_STORAGE_CHECK_DIR], [
diff --git a/m4/virt-storage-disk.m4 b/m4/virt-storage-disk.m4
index 3c4c848..7429688 100644
--- a/m4/virt-storage-disk.m4
+++ b/m4/virt-storage-disk.m4
@@ -18,8 +18,8 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_STORAGE_ARG_DISK], [
- LIBVIRT_ARG_WITH([STORAGE_DISK], [GPartd Disk backend for the storage driver],
- [check])
+ LIBVIRT_ARG_WITH_FEATURE([STORAGE_DISK], [GPartd Disk backend for the storage driver],
+ [check])
])
AC_DEFUN([LIBVIRT_STORAGE_CHECK_DISK], [
diff --git a/m4/virt-storage-fs.m4 b/m4/virt-storage-fs.m4
index f2c7130..6c61e61 100644
--- a/m4/virt-storage-fs.m4
+++ b/m4/virt-storage-fs.m4
@@ -18,8 +18,8 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_STORAGE_ARG_FS], [
- LIBVIRT_ARG_WITH([STORAGE_FS], [FileSystem backend for the storage driver],
- [check])
+ LIBVIRT_ARG_WITH_FEATURE([STORAGE_FS], [FileSystem backend for the storage driver],
+ [check])
])
AC_DEFUN([LIBVIRT_STORAGE_CHECK_FS], [
diff --git a/m4/virt-storage-gluster.m4 b/m4/virt-storage-gluster.m4
index 0627299..0a2406f 100644
--- a/m4/virt-storage-gluster.m4
+++ b/m4/virt-storage-gluster.m4
@@ -18,8 +18,8 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_STORAGE_ARG_GLUSTER], [
- LIBVIRT_ARG_WITH([STORAGE_GLUSTER], [Gluster backend for the storage driver],
- [check])
+ LIBVIRT_ARG_WITH_FEATURE([STORAGE_GLUSTER], [Gluster backend for the storage driver],
+ [check])
])
AC_DEFUN([LIBVIRT_STORAGE_CHECK_GLUSTER], [
diff --git a/m4/virt-storage-iscsi.m4 b/m4/virt-storage-iscsi.m4
index 6ad61fc..eb0b086 100644
--- a/m4/virt-storage-iscsi.m4
+++ b/m4/virt-storage-iscsi.m4
@@ -18,8 +18,8 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_STORAGE_ARG_ISCSI], [
- LIBVIRT_ARG_WITH([STORAGE_ISCSI], [iSCSI backend for the storage driver],
- [check])
+ LIBVIRT_ARG_WITH_FEATURE([STORAGE_ISCSI], [iSCSI backend for the storage driver],
+ [check])
])
AC_DEFUN([LIBVIRT_STORAGE_CHECK_ISCSI], [
diff --git a/m4/virt-storage-lvm.m4 b/m4/virt-storage-lvm.m4
index a393743..a0ccca7 100644
--- a/m4/virt-storage-lvm.m4
+++ b/m4/virt-storage-lvm.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_STORAGE_ARG_LVM], [
- LIBVIRT_ARG_WITH([STORAGE_LVM], [LVM backend for storage driver], [check])
+ LIBVIRT_ARG_WITH_FEATURE([STORAGE_LVM], [LVM backend for storage driver], [check])
])
AC_DEFUN([LIBVIRT_STORAGE_CHECK_LVM], [
diff --git a/m4/virt-storage-mpath.m4 b/m4/virt-storage-mpath.m4
index b20d086..d4f8ecf 100644
--- a/m4/virt-storage-mpath.m4
+++ b/m4/virt-storage-mpath.m4
@@ -18,8 +18,8 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_STORAGE_ARG_MPATH], [
- LIBVIRT_ARG_WITH([STORAGE_MPATH], [mpath backend for the storage driver],
- [check])
+ LIBVIRT_ARG_WITH_FEATURE([STORAGE_MPATH], [mpath backend for the storage driver],
+ [check])
])
AC_DEFUN([LIBVIRT_STORAGE_CHECK_MPATH], [
diff --git a/m4/virt-storage-rbd.m4 b/m4/virt-storage-rbd.m4
index 6569bb4..0104b7c 100644
--- a/m4/virt-storage-rbd.m4
+++ b/m4/virt-storage-rbd.m4
@@ -18,8 +18,8 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_STORAGE_ARG_RBD], [
- LIBVIRT_ARG_WITH([STORAGE_RBD],
- [RADOS Block Device backend for the storage driver], [check])
+ LIBVIRT_ARG_WITH_FEATURE([STORAGE_RBD],
+ [RADOS Block Device backend for the storage driver], [check])
])
AC_DEFUN([LIBVIRT_STORAGE_CHECK_RBD], [
diff --git a/m4/virt-storage-scsi.m4 b/m4/virt-storage-scsi.m4
index dfaa07e..ea4e47c 100644
--- a/m4/virt-storage-scsi.m4
+++ b/m4/virt-storage-scsi.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_STORAGE_ARG_SCSI], [
- LIBVIRT_ARG_WITH([STORAGE_SCSI], [SCSI backend for the storage driver], [check])
+ LIBVIRT_ARG_WITH_FEATURE([STORAGE_SCSI], [SCSI backend for the storage driver], [check])
])
AC_DEFUN([LIBVIRT_STORAGE_CHECK_SCSI], [
diff --git a/m4/virt-storage-sheepdog.m4 b/m4/virt-storage-sheepdog.m4
index a9f4c83..aa5587f 100644
--- a/m4/virt-storage-sheepdog.m4
+++ b/m4/virt-storage-sheepdog.m4
@@ -18,8 +18,8 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_STORAGE_ARG_SHEEPDOG], [
- LIBVIRT_ARG_WITH([STORAGE_SHEEPDOG],
- [with Sheepdog backend for the storage driver], [check])
+ LIBVIRT_ARG_WITH_FEATURE([STORAGE_SHEEPDOG],
+ [with Sheepdog backend for the storage driver], [check])
])
AC_DEFUN([LIBVIRT_STORAGE_CHECK_SHEEPDOG], [
diff --git a/m4/virt-storage-zfs.m4 b/m4/virt-storage-zfs.m4
index 5439b8b..0c52264 100644
--- a/m4/virt-storage-zfs.m4
+++ b/m4/virt-storage-zfs.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_STORAGE_ARG_ZFS], [
- LIBVIRT_ARG_WITH([STORAGE_ZFS], [ZFS backend for the storage driver], [check])
+ LIBVIRT_ARG_WITH_FEATURE([STORAGE_ZFS], [ZFS backend for the storage driver], [check])
])
AC_DEFUN([LIBVIRT_STORAGE_CHECK_ZFS], [
diff --git a/m4/virt-sysctl.m4 b/m4/virt-sysctl.m4
index 101733c..3a59e3e 100644
--- a/m4/virt-sysctl.m4
+++ b/m4/virt-sysctl.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_SYSCTL_CONFIG], [
- LIBVIRT_ARG_WITH_ALT([SYSCTL], [Whether to install sysctl configs], [check])
+ LIBVIRT_ARG_WITH([SYSCTL], [Whether to install sysctl configs], [check])
])
AC_DEFUN([LIBVIRT_CHECK_SYSCTL_CONFIG], [
diff --git a/m4/virt-tls-priority.m4 b/m4/virt-tls-priority.m4
index 1c3539e..f7a6c56 100644
--- a/m4/virt-tls-priority.m4
+++ b/m4/virt-tls-priority.m4
@@ -18,9 +18,9 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_TLS_PRIORITY], [
- LIBVIRT_ARG_WITH_ALT([TLS_PRIORITY],
- [set the default TLS session priority string],
- [NORMAL])
+ LIBVIRT_ARG_WITH([TLS_PRIORITY],
+ [set the default TLS session priority string],
+ [NORMAL])
])
AC_DEFUN([LIBVIRT_CHECK_TLS_PRIORITY], [
diff --git a/m4/virt-udev.m4 b/m4/virt-udev.m4
index 363aa98..85ca2cb 100644
--- a/m4/virt-udev.m4
+++ b/m4/virt-udev.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_UDEV],[
- LIBVIRT_ARG_WITH([UDEV], [libudev], [check], [145])
+ LIBVIRT_ARG_WITH_FEATURE([UDEV], [libudev], [check], [145])
])
AC_DEFUN([LIBVIRT_CHECK_UDEV],[
diff --git a/m4/virt-virtualport.m4 b/m4/virt-virtualport.m4
index 9074fb6..b758efc 100644
--- a/m4/virt-virtualport.m4
+++ b/m4/virt-virtualport.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_VIRTUALPORT], [
- LIBVIRT_ARG_WITH_ALT([VIRTUALPORT], [enable virtual port support], [check])
+ LIBVIRT_ARG_WITH([VIRTUALPORT], [enable virtual port support], [check])
])
AC_DEFUN([LIBVIRT_CHECK_VIRTUALPORT],[
diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4
index f0cd08b..1283a0f 100644
--- a/m4/virt-wireshark.m4
+++ b/m4/virt-wireshark.m4
@@ -18,10 +18,10 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_WIRESHARK],[
- LIBVIRT_ARG_WITH([WIRESHARK_DISSECTOR], [wireshark], [check], [1.11.3])
- LIBVIRT_ARG_WITH_ALT([WS_PLUGINDIR],
- [wireshark plugins directory for use when installing
- wireshark plugin], [check])
+ LIBVIRT_ARG_WITH_FEATURE([WIRESHARK_DISSECTOR], [wireshark], [check], [1.11.3])
+ LIBVIRT_ARG_WITH([WS_PLUGINDIR],
+ [wireshark plugins directory for use when installing
+ wireshark plugin], [check])
])
AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[
diff --git a/m4/virt-xml-catalog.m4 b/m4/virt-xml-catalog.m4
index c75476d..a25ae89 100644
--- a/m4/virt-xml-catalog.m4
+++ b/m4/virt-xml-catalog.m4
@@ -18,9 +18,9 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_XML_CATALOG], [
- LIBVIRT_ARG_WITH_ALT([XML_CATALOG_FILE],
- [path to XML catalog file for validating generated html],
- ['/etc/xml/catalog'])
+ LIBVIRT_ARG_WITH([XML_CATALOG_FILE],
+ [path to XML catalog file for validating generated html],
+ ['/etc/xml/catalog'])
])
AC_DEFUN([LIBVIRT_CHECK_XML_CATALOG], [
diff --git a/m4/virt-yajl.m4 b/m4/virt-yajl.m4
index 0103f72..c4ea010 100644
--- a/m4/virt-yajl.m4
+++ b/m4/virt-yajl.m4
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl
AC_DEFUN([LIBVIRT_ARG_YAJL],[
- LIBVIRT_ARG_WITH([YAJL], [yajl], [check])
+ LIBVIRT_ARG_WITH_FEATURE([YAJL], [yajl], [check])
])
AC_DEFUN([LIBVIRT_CHECK_YAJL],[
--
2.7.4
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
