[libvirt] [PATCH 11/89] m4/virt: introduce LIBVIRT_ARG_* macros for all library checks

Usage of AC_REQUIRE will mess with order how LIBVIRT_CHECK_* macros are composed into configure.ac. This ensures that the output of configure --help is properly ordered and grouped into sections. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- configure.ac | 33 +++++++++++++++++++++++++++++++++ m4/virt-apparmor.m4 | 8 +++++--- m4/virt-attr.m4 | 5 ++++- m4/virt-audit.m4 | 5 ++++- m4/virt-avahi.m4 | 5 ++++- m4/virt-blkid.m4 | 5 ++++- m4/virt-capng.m4 | 5 ++++- m4/virt-curl.m4 | 5 ++++- m4/virt-dbus.m4 | 5 ++++- m4/virt-driver-bhyve.m4 | 4 +++- m4/virt-driver-uml.m4 | 4 +++- m4/virt-driver-vz.m4 | 4 +++- m4/virt-fuse.m4 | 5 ++++- m4/virt-gluster.m4 | 5 ++++- m4/virt-gnutls.m4 | 5 ++++- m4/virt-hal.m4 | 5 ++++- m4/virt-host-validate.m4 | 4 +++- m4/virt-init-script.m4 | 4 +++- m4/virt-libssh.m4 | 5 ++++- m4/virt-login-shell.m4 | 4 +++- m4/virt-netcf.m4 | 5 ++++- m4/virt-nss.m4 | 4 +++- m4/virt-numactl.m4 | 5 ++++- m4/virt-openwsman.m4 | 5 ++++- m4/virt-pciaccess.m4 | 5 ++++- m4/virt-readline.m4 | 4 +++- m4/virt-sanlock.m4 | 5 ++++- m4/virt-sasl.m4 | 5 ++++- m4/virt-selinux.m4 | 8 +++++--- m4/virt-ssh2.m4 | 5 ++++- m4/virt-udev.m4 | 5 ++++- m4/virt-wireshark.m4 | 8 +++++--- m4/virt-yajl.m4 | 4 +++- 33 files changed, 155 insertions(+), 38 deletions(-) diff --git a/configure.ac b/configure.ac index 3ae7034e1c..a710a4f050 100644 --- a/configure.ac +++ b/configure.ac @@ -232,6 +232,33 @@ LIBVIRT_COMPILE_PIE LIBVIRT_LINKER_RELRO LIBVIRT_LINKER_NO_INDIRECT +LIBVIRT_ARG_APPARMOR +LIBVIRT_ARG_ATTR +LIBVIRT_ARG_AUDIT +LIBVIRT_ARG_AVAHI +LIBVIRT_ARG_BLKID +LIBVIRT_ARG_CAPNG +LIBVIRT_ARG_CURL +LIBVIRT_ARG_DBUS +LIBVIRT_ARG_FUSE +LIBVIRT_ARG_GLUSTER +LIBVIRT_ARG_GNUTLS +LIBVIRT_ARG_HAL +LIBVIRT_ARG_LIBSSH +LIBVIRT_ARG_NETCF +LIBVIRT_ARG_NSS +LIBVIRT_ARG_NUMACTL +LIBVIRT_ARG_OPENWSMAN +LIBVIRT_ARG_PCIACCESS +LIBVIRT_ARG_READLINE +LIBVIRT_ARG_SANLOCK +LIBVIRT_ARG_SASL +LIBVIRT_ARG_SELINUX +LIBVIRT_ARG_SSH2 +LIBVIRT_ARG_UDEV +LIBVIRT_ARG_WIRESHARK +LIBVIRT_ARG_YAJL + LIBVIRT_CHECK_APPARMOR LIBVIRT_CHECK_ATTR LIBVIRT_CHECK_AUDIT @@ -475,6 +502,7 @@ if test x"$enable_debug" = x"yes"; then AC_DEFINE([ENABLE_DEBUG], [], [whether debugging is enabled]) fi +LIBVIRT_ARG_INIT_SCRIPT LIBVIRT_CHECK_INIT_SCRIPT AC_MSG_CHECKING([for whether to install sysctl config]) @@ -896,12 +924,14 @@ dnl dnl Check for virt-login-shell dnl +LIBVIRT_ARG_LOGIN_SHELL LIBVIRT_CHECK_LOGIN_SHELL dnl dnl Check for virt-host-validate dnl +LIBVIRT_ARG_HOST_VALIDATE LIBVIRT_CHECK_HOST_VALIDATE AM_CONDITIONAL([WITH_SETUID_RPC_CLIENT], [test "$with_lxc$with_login_shell" != "nono"]) @@ -910,12 +940,14 @@ dnl dnl Checks for the Parallels driver dnl +LIBVIRT_DRIVER_ARG_VZ LIBVIRT_DRIVER_CHECK_VZ dnl dnl Checks for bhyve driver dnl +LIBVIRT_DRIVER_ARG_BHYVE LIBVIRT_DRIVER_CHECK_BHYVE @@ -1279,6 +1311,7 @@ dnl dnl Checks for the UML driver dnl +LIBVIRT_DRIVER_ARG_UML LIBVIRT_DRIVER_CHECK_UML dnl diff --git a/m4/virt-apparmor.m4 b/m4/virt-apparmor.m4 index d60bb177fe..22818f2a98 100644 --- a/m4/virt-apparmor.m4 +++ b/m4/virt-apparmor.m4 @@ -17,13 +17,15 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_APPARMOR],[ +AC_DEFUN([LIBVIRT_ARG_APPARMOR],[ LIBVIRT_ARG_WITH([APPARMOR], [AppArmor], [check]) + LIBVIRT_ARG_WITH_ALT([APPARMOR_MOUNT], [set AppArmor mount point], [check]) +]) + +AC_DEFUN([LIBVIRT_CHECK_APPARMOR],[ LIBVIRT_CHECK_LIB([APPARMOR], [apparmor], [aa_change_profile], [sys/apparmor.h]) - LIBVIRT_ARG_WITH_ALT([APPARMOR_MOUNT], [set AppArmor mount point], [check]) - if test "$with_apparmor" = "yes"; then AC_DEFINE_UNQUOTED([APPARMOR_DIR], "/etc/apparmor.d", diff --git a/m4/virt-attr.m4 b/m4/virt-attr.m4 index b36498f9de..dcb2678b19 100644 --- a/m4/virt-attr.m4 +++ b/m4/virt-attr.m4 @@ -1,7 +1,10 @@ dnl The libattr.so library -AC_DEFUN([LIBVIRT_CHECK_ATTR],[ +AC_DEFUN([LIBVIRT_ARG_ATTR],[ LIBVIRT_ARG_WITH([ATTR], [attr], [check]) +]) + +AC_DEFUN([LIBVIRT_CHECK_ATTR],[ LIBVIRT_CHECK_LIB([ATTR], [attr], [getxattr], [attr/xattr.h]) ]) diff --git a/m4/virt-audit.m4 b/m4/virt-audit.m4 index 0c09e4f723..68b6f578ca 100644 --- a/m4/virt-audit.m4 +++ b/m4/virt-audit.m4 @@ -17,8 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_AUDIT],[ +AC_DEFUN([LIBVIRT_ARG_AUDIT],[ LIBVIRT_ARG_WITH([AUDIT], [audit], [check]) +]) + +AC_DEFUN([LIBVIRT_CHECK_AUDIT],[ LIBVIRT_CHECK_LIB([AUDIT], [audit], [audit_encode_nv_string], [libaudit.h]) ]) diff --git a/m4/virt-avahi.m4 b/m4/virt-avahi.m4 index 7a054145cf..f36af6ddb1 100644 --- a/m4/virt-avahi.m4 +++ b/m4/virt-avahi.m4 @@ -17,8 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_AVAHI],[ +AC_DEFUN([LIBVIRT_ARG_AVAHI],[ LIBVIRT_ARG_WITH([AVAHI], [avahi-client], [check], [0.6.0]) +]) + +AC_DEFUN([LIBVIRT_CHECK_AVAHI],[ LIBVIRT_CHECK_PKG([AVAHI], [avahi-client], [0.6.0]) ]) diff --git a/m4/virt-blkid.m4 b/m4/virt-blkid.m4 index fb95eb9106..db225a1d9a 100644 --- a/m4/virt-blkid.m4 +++ b/m4/virt-blkid.m4 @@ -17,8 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_BLKID],[ +AC_DEFUN([LIBVIRT_ARG_BLKID],[ LIBVIRT_ARG_WITH([BLKID], [blkid], [check], [2.17]) +]) + +AC_DEFUN([LIBVIRT_CHECK_BLKID],[ LIBVIRT_CHECK_PKG([BLKID], [blkid], [2.17]) ]) diff --git a/m4/virt-capng.m4 b/m4/virt-capng.m4 index 6105dbae6b..3fbc79565d 100644 --- a/m4/virt-capng.m4 +++ b/m4/virt-capng.m4 @@ -17,8 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_CAPNG],[ +AC_DEFUN([LIBVIRT_ARG_CAPNG],[ LIBVIRT_ARG_WITH([CAPNG], [cap-ng], [check]) +]) + +AC_DEFUN([LIBVIRT_CHECK_CAPNG],[ LIBVIRT_CHECK_LIB([CAPNG], [cap-ng], [capng_updatev], [cap-ng.h]) ]) diff --git a/m4/virt-curl.m4 b/m4/virt-curl.m4 index ef87888a54..7194d7a4be 100644 --- a/m4/virt-curl.m4 +++ b/m4/virt-curl.m4 @@ -17,8 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_CURL],[ +AC_DEFUN([LIBVIRT_ARG_CURL],[ LIBVIRT_ARG_WITH([CURL], [libcurl], [check], [7.18.0]) +]) + +AC_DEFUN([LIBVIRT_CHECK_CURL],[ LIBVIRT_CHECK_PKG([CURL], [libcurl], [7.18.0]) # XXX as of libcurl-devel-7.20.1-3.fc13.x86_64, curl ships a version diff --git a/m4/virt-dbus.m4 b/m4/virt-dbus.m4 index ae13488850..8e1fad1c02 100644 --- a/m4/virt-dbus.m4 +++ b/m4/virt-dbus.m4 @@ -17,8 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_DBUS],[ +AC_DEFUN([LIBVIRT_ARG_DBUS],[ LIBVIRT_ARG_WITH([DBUS], [dbus-1], [check], [1.0.0]) +]) + +AC_DEFUN([LIBVIRT_CHECK_DBUS],[ LIBVIRT_CHECK_PKG([DBUS], [dbus-1], [1.0.0]) if test "$with_dbus" = "yes" ; then diff --git a/m4/virt-driver-bhyve.m4 b/m4/virt-driver-bhyve.m4 index c83eff08e9..1927929922 100644 --- a/m4/virt-driver-bhyve.m4 +++ b/m4/virt-driver-bhyve.m4 @@ -17,9 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_DRIVER_CHECK_BHYVE],[ +AC_DEFUN([LIBVIRT_DRIVER_ARG_BHYVE],[ LIBVIRT_ARG_WITH([BHYVE], [BHyVe], [check]) +]) +AC_DEFUN([LIBVIRT_DRIVER_CHECK_BHYVE],[ if test "$with_bhyve" != "no"; then AC_PATH_PROG([BHYVE], [bhyve], [], [$PATH:/usr/sbin]) AC_PATH_PROG([BHYVECTL], [bhyvectl], [], [$PATH:/usr/sbin]) diff --git a/m4/virt-driver-uml.m4 b/m4/virt-driver-uml.m4 index bc3f7d5a45..24ca93845a 100644 --- a/m4/virt-driver-uml.m4 +++ b/m4/virt-driver-uml.m4 @@ -17,9 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_DRIVER_CHECK_UML],[ +AC_DEFUN([LIBVIRT_DRIVER_ARG_UML],[ LIBVIRT_ARG_WITH([UML], [UML], [check]) +]) +AC_DEFUN([LIBVIRT_DRIVER_CHECK_UML],[ if test "$with_libvirtd" = "no" || test "$with_linux" = "no"; then if test "$with_uml" = "yes"; then AC_MSG_ERROR([The UML driver cannot be enabled]) diff --git a/m4/virt-driver-vz.m4 b/m4/virt-driver-vz.m4 index a51857467e..74ef79a9a7 100644 --- a/m4/virt-driver-vz.m4 +++ b/m4/virt-driver-vz.m4 @@ -17,9 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_DRIVER_CHECK_VZ],[ +AC_DEFUN([LIBVIRT_DRIVER_ARG_VZ],[ LIBVIRT_ARG_WITH([VZ], [Virtuozzo], [check]) +]) +AC_DEFUN([LIBVIRT_DRIVER_CHECK_VZ],[ if test "$with_vz" = "yes" || test "$with_vz" = "check"; then PKG_CHECK_MODULES([PARALLELS_SDK], [parallels-sdk >= $PARALLELS_SDK_REQUIRED], diff --git a/m4/virt-fuse.m4 b/m4/virt-fuse.m4 index 298406b597..5f25b32ba3 100644 --- a/m4/virt-fuse.m4 +++ b/m4/virt-fuse.m4 @@ -17,8 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_FUSE],[ +AC_DEFUN([LIBVIRT_ARG_FUSE],[ LIBVIRT_ARG_WITH([FUSE], [fuse], [check], [2.8.6]) +]) + +AC_DEFUN([LIBVIRT_CHECK_FUSE],[ LIBVIRT_CHECK_PKG([FUSE], [fuse], [2.8.6]) ]) diff --git a/m4/virt-gluster.m4 b/m4/virt-gluster.m4 index dc9e8aff6b..5398cc32d8 100644 --- a/m4/virt-gluster.m4 +++ b/m4/virt-gluster.m4 @@ -19,8 +19,11 @@ 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_CHECK_GLUSTER],[ +AC_DEFUN([LIBVIRT_ARG_GLUSTER],[ LIBVIRT_ARG_WITH([GLUSTERFS], [glusterfs], [check], [3.4.1]) +]) + +AC_DEFUN([LIBVIRT_CHECK_GLUSTER],[ LIBVIRT_CHECK_PKG([GLUSTERFS], [glusterfs-api], [3.4.1]) ]) diff --git a/m4/virt-gnutls.m4 b/m4/virt-gnutls.m4 index 1e60f28da2..bd861eec5f 100644 --- a/m4/virt-gnutls.m4 +++ b/m4/virt-gnutls.m4 @@ -17,8 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_GNUTLS],[ +AC_DEFUN([LIBVIRT_ARG_GNUTLS],[ LIBVIRT_ARG_WITH([GNUTLS], [gnutls], [check], [2.2.0]) +]) + +AC_DEFUN([LIBVIRT_CHECK_GNUTLS],[ LIBVIRT_CHECK_PKG([GNUTLS], [gnutls], [2.2.0]) if test "$with_gnutls" = "yes" ; then diff --git a/m4/virt-hal.m4 b/m4/virt-hal.m4 index 38aa7b2d8d..7ed44881bb 100644 --- a/m4/virt-hal.m4 +++ b/m4/virt-hal.m4 @@ -17,8 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_HAL],[ +AC_DEFUN([LIBVIRT_ARG_HAL],[ LIBVIRT_ARG_WITH([HAL], [hal], [check], [0.5.0]) +]) + +AC_DEFUN([LIBVIRT_CHECK_HAL],[ LIBVIRT_CHECK_PKG([HAL], [hal], [0.5.0]) ]) diff --git a/m4/virt-host-validate.m4 b/m4/virt-host-validate.m4 index 3aca34deee..0970fa1ed4 100644 --- a/m4/virt-host-validate.m4 +++ b/m4/virt-host-validate.m4 @@ -15,9 +15,11 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. -AC_DEFUN([LIBVIRT_CHECK_HOST_VALIDATE], [ +AC_DEFUN([LIBVIRT_ARG_HOST_VALIDATE], [ LIBVIRT_ARG_WITH_ALT([HOST_VALIDATE], [build virt-host-validate], [check]) +]) +AC_DEFUN([LIBVIRT_CHECK_HOST_VALIDATE], [ if test "x$with_host_validate" != "xno"; then if test "x$with_win" = "xyes"; then if test "x$with_host_validate" = "xyes"; then diff --git a/m4/virt-init-script.m4 b/m4/virt-init-script.m4 index 1eb43a9288..cebac93362 100644 --- a/m4/virt-init-script.m4 +++ b/m4/virt-init-script.m4 @@ -17,11 +17,13 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[ +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]) +]) +AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[ AC_MSG_CHECKING([for init script type]) init_redhat=no diff --git a/m4/virt-libssh.m4 b/m4/virt-libssh.m4 index b5912acae3..4107385b27 100644 --- a/m4/virt-libssh.m4 +++ b/m4/virt-libssh.m4 @@ -17,8 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_LIBSSH],[ +AC_DEFUN([LIBVIRT_ARG_LIBSSH],[ LIBVIRT_ARG_WITH([LIBSSH], [libssh], [check], [0.7]) +]) + +AC_DEFUN([LIBVIRT_CHECK_LIBSSH],[ LIBVIRT_CHECK_PKG([LIBSSH], [libssh], [0.7]) ]) diff --git a/m4/virt-login-shell.m4 b/m4/virt-login-shell.m4 index a2b90dae6e..c922e376b1 100644 --- a/m4/virt-login-shell.m4 +++ b/m4/virt-login-shell.m4 @@ -15,9 +15,11 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. -AC_DEFUN([LIBVIRT_CHECK_LOGIN_SHELL], [ +AC_DEFUN([LIBVIRT_ARG_LOGIN_SHELL], [ LIBVIRT_ARG_WITH_ALT([LOGIN_SHELL], [build virt-login-shell], [check]) +]) +AC_DEFUN([LIBVIRT_CHECK_LOGIN_SHELL], [ if test "x$with_login_shell" != "xno"; then if test "x$with_linux" != "xyes"; then if test "x$with_login_shell" = "xyes"; then diff --git a/m4/virt-netcf.m4 b/m4/virt-netcf.m4 index eb919afd7c..19374b223b 100644 --- a/m4/virt-netcf.m4 +++ b/m4/virt-netcf.m4 @@ -17,8 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_NETCF],[ +AC_DEFUN([LIBVIRT_ARG_NETCF],[ LIBVIRT_ARG_WITH([NETCF], [netcf], [check], [0.1.4]) +]) + +AC_DEFUN([LIBVIRT_CHECK_NETCF],[ LIBVIRT_CHECK_PKG([NETCF], [netcf], [0.1.4]) if test "$with_netcf" = "yes" ; then diff --git a/m4/virt-nss.m4 b/m4/virt-nss.m4 index f95010d692..15030cab48 100644 --- a/m4/virt-nss.m4 +++ b/m4/virt-nss.m4 @@ -17,11 +17,13 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_NSS],[ +AC_DEFUN([LIBVIRT_ARG_NSS],[ LIBVIRT_ARG_WITH_ALT([NSS_PLUGIN], [enable Name Service Switch plugin for resolving guest IP addresses], [check]) +]) +AC_DEFUN([LIBVIRT_CHECK_NSS],[ bsd_nss=no fail=0 if test "x$with_nss_plugin" != "xno" ; then diff --git a/m4/virt-numactl.m4 b/m4/virt-numactl.m4 index 6f62c51d5b..7dbb1bb2ac 100644 --- a/m4/virt-numactl.m4 +++ b/m4/virt-numactl.m4 @@ -17,8 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_NUMACTL],[ +AC_DEFUN([LIBVIRT_ARG_NUMACTL],[ LIBVIRT_ARG_WITH([NUMACTL], [numa], [check]) +]) + +AC_DEFUN([LIBVIRT_CHECK_NUMACTL],[ LIBVIRT_CHECK_LIB([NUMACTL], [numa], [numa_available], [numa.h]) AC_CHECK_LIB([numa], [numa_bitmask_isbitset], [have_numa_bitmask_isbitset=yes]) if test "$have_numa_bitmask_isbitset" = "yes"; then diff --git a/m4/virt-openwsman.m4 b/m4/virt-openwsman.m4 index 5f6a4eb047..cd7e9e2ee4 100644 --- a/m4/virt-openwsman.m4 +++ b/m4/virt-openwsman.m4 @@ -17,8 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_OPENWSMAN],[ +AC_DEFUN([LIBVIRT_ARG_OPENWSMAN],[ LIBVIRT_ARG_WITH([OPENWSMAN], [openwsman], [check], [2.2.3]) +]) + +AC_DEFUN([LIBVIRT_CHECK_OPENWSMAN],[ LIBVIRT_CHECK_PKG([OPENWSMAN], [openwsman], [2.2.3]) ]) diff --git a/m4/virt-pciaccess.m4 b/m4/virt-pciaccess.m4 index 9a29fe9020..d96af8b231 100644 --- a/m4/virt-pciaccess.m4 +++ b/m4/virt-pciaccess.m4 @@ -17,8 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_PCIACCESS],[ +AC_DEFUN([LIBVIRT_ARG_PCIACCESS],[ LIBVIRT_ARG_WITH([PCIACCESS], [pciaccess], [check], [0.10.0]) +]) + +AC_DEFUN([LIBVIRT_CHECK_PCIACCESS],[ LIBVIRT_CHECK_PKG([PCIACCESS], [pciaccess], [0.10.0]) ]) diff --git a/m4/virt-readline.m4 b/m4/virt-readline.m4 index c1c8fa87cd..e32f5f5332 100644 --- a/m4/virt-readline.m4 +++ b/m4/virt-readline.m4 @@ -17,9 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_READLINE],[ +AC_DEFUN([LIBVIRT_ARG_READLINE],[ LIBVIRT_ARG_WITH([READLINE], [readline], [check]) +]) +AC_DEFUN([LIBVIRT_CHECK_READLINE],[ extra_LIBS= lv_saved_libs=$LIBS if test "x$with_readline" != xno; then diff --git a/m4/virt-sanlock.m4 b/m4/virt-sanlock.m4 index 64f950bd70..97bdf0c71b 100644 --- a/m4/virt-sanlock.m4 +++ b/m4/virt-sanlock.m4 @@ -17,8 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[ +AC_DEFUN([LIBVIRT_ARG_SANLOCK],[ LIBVIRT_ARG_WITH([SANLOCK], [sanlock-client], [check]) +]) + +AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[ LIBVIRT_CHECK_LIB([SANLOCK], [sanlock_client], [sanlock_init], [sanlock.h]) if test "x$with_sanlock" = "xyes" ; then diff --git a/m4/virt-sasl.m4 b/m4/virt-sasl.m4 index 9e5fe03867..15b1ce9cdf 100644 --- a/m4/virt-sasl.m4 +++ b/m4/virt-sasl.m4 @@ -17,8 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_SASL],[ +AC_DEFUN([LIBVIRT_ARG_SASL],[ LIBVIRT_ARG_WITH([SASL], [sasl], [check]) +]) + +AC_DEFUN([LIBVIRT_CHECK_SASL],[ LIBVIRT_CHECK_LIB_ALT([SASL], [sasl2], [sasl_client_init], [sasl/sasl.h], [SASL1], [sasl], diff --git a/m4/virt-selinux.m4 b/m4/virt-selinux.m4 index 992066ad2e..2f5b10bc54 100644 --- a/m4/virt-selinux.m4 +++ b/m4/virt-selinux.m4 @@ -17,13 +17,15 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_SELINUX],[ +AC_DEFUN([LIBVIRT_ARG_SELINUX],[ LIBVIRT_ARG_WITH([SELINUX], [SELinux], [check]) + LIBVIRT_ARG_WITH_ALT([SELINUX_MOUNT], [set SELinux mount point], [check]) +]) + +AC_DEFUN([LIBVIRT_CHECK_SELINUX],[ LIBVIRT_CHECK_LIB([SELINUX], [selinux], [fgetfilecon_raw], [selinux/selinux.h]) - LIBVIRT_ARG_WITH_ALT([SELINUX_MOUNT], [set SELinux mount point], [check]) - if test "$with_selinux" = "yes"; then # libselinux changed signatures between 2.2 and 2.3 AC_CACHE_CHECK([for selinux setcon parameter type], [lv_cv_setcon_const], diff --git a/m4/virt-ssh2.m4 b/m4/virt-ssh2.m4 index ed3bebbe99..da8ec5aaef 100644 --- a/m4/virt-ssh2.m4 +++ b/m4/virt-ssh2.m4 @@ -17,8 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_SSH2],[ +AC_DEFUN([LIBVIRT_ARG_SSH2],[ LIBVIRT_ARG_WITH([SSH2], [libssh2], [check], [1.3]) +]) + +AC_DEFUN([LIBVIRT_CHECK_SSH2],[ LIBVIRT_CHECK_PKG([SSH2], [libssh2], [1.3]) ]) diff --git a/m4/virt-udev.m4 b/m4/virt-udev.m4 index 3ac4c40732..363aa983dd 100644 --- a/m4/virt-udev.m4 +++ b/m4/virt-udev.m4 @@ -17,8 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_UDEV],[ +AC_DEFUN([LIBVIRT_ARG_UDEV],[ LIBVIRT_ARG_WITH([UDEV], [libudev], [check], [145]) +]) + +AC_DEFUN([LIBVIRT_CHECK_UDEV],[ AC_REQUIRE([LIBVIRT_CHECK_PCIACCESS]) LIBVIRT_CHECK_PKG([UDEV], [libudev], [145]) diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4 index d11bec05b5..f0cd08b550 100644 --- a/m4/virt-wireshark.m4 +++ b/m4/virt-wireshark.m4 @@ -17,13 +17,15 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[ +AC_DEFUN([LIBVIRT_ARG_WIRESHARK],[ LIBVIRT_ARG_WITH([WIRESHARK_DISSECTOR], [wireshark], [check], [1.11.3]) - LIBVIRT_CHECK_PKG([WIRESHARK_DISSECTOR], [wireshark], [1.11.3]) - LIBVIRT_ARG_WITH_ALT([WS_PLUGINDIR], [wireshark plugins directory for use when installing wireshark plugin], [check]) +]) + +AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[ + LIBVIRT_CHECK_PKG([WIRESHARK_DISSECTOR], [wireshark], [1.11.3]) dnl Check for system location of wireshark plugins if test "x$with_wireshark_dissector" != "xno" ; then diff --git a/m4/virt-yajl.m4 b/m4/virt-yajl.m4 index 87271addad..0103f72643 100644 --- a/m4/virt-yajl.m4 +++ b/m4/virt-yajl.m4 @@ -17,9 +17,11 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. dnl -AC_DEFUN([LIBVIRT_CHECK_YAJL],[ +AC_DEFUN([LIBVIRT_ARG_YAJL],[ LIBVIRT_ARG_WITH([YAJL], [yajl], [check]) +]) +AC_DEFUN([LIBVIRT_CHECK_YAJL],[ dnl YAJL JSON library http://lloyd.github.com/yajl/ if test "$with_qemu:$with_yajl" = yes:check; then dnl Some versions of qemu require the use of yajl; try to detect them -- 2.11.0