telepathy-logger: bump GLib dep and use versioning macros

Guillaume Desmottes gdesmott at kemper.freedesktop.org
Wed Sep 25 07:38:46 PDT 2013


Module: telepathy-logger
Branch: master
Commit: 15f9b0e7259c46747326758d62c5a9ecb6ce3af2
URL:    http://cgit.freedesktop.org/telepathy/telepathy-logger/commit/?id=15f9b0e7259c46747326758d62c5a9ecb6ce3af2

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue Sep 24 11:57:45 2013 +0200

bump GLib dep and use versioning macros

Set to 2.32 as tp-glib so we can safely use newer API.

Also, stop disabling single include warnings.

https://bugs.freedesktop.org/show_bug.cgi?id=69797

---

 configure.ac |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index d710617..b65c3c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,6 @@ AC_COPYRIGHT([
 ])
 
 # Minimal version required
-GLIB_REQUIRED=2.28
 DBUS_REQUIRED=1.1.0
 DBUS_GLIB_REQUIRED=0.82
 
@@ -74,13 +73,10 @@ TELEPATHY_GLIB_REQUIRED=0.19.2
 AC_DEFINE(TP_VERSION_MIN_REQUIRED, TP_VERSION_0_18, [Ignore post 0.18 deprecations])
 AC_DEFINE(TP_VERSION_MAX_ALLOWED, TP_VERSION_0_20, [Prevent post 0.20 APIs])
 
-# Warning if GLib/GDK/GTK headers are included
-AC_DEFINE(G_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GLib])
-AC_DEFINE(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GDK pixbuf])
-
-# Disable GLib deprecation warnings for now; GValueArray is deprecated but we
-# need it for dbus-glib.
-AC_DEFINE(GLIB_DISABLE_DEPRECATION_WARNINGS, 1, [Build with GLib deprecated])
+GLIB_REQUIRED=2.32
+dnl MIN_REQUIRED must stay to 2.30 because of GValueArray
+AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_30], [Ignore post 2.30 deprecations])
+AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_32], [Prevent post 2.32 APIs])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])



More information about the telepathy-commits mailing list