External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

m4/virt-lib: move LIBVIRT_ARG_WITH out of LIBVIRT_CHECK_(LIB|LIB_ALT|PKG)

Browse Source 
Following patch will update LIBVIRT_CHECK_(LIB|LIB_ALT|PKG) macros in
a way that you will be able to call a another macro as a fallback if
the first one fails.  To allow that, we need to move the
LIBVIRT_ARG_WITH out of those macro to not have two or more same lines
in output of "configure --help".

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-11-23 13:22:25 +01:00
parent ca01aeb57f
commit e03d43714a
26 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
m4/virt-apparmor.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_APPARMOR],[ AC_DEFUN([LIBVIRT_CHECK_APPARMOR],[
LIBVIRT_ARG_WITH([APPARMOR], [AppArmor], [check])
LIBVIRT_CHECK_LIB([APPARMOR], [apparmor], LIBVIRT_CHECK_LIB([APPARMOR], [apparmor],
[aa_change_profile], [sys/apparmor.h]) [aa_change_profile], [sys/apparmor.h])

1
m4/virt-attr.m4
View File

@ -1,6 +1,7 @@
dnl The libattr.so library dnl The libattr.so library
AC_DEFUN([LIBVIRT_CHECK_ATTR],[ AC_DEFUN([LIBVIRT_CHECK_ATTR],[
LIBVIRT_ARG_WITH([ATTR], [attr], [check])
LIBVIRT_CHECK_LIB([ATTR], [attr], [getxattr], [attr/xattr.h]) LIBVIRT_CHECK_LIB([ATTR], [attr], [getxattr], [attr/xattr.h])
]) ])

1
m4/virt-audit.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_AUDIT],[ AC_DEFUN([LIBVIRT_CHECK_AUDIT],[
LIBVIRT_ARG_WITH([AUDIT], [audit], [check])
LIBVIRT_CHECK_LIB([AUDIT], [audit], LIBVIRT_CHECK_LIB([AUDIT], [audit],
[audit_encode_nv_string], [libaudit.h]) [audit_encode_nv_string], [libaudit.h])
]) ])

1
m4/virt-avahi.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_AVAHI],[ AC_DEFUN([LIBVIRT_CHECK_AVAHI],[
LIBVIRT_ARG_WITH([AVAHI], [avahi-client], [check], [0.6.0])
LIBVIRT_CHECK_PKG([AVAHI], [avahi-client], [0.6.0]) LIBVIRT_CHECK_PKG([AVAHI], [avahi-client], [0.6.0])
]) ])

1
m4/virt-blkid.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_BLKID],[ AC_DEFUN([LIBVIRT_CHECK_BLKID],[
LIBVIRT_ARG_WITH([BLKID], [blkid], [check], [2.17])
LIBVIRT_CHECK_PKG([BLKID], [blkid], [2.17]) LIBVIRT_CHECK_PKG([BLKID], [blkid], [2.17])
]) ])

1
m4/virt-capng.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_CAPNG],[ AC_DEFUN([LIBVIRT_CHECK_CAPNG],[
LIBVIRT_ARG_WITH([CAPNG], [cap-ng], [check])
LIBVIRT_CHECK_LIB([CAPNG], [cap-ng], [capng_updatev], [cap-ng.h]) LIBVIRT_CHECK_LIB([CAPNG], [cap-ng], [capng_updatev], [cap-ng.h])
]) ])

1
m4/virt-curl.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_CURL],[ AC_DEFUN([LIBVIRT_CHECK_CURL],[
LIBVIRT_ARG_WITH([CURL], [libcurl], [check], [7.18.0])
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

1
m4/virt-dbus.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_DBUS],[ AC_DEFUN([LIBVIRT_CHECK_DBUS],[
LIBVIRT_ARG_WITH([DBUS], [dbus-1], [check], [1.0.0])
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

1
m4/virt-fuse.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_FUSE],[ AC_DEFUN([LIBVIRT_CHECK_FUSE],[
LIBVIRT_ARG_WITH([FUSE], [fuse], [check], [2.8.6])
LIBVIRT_CHECK_PKG([FUSE], [fuse], [2.8.6]) LIBVIRT_CHECK_PKG([FUSE], [fuse], [2.8.6])
]) ])

1
m4/virt-gluster.m4
View File

@ -20,6 +20,7 @@ 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_CHECK_GLUSTER],[
LIBVIRT_ARG_WITH([GLUSTERFS], [glusterfs], [check], [3.4.1])
LIBVIRT_CHECK_PKG([GLUSTERFS], [glusterfs-api], [3.4.1]) LIBVIRT_CHECK_PKG([GLUSTERFS], [glusterfs-api], [3.4.1])
]) ])

1
m4/virt-gnutls.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_GNUTLS],[ AC_DEFUN([LIBVIRT_CHECK_GNUTLS],[
LIBVIRT_ARG_WITH([GNUTLS], [gnutls], [check], [2.2.0])
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

1
m4/virt-hal.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_HAL],[ AC_DEFUN([LIBVIRT_CHECK_HAL],[
LIBVIRT_ARG_WITH([HAL], [hal], [check], [0.5.0])
LIBVIRT_CHECK_PKG([HAL], [hal], [0.5.0]) LIBVIRT_CHECK_PKG([HAL], [hal], [0.5.0])
]) ])

6
m4/virt-lib.m4
View File

@ -61,8 +61,6 @@ AC_DEFUN([LIBVIRT_CHECK_LIB],[
m4_pushdef([libs_var], check_name[_LIBS]) m4_pushdef([libs_var], check_name[_LIBS])
m4_pushdef([with_var], [with_]check_name_lc) m4_pushdef([with_var], [with_]check_name_lc)
LIBVIRT_ARG_WITH(check_name, library_name, [check])
old_LIBS=$LIBS old_LIBS=$LIBS
old_CFLAGS=$CFLAGS old_CFLAGS=$CFLAGS
cflags_var= cflags_var=
@ -186,8 +184,6 @@ AC_DEFUN([LIBVIRT_CHECK_LIB_ALT],[
m4_pushdef([config_var_alt], [WITH_]check_name_alt) m4_pushdef([config_var_alt], [WITH_]check_name_alt)
m4_pushdef([make_var_alt], [WITH_]check_name_alt) m4_pushdef([make_var_alt], [WITH_]check_name_alt)
LIBVIRT_ARG_WITH(check_name, library_name, [check])
old_LIBS=$LIBS old_LIBS=$LIBS
old_CFLAGS=$CFLAGS old_CFLAGS=$CFLAGS
cflags_var= cflags_var=
@ -307,8 +303,6 @@ AC_DEFUN([LIBVIRT_CHECK_PKG],[
m4_pushdef([libs_var], check_name[_LIBS]) m4_pushdef([libs_var], check_name[_LIBS])
m4_pushdef([with_var], [with_]check_name_lc) m4_pushdef([with_var], [with_]check_name_lc)
LIBVIRT_ARG_WITH(check_name, pc_name, [check], pc_version)
fail=0 fail=0
if test "x$with_var" != "xno" ; then if test "x$with_var" != "xno" ; then
PKG_CHECK_MODULES(check_name, pc_name[ >= ]pc_version, [ PKG_CHECK_MODULES(check_name, pc_name[ >= ]pc_version, [

1
m4/virt-libssh.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_LIBSSH],[ AC_DEFUN([LIBVIRT_CHECK_LIBSSH],[
LIBVIRT_ARG_WITH([LIBSSH], [libssh], [check], [0.7])
LIBVIRT_CHECK_PKG([LIBSSH], [libssh], [0.7]) LIBVIRT_CHECK_PKG([LIBSSH], [libssh], [0.7])
]) ])

1
m4/virt-netcf.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_NETCF],[ AC_DEFUN([LIBVIRT_CHECK_NETCF],[
LIBVIRT_ARG_WITH([NETCF], [netcf], [check], [0.1.4])
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

1
m4/virt-numactl.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_NUMACTL],[ AC_DEFUN([LIBVIRT_CHECK_NUMACTL],[
LIBVIRT_ARG_WITH([NUMACTL], [numa], [check])
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

1
m4/virt-openwsman.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_OPENWSMAN],[ AC_DEFUN([LIBVIRT_CHECK_OPENWSMAN],[
LIBVIRT_ARG_WITH([OPENWSMAN], [openwsman], [check], [2.2.3])
LIBVIRT_CHECK_PKG([OPENWSMAN], [openwsman], [2.2.3]) LIBVIRT_CHECK_PKG([OPENWSMAN], [openwsman], [2.2.3])
]) ])

1
m4/virt-pciaccess.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_PCIACCESS],[ AC_DEFUN([LIBVIRT_CHECK_PCIACCESS],[
LIBVIRT_ARG_WITH([PCIACCESS], [pciaccess], [check], [0.10.0])
LIBVIRT_CHECK_PKG([PCIACCESS], [pciaccess], [0.10.0]) LIBVIRT_CHECK_PKG([PCIACCESS], [pciaccess], [0.10.0])
]) ])

2
m4/virt-readline.m4
View File

@ -18,6 +18,8 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_READLINE],[ AC_DEFUN([LIBVIRT_CHECK_READLINE],[
LIBVIRT_ARG_WITH([READLINE], [readline], [check])
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

1
m4/virt-sanlock.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[ AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[
LIBVIRT_ARG_WITH([SANLOCK], [sanlock-client], [check])
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

1
m4/virt-sasl.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_SASL],[ AC_DEFUN([LIBVIRT_CHECK_SASL],[
LIBVIRT_ARG_WITH([SASL], [sasl], [check])
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],

1
m4/virt-selinux.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_SELINUX],[ AC_DEFUN([LIBVIRT_CHECK_SELINUX],[
LIBVIRT_ARG_WITH([SELINUX], [SELinux], [check])
LIBVIRT_CHECK_LIB([SELINUX], [selinux], LIBVIRT_CHECK_LIB([SELINUX], [selinux],
[fgetfilecon_raw], [selinux/selinux.h]) [fgetfilecon_raw], [selinux/selinux.h])

1
m4/virt-ssh2.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_SSH2],[ AC_DEFUN([LIBVIRT_CHECK_SSH2],[
LIBVIRT_ARG_WITH([SSH2], [libssh2], [check], [1.3])
LIBVIRT_CHECK_PKG([SSH2], [libssh2], [1.3]) LIBVIRT_CHECK_PKG([SSH2], [libssh2], [1.3])
]) ])

1
m4/virt-udev.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_UDEV],[ AC_DEFUN([LIBVIRT_CHECK_UDEV],[
LIBVIRT_ARG_WITH([UDEV], [libudev], [check], [145])
AC_REQUIRE([LIBVIRT_CHECK_PCIACCESS]) AC_REQUIRE([LIBVIRT_CHECK_PCIACCESS])
LIBVIRT_CHECK_PKG([UDEV], [libudev], [145]) LIBVIRT_CHECK_PKG([UDEV], [libudev], [145])

1
m4/virt-wireshark.m4
View File

@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[ AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[
LIBVIRT_ARG_WITH([WIRESHARK_DISSECTOR], [wireshark], [check], [1.11.3])
LIBVIRT_CHECK_PKG([WIRESHARK_DISSECTOR], [wireshark], [1.11.3]) LIBVIRT_CHECK_PKG([WIRESHARK_DISSECTOR], [wireshark], [1.11.3])
LIBVIRT_ARG_WITH_ALT([WS_PLUGINDIR], LIBVIRT_ARG_WITH_ALT([WS_PLUGINDIR],

2
m4/virt-yajl.m4
View File

@ -18,6 +18,8 @@ dnl <http://www.gnu.org/licenses/>.
dnl dnl
AC_DEFUN([LIBVIRT_CHECK_YAJL],[ AC_DEFUN([LIBVIRT_CHECK_YAJL],[
LIBVIRT_ARG_WITH([YAJL], [yajl], [check])
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