diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2016-01-24 15:26:12 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2016-01-24 15:26:12 +0100 |
| commit | 1bdb1a558a05970e436e562cc3f8d3f43640933a (patch) | |
| tree | f6f19e22d00000a3a1c4ac8f287f6d930040286c | |
| parent | 97962bb65caaabc4133740a2698dae2406be319e (diff) | |
| download | ModemManager-1bdb1a558a05970e436e562cc3f8d3f43640933a.tar.gz | |
build: require GLib 2.36
We now need it for GTask support.
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | plugins/Makefile.am | 8 |
2 files changed, 7 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 622a65f24..8e8bda4e9 100644 --- a/configure.ac +++ b/configure.ac @@ -94,8 +94,11 @@ dnl----------------------------------------------------------------------------- dnl Build dependencies dnl +GLIB_MIN_VERSION=2.36.0 +GUDEV_MIN_VERSION=147 + PKG_CHECK_MODULES(MM, - glib-2.0 >= 2.32 + glib-2.0 >= $GLIB_MIN_VERSION gmodule-2.0 gobject-2.0 gio-2.0 @@ -104,7 +107,7 @@ AC_SUBST(MM_CFLAGS) AC_SUBST(MM_LIBS) PKG_CHECK_MODULES(LIBMM_GLIB, - glib-2.0 >= 2.32 + glib-2.0 >= $GLIB_MIN_VERSION gobject-2.0 gio-2.0 gio-unix-2.0) @@ -112,13 +115,13 @@ AC_SUBST(LIBMM_GLIB_CFLAGS) AC_SUBST(LIBMM_GLIB_LIBS) PKG_CHECK_MODULES(MMCLI, - glib-2.0 >= 2.32 + glib-2.0 >= $GLIB_MIN_VERSION gobject-2.0 gio-2.0) AC_SUBST(MMCLI_CFLAGS) AC_SUBST(LIBMM_LIBS) -PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147) +PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= $GUDEV_MIN_VERSION) AC_SUBST(GUDEV_CFLAGS) AC_SUBST(GUDEV_LIBS) @@ -133,10 +136,6 @@ dnl----------------------------------------------------------------------------- dnl Testing support dnl -dnl DBus testing support only with GIO 2.34 -PKG_CHECK_MODULES(DBUS_TEST_SUPPORT, [gio-2.0 >= 2.34], [have_dbus_test_support=yes], [have_dbus_test_support=no]) -AM_CONDITIONAL(BUILD_DBUS_TEST_SUPPORT, test "x$have_dbus_test_support" = "xyes") - dnl Code coverage (disabled by default) AX_CODE_COVERAGE diff --git a/plugins/Makefile.am b/plugins/Makefile.am index e6f56a25f..3cc5e2ff1 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -50,8 +50,6 @@ noinst_LTLIBRARIES = # Common service test support -if BUILD_DBUS_TEST_SUPPORT - noinst_LTLIBRARIES += libmm-test-common.la libmm_test_common_la_SOURCES = \ @@ -89,8 +87,6 @@ TEST_COMMON_LIBADD_FLAGS = \ $(builddir)/libmm-test-common.la \ $(top_builddir)/libmm-glib/libmm-glib.la -endif - ######################################## # Icera-specific support @@ -161,16 +157,12 @@ libmm_plugin_generic_la_SOURCES = \ libmm_plugin_generic_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) libmm_plugin_generic_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) -if BUILD_DBUS_TEST_SUPPORT - noinst_PROGRAMS += test-service-generic test_service_generic_SOURCES = generic/tests/test-service-generic.c test_service_generic_CPPFLAGS = $(TEST_COMMON_COMPILER_FLAGS) test_service_generic_LDADD = $(TEST_COMMON_LIBADD_FLAGS) test_service_generic_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) -endif - ## Motorola libmm_plugin_motorola_la_SOURCES = \ motorola/mm-plugin-motorola.c \ |