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

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>

diff --git a/m4/virt-apparmor.m4 b/m4/virt-apparmor.m4
index eb017d181b25da1339339ad7156eda47637c96c2..d60bb177fe42fde8bfdde57946576e3e405105a3 100644 (file)
--- a/m4/virt-apparmor.m4
+++ b/m4/virt-apparmor.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_APPARMOR],[
+  LIBVIRT_ARG_WITH([APPARMOR], [AppArmor], [check])
   LIBVIRT_CHECK_LIB([APPARMOR], [apparmor],
                     [aa_change_profile], [sys/apparmor.h])
 

diff --git a/m4/virt-attr.m4 b/m4/virt-attr.m4
index 341b35b98adc9d333f6db52bf7ab6c00eca5e908..b36498f9deb11895c97f6da6d97bd4ed087a5cdb 100644 (file)
--- a/m4/virt-attr.m4
+++ b/m4/virt-attr.m4
@@ -1,6 +1,7 @@
 dnl The libattr.so library
 
 AC_DEFUN([LIBVIRT_CHECK_ATTR],[
+  LIBVIRT_ARG_WITH([ATTR], [attr], [check])
   LIBVIRT_CHECK_LIB([ATTR], [attr], [getxattr], [attr/xattr.h])
 ])
 

diff --git a/m4/virt-audit.m4 b/m4/virt-audit.m4
index 60bf76cc7fd56b9c482a3ee95f36c2302c08e12f..0c09e4f72308272284ebba7e9b331aec2080b015 100644 (file)
--- a/m4/virt-audit.m4
+++ b/m4/virt-audit.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_AUDIT],[
+  LIBVIRT_ARG_WITH([AUDIT], [audit], [check])
   LIBVIRT_CHECK_LIB([AUDIT], [audit],
                     [audit_encode_nv_string], [libaudit.h])
 ])

diff --git a/m4/virt-avahi.m4 b/m4/virt-avahi.m4
index d0ac86c235855a0e227ce32a82e1367e6c0b1816..7a054145cf01b47cbe4a79d646f1046aa69224c9 100644 (file)
--- a/m4/virt-avahi.m4
+++ b/m4/virt-avahi.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_AVAHI],[
+  LIBVIRT_ARG_WITH([AVAHI], [avahi-client], [check], [0.6.0])
   LIBVIRT_CHECK_PKG([AVAHI], [avahi-client], [0.6.0])
 ])
 

diff --git a/m4/virt-blkid.m4 b/m4/virt-blkid.m4
index 69b7cf47c13e36c874347438c29d165fa33792c3..fb95eb910699a71bd9bbae022d24954274039b54 100644 (file)
--- a/m4/virt-blkid.m4
+++ b/m4/virt-blkid.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_BLKID],[
+  LIBVIRT_ARG_WITH([BLKID], [blkid], [check], [2.17])
   LIBVIRT_CHECK_PKG([BLKID], [blkid], [2.17])
 ])
 

diff --git a/m4/virt-capng.m4 b/m4/virt-capng.m4
index ab08321c90275e9de0d4747f56828aa8dad26980..6105dbae6bac9c6c14db0122eadbe0c5e85872d3 100644 (file)
--- a/m4/virt-capng.m4
+++ b/m4/virt-capng.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_CAPNG],[
+  LIBVIRT_ARG_WITH([CAPNG], [cap-ng], [check])
   LIBVIRT_CHECK_LIB([CAPNG], [cap-ng], [capng_updatev], [cap-ng.h])
 ])
 

diff --git a/m4/virt-curl.m4 b/m4/virt-curl.m4
index 8b71119b868bbd7b33259989e7dc323bf074a84f..ef87888a543df7bcb67d43a817a79abafffe50cb 100644 (file)
--- a/m4/virt-curl.m4
+++ b/m4/virt-curl.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_CURL],[
+  LIBVIRT_ARG_WITH([CURL], [libcurl], [check], [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

diff --git a/m4/virt-dbus.m4 b/m4/virt-dbus.m4
index 3f9b30686c6ad4172277d97adaabe58ee936f5d9..ae1348885078c97a5b3d3c4b1efd6df842d6f961 100644 (file)
--- a/m4/virt-dbus.m4
+++ b/m4/virt-dbus.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_DBUS],[
+  LIBVIRT_ARG_WITH([DBUS], [dbus-1], [check], [1.0.0])
   LIBVIRT_CHECK_PKG([DBUS], [dbus-1], [1.0.0])
 
   if test "$with_dbus" = "yes" ; then

diff --git a/m4/virt-fuse.m4 b/m4/virt-fuse.m4
index 0e723f258905c39a2fa69e5bd7a17e07732c13d9..298406b5972daecd293408d8e029b00021b067eb 100644 (file)
--- a/m4/virt-fuse.m4
+++ b/m4/virt-fuse.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_FUSE],[
+  LIBVIRT_ARG_WITH([FUSE], [fuse], [check], [2.8.6])
   LIBVIRT_CHECK_PKG([FUSE], [fuse], [2.8.6])
 ])
 

diff --git a/m4/virt-gluster.m4 b/m4/virt-gluster.m4
index 5a4a263c9eca9c31232f3200472ab0a6a55c53fb..dc9e8aff6b9febefae1d3d42d43f9e5af7f237c5 100644 (file)
--- a/m4/virt-gluster.m4
+++ b/m4/virt-gluster.m4
@@ -20,6 +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_CHECK_GLUSTER],[
+  LIBVIRT_ARG_WITH([GLUSTERFS], [glusterfs], [check], [3.4.1])
   LIBVIRT_CHECK_PKG([GLUSTERFS], [glusterfs-api], [3.4.1])
 ])
 

diff --git a/m4/virt-gnutls.m4 b/m4/virt-gnutls.m4
index 5bca950bcdd6d51e7ce00922f9d7a9003f5453f6..1e60f28da21120156a5d3c829fe0c5274fa92450 100644 (file)
--- a/m4/virt-gnutls.m4
+++ b/m4/virt-gnutls.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_GNUTLS],[
+  LIBVIRT_ARG_WITH([GNUTLS], [gnutls], [check], [2.2.0])
   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 49a843064fce1b750d5fb92abae64c056e161cfd..38aa7b2d8d56879d332088a95c779a7e6559fa0a 100644 (file)
--- a/m4/virt-hal.m4
+++ b/m4/virt-hal.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_HAL],[
+  LIBVIRT_ARG_WITH([HAL], [hal], [check], [0.5.0])
   LIBVIRT_CHECK_PKG([HAL], [hal], [0.5.0])
 ])
 

diff --git a/m4/virt-lib.m4 b/m4/virt-lib.m4
index 6fa386cd5dadc3db7b1c45238a2394012e9832a2..b28f78249b1f1b5f2e2abd749304864857c5ed34 100644 (file)
--- a/m4/virt-lib.m4
+++ b/m4/virt-lib.m4
@@ -61,8 +61,6 @@ AC_DEFUN([LIBVIRT_CHECK_LIB],[
   m4_pushdef([libs_var], check_name[_LIBS])
   m4_pushdef([with_var], [with_]check_name_lc)
 
-  LIBVIRT_ARG_WITH(check_name, library_name, [check])
-
   old_LIBS=$LIBS
   old_CFLAGS=$CFLAGS
   cflags_var=
@@ -186,8 +184,6 @@ AC_DEFUN([LIBVIRT_CHECK_LIB_ALT],[
   m4_pushdef([config_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_CFLAGS=$CFLAGS
   cflags_var=
@@ -307,8 +303,6 @@ AC_DEFUN([LIBVIRT_CHECK_PKG],[
   m4_pushdef([libs_var], check_name[_LIBS])
   m4_pushdef([with_var], [with_]check_name_lc)
 
-  LIBVIRT_ARG_WITH(check_name, pc_name, [check], pc_version)
-
   fail=0
   if test "x$with_var" != "xno" ; then
     PKG_CHECK_MODULES(check_name, pc_name[ >= ]pc_version, [

diff --git a/m4/virt-libssh.m4 b/m4/virt-libssh.m4
index 88ece21b2606e6c11a68744335612ee7debdbef9..b5912acae385e018a8d2a09e44e6574807c1128e 100644 (file)
--- a/m4/virt-libssh.m4
+++ b/m4/virt-libssh.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_LIBSSH],[
+  LIBVIRT_ARG_WITH([LIBSSH], [libssh], [check], [0.7])
   LIBVIRT_CHECK_PKG([LIBSSH], [libssh], [0.7])
 ])
 

diff --git a/m4/virt-netcf.m4 b/m4/virt-netcf.m4
index 7e0ee83fc571aa6fcde5f6a2e54a0379ab0c5e06..eb919afd7cf07bc119e9004c8ace78116ea3363f 100644 (file)
--- a/m4/virt-netcf.m4
+++ b/m4/virt-netcf.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_NETCF],[
+  LIBVIRT_ARG_WITH([NETCF], [netcf], [check], [0.1.4])
   LIBVIRT_CHECK_PKG([NETCF], [netcf], [0.1.4])
 
   if test "$with_netcf" = "yes" ; then

diff --git a/m4/virt-numactl.m4 b/m4/virt-numactl.m4
index fa66d246c1db3e92c22c00d96b9fa8f80c31ac8f..6f62c51d5b295b8110a9f16a40dbad068ca7260f 100644 (file)
--- a/m4/virt-numactl.m4
+++ b/m4/virt-numactl.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_NUMACTL],[
+  LIBVIRT_ARG_WITH([NUMACTL], [numa], [check])
   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 8ab18c6aacfe6ca100cbe707edddc87fed102c74..5f6a4eb0470d7779af4cb58f56ae97fe1cc73028 100644 (file)
--- a/m4/virt-openwsman.m4
+++ b/m4/virt-openwsman.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_OPENWSMAN],[
+  LIBVIRT_ARG_WITH([OPENWSMAN], [openwsman], [check], [2.2.3])
   LIBVIRT_CHECK_PKG([OPENWSMAN], [openwsman], [2.2.3])
 ])
 

diff --git a/m4/virt-pciaccess.m4 b/m4/virt-pciaccess.m4
index 2f5c958126c75df75c5989775476c2c2f46c713f..9a29fe9020b728ac2fd6b463b5590aafcf0c090c 100644 (file)
--- a/m4/virt-pciaccess.m4
+++ b/m4/virt-pciaccess.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_PCIACCESS],[
+  LIBVIRT_ARG_WITH([PCIACCESS], [pciaccess], [check], [0.10.0])
   LIBVIRT_CHECK_PKG([PCIACCESS], [pciaccess], [0.10.0])
 ])
 

diff --git a/m4/virt-readline.m4 b/m4/virt-readline.m4
index 775c1867646f3d0601661eb18a32176f72e7ce89..c1c8fa87cd6dd7756cb8cf6aabcc3277db07cee4 100644 (file)
--- a/m4/virt-readline.m4
+++ b/m4/virt-readline.m4
@@ -18,6 +18,8 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_READLINE],[
+  LIBVIRT_ARG_WITH([READLINE], [readline], [check])
+
   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 3c30cbfdf2342364be5dca47d63a0f54c0e3915a..64f950bd70311d2eb74d2d2ed43494b895763da9 100644 (file)
--- a/m4/virt-sanlock.m4
+++ b/m4/virt-sanlock.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[
+  LIBVIRT_ARG_WITH([SANLOCK], [sanlock-client], [check])
   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 8fb5d7f4ffb4417bffb6634cf24376da77f8d85f..9e5fe0386797f89c79279e4065c3ff326f035dfb 100644 (file)
--- a/m4/virt-sasl.m4
+++ b/m4/virt-sasl.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_SASL],[
+  LIBVIRT_ARG_WITH([SASL], [sasl], [check])
   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 afc4772c2dd8693d208ba60f228a5cd59ff7ef68..992066ad2e94326b85a7ebdafc0c2de03750b08d 100644 (file)
--- a/m4/virt-selinux.m4
+++ b/m4/virt-selinux.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_SELINUX],[
+  LIBVIRT_ARG_WITH([SELINUX], [SELinux], [check])
   LIBVIRT_CHECK_LIB([SELINUX], [selinux],
                     [fgetfilecon_raw], [selinux/selinux.h])
 

diff --git a/m4/virt-ssh2.m4 b/m4/virt-ssh2.m4
index 4479fbaea706c3d42a4d73a2d95570a6cbc46149..ed3bebbe9958d2875ede63fafa71308762d861c1 100644 (file)
--- a/m4/virt-ssh2.m4
+++ b/m4/virt-ssh2.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_SSH2],[
+  LIBVIRT_ARG_WITH([SSH2], [libssh2], [check], [1.3])
   LIBVIRT_CHECK_PKG([SSH2], [libssh2], [1.3])
 ])
 

diff --git a/m4/virt-udev.m4 b/m4/virt-udev.m4
index 29ab30a5e861e649a61d4346391907636d6ad382..3ac4c40732aa41f6b56a1c430408057f2db5b19b 100644 (file)
--- a/m4/virt-udev.m4
+++ b/m4/virt-udev.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_UDEV],[
+  LIBVIRT_ARG_WITH([UDEV], [libudev], [check], [145])
   AC_REQUIRE([LIBVIRT_CHECK_PCIACCESS])
   LIBVIRT_CHECK_PKG([UDEV], [libudev], [145])
 

diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4
index 89976ba3f908bed0c065e4125027d73bd257109d..d11bec05b569734a36b128ff10c18a1f4d8fe9e9 100644 (file)
--- a/m4/virt-wireshark.m4
+++ b/m4/virt-wireshark.m4
@@ -18,6 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 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_ARG_WITH_ALT([WS_PLUGINDIR],

diff --git a/m4/virt-yajl.m4 b/m4/virt-yajl.m4
index 8c452adca653096a575636206ec1d3674f2d173d..87271addad8b41bb59644978d9f50bc02c3e7f0c 100644 (file)
--- a/m4/virt-yajl.m4
+++ b/m4/virt-yajl.m4
@@ -18,6 +18,8 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([LIBVIRT_CHECK_YAJL],[
+  LIBVIRT_ARG_WITH([YAJL], [yajl], [check])
+
   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