mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-29 20:11:16 +00:00
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@redhat.com>
This commit is contained in:
parent
e03d43714a
commit
eeccee1870
33
configure.ac
33
configure.ac
@ -232,6 +232,33 @@ LIBVIRT_COMPILE_PIE
|
|||||||
LIBVIRT_LINKER_RELRO
|
LIBVIRT_LINKER_RELRO
|
||||||
LIBVIRT_LINKER_NO_INDIRECT
|
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_APPARMOR
|
||||||
LIBVIRT_CHECK_ATTR
|
LIBVIRT_CHECK_ATTR
|
||||||
LIBVIRT_CHECK_AUDIT
|
LIBVIRT_CHECK_AUDIT
|
||||||
@ -475,6 +502,7 @@ if test x"$enable_debug" = x"yes"; then
|
|||||||
AC_DEFINE([ENABLE_DEBUG], [], [whether debugging is enabled])
|
AC_DEFINE([ENABLE_DEBUG], [], [whether debugging is enabled])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
LIBVIRT_ARG_INIT_SCRIPT
|
||||||
LIBVIRT_CHECK_INIT_SCRIPT
|
LIBVIRT_CHECK_INIT_SCRIPT
|
||||||
|
|
||||||
AC_MSG_CHECKING([for whether to install sysctl config])
|
AC_MSG_CHECKING([for whether to install sysctl config])
|
||||||
@ -896,12 +924,14 @@ dnl
|
|||||||
dnl Check for virt-login-shell
|
dnl Check for virt-login-shell
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
|
LIBVIRT_ARG_LOGIN_SHELL
|
||||||
LIBVIRT_CHECK_LOGIN_SHELL
|
LIBVIRT_CHECK_LOGIN_SHELL
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl Check for virt-host-validate
|
dnl Check for virt-host-validate
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
|
LIBVIRT_ARG_HOST_VALIDATE
|
||||||
LIBVIRT_CHECK_HOST_VALIDATE
|
LIBVIRT_CHECK_HOST_VALIDATE
|
||||||
|
|
||||||
AM_CONDITIONAL([WITH_SETUID_RPC_CLIENT], [test "$with_lxc$with_login_shell" != "nono"])
|
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 Checks for the Parallels driver
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
|
LIBVIRT_DRIVER_ARG_VZ
|
||||||
LIBVIRT_DRIVER_CHECK_VZ
|
LIBVIRT_DRIVER_CHECK_VZ
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl Checks for bhyve driver
|
dnl Checks for bhyve driver
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
|
LIBVIRT_DRIVER_ARG_BHYVE
|
||||||
LIBVIRT_DRIVER_CHECK_BHYVE
|
LIBVIRT_DRIVER_CHECK_BHYVE
|
||||||
|
|
||||||
|
|
||||||
@ -1279,6 +1311,7 @@ dnl
|
|||||||
dnl Checks for the UML driver
|
dnl Checks for the UML driver
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
|
LIBVIRT_DRIVER_ARG_UML
|
||||||
LIBVIRT_DRIVER_CHECK_UML
|
LIBVIRT_DRIVER_CHECK_UML
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
|
@ -17,13 +17,15 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_APPARMOR],[
|
AC_DEFUN([LIBVIRT_ARG_APPARMOR],[
|
||||||
LIBVIRT_ARG_WITH([APPARMOR], [AppArmor], [check])
|
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],
|
LIBVIRT_CHECK_LIB([APPARMOR], [apparmor],
|
||||||
[aa_change_profile], [sys/apparmor.h])
|
[aa_change_profile], [sys/apparmor.h])
|
||||||
|
|
||||||
LIBVIRT_ARG_WITH_ALT([APPARMOR_MOUNT], [set AppArmor mount point], [check])
|
|
||||||
|
|
||||||
if test "$with_apparmor" = "yes"; then
|
if test "$with_apparmor" = "yes"; then
|
||||||
AC_DEFINE_UNQUOTED([APPARMOR_DIR],
|
AC_DEFINE_UNQUOTED([APPARMOR_DIR],
|
||||||
"/etc/apparmor.d",
|
"/etc/apparmor.d",
|
||||||
|
@ -1,7 +1,10 @@
|
|||||||
dnl The libattr.so library
|
dnl The libattr.so library
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_ATTR],[
|
AC_DEFUN([LIBVIRT_ARG_ATTR],[
|
||||||
LIBVIRT_ARG_WITH([ATTR], [attr], [check])
|
LIBVIRT_ARG_WITH([ATTR], [attr], [check])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_ATTR],[
|
||||||
LIBVIRT_CHECK_LIB([ATTR], [attr], [getxattr], [attr/xattr.h])
|
LIBVIRT_CHECK_LIB([ATTR], [attr], [getxattr], [attr/xattr.h])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
@ -17,8 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_AUDIT],[
|
AC_DEFUN([LIBVIRT_ARG_AUDIT],[
|
||||||
LIBVIRT_ARG_WITH([AUDIT], [audit], [check])
|
LIBVIRT_ARG_WITH([AUDIT], [audit], [check])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_AUDIT],[
|
||||||
LIBVIRT_CHECK_LIB([AUDIT], [audit],
|
LIBVIRT_CHECK_LIB([AUDIT], [audit],
|
||||||
[audit_encode_nv_string], [libaudit.h])
|
[audit_encode_nv_string], [libaudit.h])
|
||||||
])
|
])
|
||||||
|
@ -17,8 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_AVAHI],[
|
AC_DEFUN([LIBVIRT_ARG_AVAHI],[
|
||||||
LIBVIRT_ARG_WITH([AVAHI], [avahi-client], [check], [0.6.0])
|
LIBVIRT_ARG_WITH([AVAHI], [avahi-client], [check], [0.6.0])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_AVAHI],[
|
||||||
LIBVIRT_CHECK_PKG([AVAHI], [avahi-client], [0.6.0])
|
LIBVIRT_CHECK_PKG([AVAHI], [avahi-client], [0.6.0])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
@ -17,8 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_BLKID],[
|
AC_DEFUN([LIBVIRT_ARG_BLKID],[
|
||||||
LIBVIRT_ARG_WITH([BLKID], [blkid], [check], [2.17])
|
LIBVIRT_ARG_WITH([BLKID], [blkid], [check], [2.17])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_BLKID],[
|
||||||
LIBVIRT_CHECK_PKG([BLKID], [blkid], [2.17])
|
LIBVIRT_CHECK_PKG([BLKID], [blkid], [2.17])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
@ -17,8 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_CAPNG],[
|
AC_DEFUN([LIBVIRT_ARG_CAPNG],[
|
||||||
LIBVIRT_ARG_WITH([CAPNG], [cap-ng], [check])
|
LIBVIRT_ARG_WITH([CAPNG], [cap-ng], [check])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_CAPNG],[
|
||||||
LIBVIRT_CHECK_LIB([CAPNG], [cap-ng], [capng_updatev], [cap-ng.h])
|
LIBVIRT_CHECK_LIB([CAPNG], [cap-ng], [capng_updatev], [cap-ng.h])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
@ -17,8 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_CURL],[
|
AC_DEFUN([LIBVIRT_ARG_CURL],[
|
||||||
LIBVIRT_ARG_WITH([CURL], [libcurl], [check], [7.18.0])
|
LIBVIRT_ARG_WITH([CURL], [libcurl], [check], [7.18.0])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_CURL],[
|
||||||
LIBVIRT_CHECK_PKG([CURL], [libcurl], [7.18.0])
|
LIBVIRT_CHECK_PKG([CURL], [libcurl], [7.18.0])
|
||||||
|
|
||||||
# XXX as of libcurl-devel-7.20.1-3.fc13.x86_64, curl ships a version
|
# XXX as of libcurl-devel-7.20.1-3.fc13.x86_64, curl ships a version
|
||||||
|
@ -17,8 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_DBUS],[
|
AC_DEFUN([LIBVIRT_ARG_DBUS],[
|
||||||
LIBVIRT_ARG_WITH([DBUS], [dbus-1], [check], [1.0.0])
|
LIBVIRT_ARG_WITH([DBUS], [dbus-1], [check], [1.0.0])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_DBUS],[
|
||||||
LIBVIRT_CHECK_PKG([DBUS], [dbus-1], [1.0.0])
|
LIBVIRT_CHECK_PKG([DBUS], [dbus-1], [1.0.0])
|
||||||
|
|
||||||
if test "$with_dbus" = "yes" ; then
|
if test "$with_dbus" = "yes" ; then
|
||||||
|
@ -17,9 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_DRIVER_CHECK_BHYVE],[
|
AC_DEFUN([LIBVIRT_DRIVER_ARG_BHYVE],[
|
||||||
LIBVIRT_ARG_WITH([BHYVE], [BHyVe], [check])
|
LIBVIRT_ARG_WITH([BHYVE], [BHyVe], [check])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_DRIVER_CHECK_BHYVE],[
|
||||||
if test "$with_bhyve" != "no"; then
|
if test "$with_bhyve" != "no"; then
|
||||||
AC_PATH_PROG([BHYVE], [bhyve], [], [$PATH:/usr/sbin])
|
AC_PATH_PROG([BHYVE], [bhyve], [], [$PATH:/usr/sbin])
|
||||||
AC_PATH_PROG([BHYVECTL], [bhyvectl], [], [$PATH:/usr/sbin])
|
AC_PATH_PROG([BHYVECTL], [bhyvectl], [], [$PATH:/usr/sbin])
|
||||||
|
@ -17,9 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_DRIVER_CHECK_UML],[
|
AC_DEFUN([LIBVIRT_DRIVER_ARG_UML],[
|
||||||
LIBVIRT_ARG_WITH([UML], [UML], [check])
|
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_libvirtd" = "no" || test "$with_linux" = "no"; then
|
||||||
if test "$with_uml" = "yes"; then
|
if test "$with_uml" = "yes"; then
|
||||||
AC_MSG_ERROR([The UML driver cannot be enabled])
|
AC_MSG_ERROR([The UML driver cannot be enabled])
|
||||||
|
@ -17,9 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_DRIVER_CHECK_VZ],[
|
AC_DEFUN([LIBVIRT_DRIVER_ARG_VZ],[
|
||||||
LIBVIRT_ARG_WITH([VZ], [Virtuozzo], [check])
|
LIBVIRT_ARG_WITH([VZ], [Virtuozzo], [check])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_DRIVER_CHECK_VZ],[
|
||||||
if test "$with_vz" = "yes" ||
|
if test "$with_vz" = "yes" ||
|
||||||
test "$with_vz" = "check"; then
|
test "$with_vz" = "check"; then
|
||||||
PKG_CHECK_MODULES([PARALLELS_SDK], [parallels-sdk >= $PARALLELS_SDK_REQUIRED],
|
PKG_CHECK_MODULES([PARALLELS_SDK], [parallels-sdk >= $PARALLELS_SDK_REQUIRED],
|
||||||
|
@ -17,8 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_FUSE],[
|
AC_DEFUN([LIBVIRT_ARG_FUSE],[
|
||||||
LIBVIRT_ARG_WITH([FUSE], [fuse], [check], [2.8.6])
|
LIBVIRT_ARG_WITH([FUSE], [fuse], [check], [2.8.6])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_FUSE],[
|
||||||
LIBVIRT_CHECK_PKG([FUSE], [fuse], [2.8.6])
|
LIBVIRT_CHECK_PKG([FUSE], [fuse], [2.8.6])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
@ -19,8 +19,11 @@ dnl
|
|||||||
|
|
||||||
dnl Currently tested against Fedora 19 with glusterfs 3.4.1; earlier
|
dnl Currently tested against Fedora 19 with glusterfs 3.4.1; earlier
|
||||||
dnl versions may be possible but only with further testing
|
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])
|
LIBVIRT_ARG_WITH([GLUSTERFS], [glusterfs], [check], [3.4.1])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_GLUSTER],[
|
||||||
LIBVIRT_CHECK_PKG([GLUSTERFS], [glusterfs-api], [3.4.1])
|
LIBVIRT_CHECK_PKG([GLUSTERFS], [glusterfs-api], [3.4.1])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
@ -17,8 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_GNUTLS],[
|
AC_DEFUN([LIBVIRT_ARG_GNUTLS],[
|
||||||
LIBVIRT_ARG_WITH([GNUTLS], [gnutls], [check], [2.2.0])
|
LIBVIRT_ARG_WITH([GNUTLS], [gnutls], [check], [2.2.0])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_GNUTLS],[
|
||||||
LIBVIRT_CHECK_PKG([GNUTLS], [gnutls], [2.2.0])
|
LIBVIRT_CHECK_PKG([GNUTLS], [gnutls], [2.2.0])
|
||||||
|
|
||||||
if test "$with_gnutls" = "yes" ; then
|
if test "$with_gnutls" = "yes" ; then
|
||||||
|
@ -17,8 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_HAL],[
|
AC_DEFUN([LIBVIRT_ARG_HAL],[
|
||||||
LIBVIRT_ARG_WITH([HAL], [hal], [check], [0.5.0])
|
LIBVIRT_ARG_WITH([HAL], [hal], [check], [0.5.0])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_HAL],[
|
||||||
LIBVIRT_CHECK_PKG([HAL], [hal], [0.5.0])
|
LIBVIRT_CHECK_PKG([HAL], [hal], [0.5.0])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
@ -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 License along with this library. If not, see
|
||||||
dnl <http://www.gnu.org/licenses/>.
|
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])
|
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_host_validate" != "xno"; then
|
||||||
if test "x$with_win" = "xyes"; then
|
if test "x$with_win" = "xyes"; then
|
||||||
if test "x$with_host_validate" = "xyes"; then
|
if test "x$with_host_validate" = "xyes"; then
|
||||||
|
@ -17,11 +17,13 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[
|
AC_DEFUN([LIBVIRT_ARG_INIT_SCRIPT],[
|
||||||
LIBVIRT_ARG_WITH_ALT([INIT_SCRIPT],
|
LIBVIRT_ARG_WITH_ALT([INIT_SCRIPT],
|
||||||
[Style of init script to install: redhat, systemd,
|
[Style of init script to install: redhat, systemd,
|
||||||
systemd+redhat, upstart, check, none], [check])
|
systemd+redhat, upstart, check, none], [check])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[
|
||||||
AC_MSG_CHECKING([for init script type])
|
AC_MSG_CHECKING([for init script type])
|
||||||
|
|
||||||
init_redhat=no
|
init_redhat=no
|
||||||
|
@ -17,8 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_LIBSSH],[
|
AC_DEFUN([LIBVIRT_ARG_LIBSSH],[
|
||||||
LIBVIRT_ARG_WITH([LIBSSH], [libssh], [check], [0.7])
|
LIBVIRT_ARG_WITH([LIBSSH], [libssh], [check], [0.7])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_LIBSSH],[
|
||||||
LIBVIRT_CHECK_PKG([LIBSSH], [libssh], [0.7])
|
LIBVIRT_CHECK_PKG([LIBSSH], [libssh], [0.7])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
@ -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 License along with this library. If not, see
|
||||||
dnl <http://www.gnu.org/licenses/>.
|
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])
|
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_login_shell" != "xno"; then
|
||||||
if test "x$with_linux" != "xyes"; then
|
if test "x$with_linux" != "xyes"; then
|
||||||
if test "x$with_login_shell" = "xyes"; then
|
if test "x$with_login_shell" = "xyes"; then
|
||||||
|
@ -17,8 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_NETCF],[
|
AC_DEFUN([LIBVIRT_ARG_NETCF],[
|
||||||
LIBVIRT_ARG_WITH([NETCF], [netcf], [check], [0.1.4])
|
LIBVIRT_ARG_WITH([NETCF], [netcf], [check], [0.1.4])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_NETCF],[
|
||||||
LIBVIRT_CHECK_PKG([NETCF], [netcf], [0.1.4])
|
LIBVIRT_CHECK_PKG([NETCF], [netcf], [0.1.4])
|
||||||
|
|
||||||
if test "$with_netcf" = "yes" ; then
|
if test "$with_netcf" = "yes" ; then
|
||||||
|
@ -17,11 +17,13 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_NSS],[
|
AC_DEFUN([LIBVIRT_ARG_NSS],[
|
||||||
LIBVIRT_ARG_WITH_ALT([NSS_PLUGIN],
|
LIBVIRT_ARG_WITH_ALT([NSS_PLUGIN],
|
||||||
[enable Name Service Switch plugin for resolving guest
|
[enable Name Service Switch plugin for resolving guest
|
||||||
IP addresses], [check])
|
IP addresses], [check])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_NSS],[
|
||||||
bsd_nss=no
|
bsd_nss=no
|
||||||
fail=0
|
fail=0
|
||||||
if test "x$with_nss_plugin" != "xno" ; then
|
if test "x$with_nss_plugin" != "xno" ; then
|
||||||
|
@ -17,8 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_NUMACTL],[
|
AC_DEFUN([LIBVIRT_ARG_NUMACTL],[
|
||||||
LIBVIRT_ARG_WITH([NUMACTL], [numa], [check])
|
LIBVIRT_ARG_WITH([NUMACTL], [numa], [check])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_NUMACTL],[
|
||||||
LIBVIRT_CHECK_LIB([NUMACTL], [numa], [numa_available], [numa.h])
|
LIBVIRT_CHECK_LIB([NUMACTL], [numa], [numa_available], [numa.h])
|
||||||
AC_CHECK_LIB([numa], [numa_bitmask_isbitset], [have_numa_bitmask_isbitset=yes])
|
AC_CHECK_LIB([numa], [numa_bitmask_isbitset], [have_numa_bitmask_isbitset=yes])
|
||||||
if test "$have_numa_bitmask_isbitset" = "yes"; then
|
if test "$have_numa_bitmask_isbitset" = "yes"; then
|
||||||
|
@ -17,8 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_OPENWSMAN],[
|
AC_DEFUN([LIBVIRT_ARG_OPENWSMAN],[
|
||||||
LIBVIRT_ARG_WITH([OPENWSMAN], [openwsman], [check], [2.2.3])
|
LIBVIRT_ARG_WITH([OPENWSMAN], [openwsman], [check], [2.2.3])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_OPENWSMAN],[
|
||||||
LIBVIRT_CHECK_PKG([OPENWSMAN], [openwsman], [2.2.3])
|
LIBVIRT_CHECK_PKG([OPENWSMAN], [openwsman], [2.2.3])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
@ -17,8 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_PCIACCESS],[
|
AC_DEFUN([LIBVIRT_ARG_PCIACCESS],[
|
||||||
LIBVIRT_ARG_WITH([PCIACCESS], [pciaccess], [check], [0.10.0])
|
LIBVIRT_ARG_WITH([PCIACCESS], [pciaccess], [check], [0.10.0])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_PCIACCESS],[
|
||||||
LIBVIRT_CHECK_PKG([PCIACCESS], [pciaccess], [0.10.0])
|
LIBVIRT_CHECK_PKG([PCIACCESS], [pciaccess], [0.10.0])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
@ -17,9 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_READLINE],[
|
AC_DEFUN([LIBVIRT_ARG_READLINE],[
|
||||||
LIBVIRT_ARG_WITH([READLINE], [readline], [check])
|
LIBVIRT_ARG_WITH([READLINE], [readline], [check])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_READLINE],[
|
||||||
extra_LIBS=
|
extra_LIBS=
|
||||||
lv_saved_libs=$LIBS
|
lv_saved_libs=$LIBS
|
||||||
if test "x$with_readline" != xno; then
|
if test "x$with_readline" != xno; then
|
||||||
|
@ -17,8 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[
|
AC_DEFUN([LIBVIRT_ARG_SANLOCK],[
|
||||||
LIBVIRT_ARG_WITH([SANLOCK], [sanlock-client], [check])
|
LIBVIRT_ARG_WITH([SANLOCK], [sanlock-client], [check])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[
|
||||||
LIBVIRT_CHECK_LIB([SANLOCK], [sanlock_client], [sanlock_init], [sanlock.h])
|
LIBVIRT_CHECK_LIB([SANLOCK], [sanlock_client], [sanlock_init], [sanlock.h])
|
||||||
|
|
||||||
if test "x$with_sanlock" = "xyes" ; then
|
if test "x$with_sanlock" = "xyes" ; then
|
||||||
|
@ -17,8 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_SASL],[
|
AC_DEFUN([LIBVIRT_ARG_SASL],[
|
||||||
LIBVIRT_ARG_WITH([SASL], [sasl], [check])
|
LIBVIRT_ARG_WITH([SASL], [sasl], [check])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_SASL],[
|
||||||
LIBVIRT_CHECK_LIB_ALT([SASL], [sasl2],
|
LIBVIRT_CHECK_LIB_ALT([SASL], [sasl2],
|
||||||
[sasl_client_init], [sasl/sasl.h],
|
[sasl_client_init], [sasl/sasl.h],
|
||||||
[SASL1], [sasl],
|
[SASL1], [sasl],
|
||||||
|
@ -17,13 +17,15 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_SELINUX],[
|
AC_DEFUN([LIBVIRT_ARG_SELINUX],[
|
||||||
LIBVIRT_ARG_WITH([SELINUX], [SELinux], [check])
|
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],
|
LIBVIRT_CHECK_LIB([SELINUX], [selinux],
|
||||||
[fgetfilecon_raw], [selinux/selinux.h])
|
[fgetfilecon_raw], [selinux/selinux.h])
|
||||||
|
|
||||||
LIBVIRT_ARG_WITH_ALT([SELINUX_MOUNT], [set SELinux mount point], [check])
|
|
||||||
|
|
||||||
if test "$with_selinux" = "yes"; then
|
if test "$with_selinux" = "yes"; then
|
||||||
# libselinux changed signatures between 2.2 and 2.3
|
# libselinux changed signatures between 2.2 and 2.3
|
||||||
AC_CACHE_CHECK([for selinux setcon parameter type], [lv_cv_setcon_const],
|
AC_CACHE_CHECK([for selinux setcon parameter type], [lv_cv_setcon_const],
|
||||||
|
@ -17,8 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_SSH2],[
|
AC_DEFUN([LIBVIRT_ARG_SSH2],[
|
||||||
LIBVIRT_ARG_WITH([SSH2], [libssh2], [check], [1.3])
|
LIBVIRT_ARG_WITH([SSH2], [libssh2], [check], [1.3])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_SSH2],[
|
||||||
LIBVIRT_CHECK_PKG([SSH2], [libssh2], [1.3])
|
LIBVIRT_CHECK_PKG([SSH2], [libssh2], [1.3])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
@ -17,8 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_UDEV],[
|
AC_DEFUN([LIBVIRT_ARG_UDEV],[
|
||||||
LIBVIRT_ARG_WITH([UDEV], [libudev], [check], [145])
|
LIBVIRT_ARG_WITH([UDEV], [libudev], [check], [145])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_UDEV],[
|
||||||
AC_REQUIRE([LIBVIRT_CHECK_PCIACCESS])
|
AC_REQUIRE([LIBVIRT_CHECK_PCIACCESS])
|
||||||
LIBVIRT_CHECK_PKG([UDEV], [libudev], [145])
|
LIBVIRT_CHECK_PKG([UDEV], [libudev], [145])
|
||||||
|
|
||||||
|
@ -17,13 +17,15 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[
|
AC_DEFUN([LIBVIRT_ARG_WIRESHARK],[
|
||||||
LIBVIRT_ARG_WITH([WIRESHARK_DISSECTOR], [wireshark], [check], [1.11.3])
|
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],
|
LIBVIRT_ARG_WITH_ALT([WS_PLUGINDIR],
|
||||||
[wireshark plugins directory for use when installing
|
[wireshark plugins directory for use when installing
|
||||||
wireshark plugin], [check])
|
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
|
dnl Check for system location of wireshark plugins
|
||||||
if test "x$with_wireshark_dissector" != "xno" ; then
|
if test "x$with_wireshark_dissector" != "xno" ; then
|
||||||
|
@ -17,9 +17,11 @@ dnl License along with this library. If not, see
|
|||||||
dnl <http://www.gnu.org/licenses/>.
|
dnl <http://www.gnu.org/licenses/>.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_DEFUN([LIBVIRT_CHECK_YAJL],[
|
AC_DEFUN([LIBVIRT_ARG_YAJL],[
|
||||||
LIBVIRT_ARG_WITH([YAJL], [yajl], [check])
|
LIBVIRT_ARG_WITH([YAJL], [yajl], [check])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([LIBVIRT_CHECK_YAJL],[
|
||||||
dnl YAJL JSON library http://lloyd.github.com/yajl/
|
dnl YAJL JSON library http://lloyd.github.com/yajl/
|
||||||
if test "$with_qemu:$with_yajl" = yes:check; then
|
if test "$with_qemu:$with_yajl" = yes:check; then
|
||||||
dnl Some versions of qemu require the use of yajl; try to detect them
|
dnl Some versions of qemu require the use of yajl; try to detect them
|
||||||
|
Loading…
Reference in New Issue
Block a user