telepathy-gabble: configure: ignore post 0. 18 deprecations so we can build against tp-glib master
Jonny Lamb
jonny at kemper.freedesktop.org
Thu May 17 10:02:57 PDT 2012
Module: telepathy-gabble
Branch: master
Commit: 4f67d0e00694967c31ab35ab6eec0a325bc19d5d
URL: http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=4f67d0e00694967c31ab35ab6eec0a325bc19d5d
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date: Thu May 17 17:57:50 2012 +0100
configure: ignore post 0.18 deprecations so we can build against tp-glib master
Gabble still uses emit_new_channels and tp_handle_{,un}ref, but for
now we can ignore it with this. config.h had to be included in the
right place for a lot of source files.
Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
configure.ac | 1 +
plugins/console.c | 4 ++--
plugins/test.c | 3 ++-
src/base-call-channel.c | 1 +
src/call-channel.c | 1 +
src/call-content.c | 2 ++
src/call-member-content.c | 1 +
src/call-muc-channel.c | 1 +
src/media-channel-hold.c | 2 ++
src/message-util.c | 2 ++
src/muc-tube-dbus.c | 2 ++
src/muc-tube-stream.c | 2 ++
src/olpc-activity.c | 2 ++
src/plugin-connection.c | 2 ++
src/plugin-loader.c | 2 ++
src/plugin.c | 2 ++
src/protocol.c | 2 ++
src/room-config.c | 2 ++
18 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 12303e2..2649232 100644
--- a/configure.ac
+++ b/configure.ac
@@ -296,6 +296,7 @@ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.1.0, dbus-glib-1 >= 0.82])
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
+AC_DEFINE(TP_VERSION_MIN_REQUIRED, TP_VERSION_0_18, [Ignore post 0.18 deprecations])
PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib >= 0.19.0])
AC_SUBST(TP_GLIB_CFLAGS)
diff --git a/plugins/console.c b/plugins/console.c
index 69dd1e1..8ec2894 100644
--- a/plugins/console.c
+++ b/plugins/console.c
@@ -17,10 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "console.h"
-
#include "config.h"
+#include "console.h"
+
#include <string.h>
#include <telepathy-glib/telepathy-glib.h>
diff --git a/plugins/test.c b/plugins/test.c
index 92c0833..bb6b719 100644
--- a/plugins/test.c
+++ b/plugins/test.c
@@ -1,6 +1,7 @@
-#include "test.h"
#include "config.h"
+#include "test.h"
+
#include <stdio.h>
#include <telepathy-glib/telepathy-glib.h>
diff --git a/src/base-call-channel.c b/src/base-call-channel.c
index 321e3da..5ea79b2 100644
--- a/src/base-call-channel.c
+++ b/src/base-call-channel.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/call-channel.c b/src/call-channel.c
index f51454f..b2cd814 100644
--- a/src/call-channel.c
+++ b/src/call-channel.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/call-content.c b/src/call-content.c
index 8ca94be..8550b82 100644
--- a/src/call-content.c
+++ b/src/call-content.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/call-member-content.c b/src/call-member-content.c
index 7d9f099..8899b0f 100644
--- a/src/call-member-content.c
+++ b/src/call-member-content.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/call-muc-channel.c b/src/call-muc-channel.c
index 75d2b1b..4733dfb 100644
--- a/src/call-muc-channel.c
+++ b/src/call-muc-channel.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/media-channel-hold.c b/src/media-channel-hold.c
index 646ab93..ebd1cf2 100644
--- a/src/media-channel-hold.c
+++ b/src/media-channel-hold.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "media-channel.h"
#include "media-channel-internal.h"
diff --git a/src/message-util.c b/src/message-util.c
index a272a17..008bbe5 100644
--- a/src/message-util.c
+++ b/src/message-util.c
@@ -22,6 +22,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "message-util.h"
#include <string.h>
diff --git a/src/muc-tube-dbus.c b/src/muc-tube-dbus.c
index 5ed1eef..7c37e9e 100644
--- a/src/muc-tube-dbus.c
+++ b/src/muc-tube-dbus.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "muc-tube-dbus.h"
G_DEFINE_TYPE (GabbleMucTubeDBus, gabble_muc_tube_dbus,
diff --git a/src/muc-tube-stream.c b/src/muc-tube-stream.c
index ad173fe..a50a94a 100644
--- a/src/muc-tube-stream.c
+++ b/src/muc-tube-stream.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "muc-tube-stream.h"
G_DEFINE_TYPE (GabbleMucTubeStream, gabble_muc_tube_stream,
diff --git a/src/olpc-activity.c b/src/olpc-activity.c
index 86df324..a5f34a5 100644
--- a/src/olpc-activity.c
+++ b/src/olpc-activity.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "olpc-activity.h"
#include <stdlib.h>
diff --git a/src/plugin-connection.c b/src/plugin-connection.c
index abec9e4..0d0d95e 100644
--- a/src/plugin-connection.c
+++ b/src/plugin-connection.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "gabble/plugin-connection.h"
#include <glib-object.h>
diff --git a/src/plugin-loader.c b/src/plugin-loader.c
index f08087e..56acda0 100644
--- a/src/plugin-loader.c
+++ b/src/plugin-loader.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "plugin-loader.h"
#include <glib.h>
diff --git a/src/plugin.c b/src/plugin.c
index a96bb91..f5c2642 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "gabble/plugin.h"
#include <telepathy-glib/errors.h>
diff --git a/src/protocol.c b/src/protocol.c
index 1445219..eb054e1 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "protocol.h"
#include <string.h>
diff --git a/src/room-config.c b/src/room-config.c
index 6345fc7..199545a 100644
--- a/src/room-config.c
+++ b/src/room-config.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "room-config.h"
#include "muc-channel.h"
More information about the telepathy-commits
mailing list