colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: require GLib 2.36

Browse Source 
We now need it for GTask support.
This commit is contained in:
Aleksander Morgado
2016-01-24 15:26:12 +01:00
parent 97962bb65c
commit 1bdb1a558a
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@@ -94,8 +94,11 @@ dnl-----------------------------------------------------------------------------
dnl Build dependencies dnl Build dependencies
dnl dnl
GLIB_MIN_VERSION=2.36.0
GUDEV_MIN_VERSION=147
PKG_CHECK_MODULES(MM, PKG_CHECK_MODULES(MM,
glib-2.0 >= 2.32 glib-2.0 >= $GLIB_MIN_VERSION
gmodule-2.0 gmodule-2.0
gobject-2.0 gobject-2.0
gio-2.0 gio-2.0
@@ -104,7 +107,7 @@ AC_SUBST(MM_CFLAGS)
AC_SUBST(MM_LIBS) AC_SUBST(MM_LIBS)
PKG_CHECK_MODULES(LIBMM_GLIB, PKG_CHECK_MODULES(LIBMM_GLIB,
glib-2.0 >= 2.32 glib-2.0 >= $GLIB_MIN_VERSION
gobject-2.0 gobject-2.0
gio-2.0 gio-2.0
gio-unix-2.0) gio-unix-2.0)
@@ -112,13 +115,13 @@ AC_SUBST(LIBMM_GLIB_CFLAGS)
AC_SUBST(LIBMM_GLIB_LIBS) AC_SUBST(LIBMM_GLIB_LIBS)
PKG_CHECK_MODULES(MMCLI, PKG_CHECK_MODULES(MMCLI,
glib-2.0 >= 2.32 glib-2.0 >= $GLIB_MIN_VERSION
gobject-2.0 gobject-2.0
gio-2.0) gio-2.0)
AC_SUBST(MMCLI_CFLAGS) AC_SUBST(MMCLI_CFLAGS)
AC_SUBST(LIBMM_LIBS) 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_CFLAGS)
AC_SUBST(GUDEV_LIBS) AC_SUBST(GUDEV_LIBS)
@@ -133,10 +136,6 @@ dnl-----------------------------------------------------------------------------
dnl Testing support dnl Testing support
dnl 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) dnl Code coverage (disabled by default)
AX_CODE_COVERAGE AX_CODE_COVERAGE

8
plugins/Makefile.am
View File

@@ -50,8 +50,6 @@ noinst_LTLIBRARIES =
# Common service test support # Common service test support
if BUILD_DBUS_TEST_SUPPORT
noinst_LTLIBRARIES += libmm-test-common.la noinst_LTLIBRARIES += libmm-test-common.la
libmm_test_common_la_SOURCES = \ libmm_test_common_la_SOURCES = \
@@ -89,8 +87,6 @@ TEST_COMMON_LIBADD_FLAGS = \
$(builddir)/libmm-test-common.la \ $(builddir)/libmm-test-common.la \
$(top_builddir)/libmm-glib/libmm-glib.la $(top_builddir)/libmm-glib/libmm-glib.la
endif
######################################## ########################################
# Icera-specific support # 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_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
libmm_plugin_generic_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) libmm_plugin_generic_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
if BUILD_DBUS_TEST_SUPPORT
noinst_PROGRAMS += test-service-generic noinst_PROGRAMS += test-service-generic
test_service_generic_SOURCES = generic/tests/test-service-generic.c test_service_generic_SOURCES = generic/tests/test-service-generic.c
test_service_generic_CPPFLAGS = $(TEST_COMMON_COMPILER_FLAGS) test_service_generic_CPPFLAGS = $(TEST_COMMON_COMPILER_FLAGS)
test_service_generic_LDADD = $(TEST_COMMON_LIBADD_FLAGS) test_service_generic_LDADD = $(TEST_COMMON_LIBADD_FLAGS)
test_service_generic_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) test_service_generic_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
endif
## Motorola ## Motorola
libmm_plugin_motorola_la_SOURCES = \ libmm_plugin_motorola_la_SOURCES = \
motorola/mm-plugin-motorola.c \ motorola/mm-plugin-motorola.c \