Based on the distro target policy we have the following
min versions in various distros
libvirt glib2 gobject-introspection
RHEL 7.0: 1.1.1 2.36.3 1.36.0
Fedora 21: 1.2.9 2.42.1 1.42.0
Ubuntu 14.10: 1.2.8 2.42.0 1.41.0
Ubuntu LTS 14.04: 1.2.2 2.40.0 1.40.0
Suse 12.0: 1.2.5 2.38.2 1.38.0
OpenSUSE 13.1: 1.1.2 2.38.2 1.38.0
Debian 8: 1.2.9 2.42.0 1.42.0
Which means we can reasonably depend on
libvirt >= 1.1.1
glib2 >= 2.36.3
gobject-introspection >= 1.36.0
This allows us to remove the conditional building of unit
tests
---
configure.ac | 15 ++++-----------
tests/Makefile.am | 2 --
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/configure.ac b/configure.ac
index d9b4665..b473d2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,14 +9,11 @@ AC_CANONICAL_HOST
AM_SILENT_RULES([yes])
-LIBVIRT_REQUIRED=0.10.2
+LIBVIRT_REQUIRED=1.1.1
AC_SUBST([LIBVIRT_REQUIRED]) dnl used in the .spec file
-GLIB2_REQUIRED=2.36.0
+GLIB2_REQUIRED=2.36.3
AC_SUBST([GLIB2_REQUIRED]) dnl used in the .spec file
-GLIB2_TEST_REQUIRED=2.38.0
-GOBJECT2_REQUIRED=2.10.0
-GIO_REQUIRED=2.10.0
-GOBJECT_INTROSPECTION_REQUIRED=0.10.8
+GOBJECT_INTROSPECTION_REQUIRED=1.36.0
LIBXML2_REQUIRED=2.0.0
LIBVIRT_GLIB_MAJOR_VERSION=`echo $VERSION | awk -F. '{print $1}'`
@@ -102,16 +99,12 @@ AC_CHECK_LIB([virt],
[virNetworkGetDHCPLeases],
[AC_DEFINE([HAVE_VIR_NETWORK_GET_DHCP_LEASES], 1, [Have virNetworkGetDHCPLeases?])])
enable_tests=no
-PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_TEST_REQUIRED,
- [enable_tests=yes],
- [PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQUIRED)])
+PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQUIRED)
PKG_CHECK_MODULES(GTHREAD2, gthread-2.0 >= $GLIB2_REQUIRED)
PKG_CHECK_MODULES(GOBJECT2, gobject-2.0 >= $GLIB2_REQUIRED)
PKG_CHECK_MODULES(GIO2, gio-2.0 >= $GLIB2_REQUIRED)
PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= $LIBXML2_REQUIRED)
-AM_CONDITIONAL([ENABLE_TESTS], [test "$enable_tests" = "yes"])
-
LIBVIRT_GLIB_GETTEXT
dnl Should be in m4/virt-gettext.m4 but intltoolize is too
dnl dumb to find it there
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3f4ef6c..396092a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,3 @@
-if ENABLE_TESTS
include $(top_srcdir)/build-aux/glib-tap.mk
@@ -22,4 +21,3 @@ test_programs = test-gconfig test-events
EXTRA_DIST += \
xml \
$(NULL)
-endif
--
2.4.3
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list