[libvirt] [libvirt-glib][PATCH] configure: Drop GLIB2_TEST_REQUIRED

Michal Privoznik posted 1 patch 5 years, 7 months ago
Failed in applying to current master (apply log)
configure.ac      | 8 +-------
tests/Makefile.am | 3 ---
2 files changed, 1 insertion(+), 10 deletions(-)
[libvirt] [libvirt-glib][PATCH] configure: Drop GLIB2_TEST_REQUIRED
Posted by Michal Privoznik 5 years, 7 months ago
Introduced in eb1f97a4b49a6e it is not needed anymore. The
minimal required version of glib is now the same as the one
required for tests.

This practically reverts the referenced commit.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 configure.ac      | 8 +-------
 tests/Makefile.am | 3 ---
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index dd1a85a..adc9e6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,6 @@ LIBVIRT_REQUIRED=1.2.5
 AC_SUBST([LIBVIRT_REQUIRED]) dnl used in the .spec file
 GLIB2_REQUIRED=2.38.0
 AC_SUBST([GLIB2_REQUIRED]) dnl used in the .spec file
-GLIB2_TEST_REQUIRED=2.38.0
 GOBJECT_INTROSPECTION_REQUIRED=1.36.0
 LIBXML2_REQUIRED=2.0.0
 
@@ -107,17 +106,12 @@ PKG_CHECK_EXISTS(libvirt >= 1.2.6,
 		   AC_DEFINE([HAVE_VIR_NETWORK_GET_DHCP_LEASES], 1, [Have virNetworkGetDHCPLeases?])
 		   AC_MSG_RESULT([yes])
 		 ],[AC_MSG_RESULT([no])])
-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..2fa847a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,3 @@
-if ENABLE_TESTS
-
 include $(top_srcdir)/build-aux/glib-tap.mk
 
 AM_CFLAGS = \
@@ -22,4 +20,3 @@ test_programs = test-gconfig test-events
 EXTRA_DIST += \
 	xml \
 	$(NULL)
-endif
-- 
2.16.4

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [libvirt-glib][PATCH] configure: Drop GLIB2_TEST_REQUIRED
Posted by Andrea Bolognani 5 years, 7 months ago
On Thu, 2018-08-16 at 14:56 +0200, Michal Privoznik wrote:
> Introduced in eb1f97a4b49a6e it is not needed anymore. The
> minimal required version of glib is now the same as the one
> required for tests.
> 
> This practically reverts the referenced commit.
> 
> Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
> ---
>  configure.ac      | 8 +-------
>  tests/Makefile.am | 3 ---
>  2 files changed, 1 insertion(+), 10 deletions(-)

Thanks for taking care of this :)

Reviewed-by: Andrea Bolognani <abologna@redhat.com>

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list