summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2016-10-11 16:41:52 +0200
committerAleksander Morgado <aleksander@aleksander.es>2016-10-12 10:46:56 +0200
commitc16aed50dfc066f572cf1d8cbcedb4581f687fd9 (patch)
treed2abca6f79662b10d232fea5a45559a29060c346
parent06bd24e00c97a961490939c33f046cefef01332f (diff)
build: limit the available glib functionality to the version we support
Otherwise we can accidentally use something that we ought not. Also, there's deprecation warnings for stuff that's not deprecated in the version we support yet: mm-modem-simple.c: In function 'mm_modem_simple_connect_finish': mm-modem-simple.c:117:5: warning: 'g_simple_async_result_propagate_error' is deprecated [-Wdeprecated-declarations] if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) ^~ (cherry picked from commit 6dc08a69adc4294e2b22f14b754b541c64109fba)
-rw-r--r--configure.ac3
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index c6404984..d08ede76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,6 +103,7 @@ PKG_CHECK_MODULES(MM,
gobject-2.0
gio-2.0
gio-unix-2.0)
+MM_FLAGS="$MM_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36"
AC_SUBST(MM_CFLAGS)
AC_SUBST(MM_LIBS)
@@ -111,6 +112,7 @@ PKG_CHECK_MODULES(LIBMM_GLIB,
gobject-2.0
gio-2.0
gio-unix-2.0)
+LIBMM_GLIB_CFLAGS="$LIBMM_GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36"
AC_SUBST(LIBMM_GLIB_CFLAGS)
AC_SUBST(LIBMM_GLIB_LIBS)
@@ -118,6 +120,7 @@ PKG_CHECK_MODULES(MMCLI,
glib-2.0 >= $GLIB_MIN_VERSION
gobject-2.0
gio-2.0)
+MMCLI_CFLAGS="$MMCLI_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36"
AC_SUBST(MMCLI_CFLAGS)
AC_SUBST(MMCLI_LIBS)