Don't double-free the EmpathyTpCallStreams

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b26e0e5bb80c58ce4709a6f4876b43af5c4d12b0..80b208cc8fd7ccf9aab7b0780502c6572bbd7ad0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,21 +1,21 @@
-AC_INIT(Empathy, 2.25.1, http://bugzilla.gnome.org/browse.cgi?product=empathy)
+AC_INIT(Empathy, 2.25.90, http://bugzilla.gnome.org/browse.cgi?product=empathy)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([
   Copyright (C) 2003-2007 Imendio AB
-  Copyright (C) 2007 Collabora Ltd.
+  Copyright (C) 2007-2008 Collabora Ltd.
 ])
 
 # LT Version numbers, remember to change them just *before* a release.
 #   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)
 #   (Interfaces added:      CURRENT++, AGE++, REVISION=0)
 #   (No interfaces changed:                   REVISION++)
-LIBEMPATHY_CURRENT=16
-LIBEMPATHY_AGE=2
-LIBEMPATHY_REVISION=2
+LIBEMPATHY_CURRENT=20
+LIBEMPATHY_AGE=0
+LIBEMPATHY_REVISION=0
 
-LIBEMPATHY_GTK_CURRENT=15
+LIBEMPATHY_GTK_CURRENT=19
 LIBEMPATHY_GTK_AGE=0
-LIBEMPATHY_GTK_REVISION=4
+LIBEMPATHY_GTK_REVISION=0
 
 AC_SUBST(LIBEMPATHY_CURRENT)
 AC_SUBST(LIBEMPATHY_AGE)
@@ -26,18 +26,26 @@ AC_SUBST(LIBEMPATHY_GTK_REVISION)
 
 # Minimal version required
 GLIB_REQUIRED=2.16.0
-GTK_REQUIRED=2.12.0
+GTK_REQUIRED=2.14.0
 GCONF_REQUIRED=1.2.0
 LIBGLADE_REQUIRED=2.0.0
 LIBPANELAPPLET_REQUIRED=2.10.0
-TELEPATHY_GLIB_REQUIRED=0.7.7
+TELEPATHY_GLIB_REQUIRED=0.7.19
 MISSION_CONTROL_REQUIRED=4.61
 ENCHANT_REQUIRED=1.2.0
 ISO_CODES_REQUIRED=0.35
+LIBNOTIFY_REQUIRED=0.4.4
 
-# Uncomment that to build without deprecated symbols
-# AC_DEFINE(GTK_DISABLE_DEPRECATED, 1, [Disable deprecated GTK symbols])
-# AC_DEFINE(G_DISABLE_DEPRECATED, 1, [Disable deprecated GLib symbols])
+# Uncomment that to build with deprecated symbols disabled
+#AC_DEFINE(G_DISABLE_DEPRECATED, [], [Disable deprecated GLib symbols])
+#AC_DEFINE(GDK_PIXBUF_DISABLE_DEPRECATED, [], [Disable deprecated GDK pixbuf symbols])
+#AC_DEFINE(GDK_DISABLE_DEPRECATED, [], [Disable deprecated GDK symbols])
+#AC_DEFINE(GTK_DISABLE_DEPRECATED, [], [Disable deprecated GTK symbols])
+
+# Uncomment that to build with single include disabled
+#AC_DEFINE(G_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GLib])
+#AC_DEFINE(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GDK pixbuf])
+#AC_DEFINE(GTK_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GTK])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
@@ -85,6 +93,8 @@ PKG_CHECK_MODULES(LIBEMPATHY,
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
    libmissioncontrol >= $MISSION_CONTROL_REQUIRED
    gio-2.0 >= $GLIB_REQUIRED
+   gio-unix-2.0 >= $GLIB_REQUIRED
+   telepathy-farsight
 ])
 
 PKG_CHECK_MODULES(EMPATHY,
@@ -98,10 +108,14 @@ PKG_CHECK_MODULES(EMPATHY,
    gtk+-2.0 >= $GTK_REQUIRED
    x11
    libglade-2.0 >= $LIBGLADE_REQUIRED
-   libgnomeui-2.0
    libebook-1.2
+   libcanberra-gtk >= 0.4
+   gstreamer-0.10
+   gstreamer-interfaces-0.10
 ])
 
+PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
+
 # -----------------------------------------------------------
 # Enable debug
 # -----------------------------------------------------------
@@ -144,7 +158,7 @@ if test "x$enable_spell" != "xno"; then
       if $PKG_CONFIG --variable=domains iso-codes | grep 639 > /dev/null && \
          $PKG_CONFIG --variable=domains iso-codes | grep 3166 > /dev/null ; then
             AC_DEFINE_UNQUOTED(ISO_CODES_PREFIX, ["`$PKG_CONFIG --variable=prefix iso-codes`"], [ISO codes prefix])
-            AC_DEFINE(HAVE_ENCHANT, 1, [Define if you have libenchant])
+            AC_DEFINE(HAVE_ENCHANT, [], [Define if you have libenchant])
             result=yes
       else
             result=no
@@ -175,7 +189,6 @@ if test "x$enable_megaphone" != "xno"; then
    [
       libpanelapplet-2.0 >= $LIBPANELAPPLET_REQUIRED
       glib-2.0 >= $GLIB_REQUIRED
-      gio-2.0 >= $GLIB_REQUIRED
       gtk+-2.0 >= $GTK_REQUIRED
       gconf-2.0 >= $GCONF_REQUIRED
       libglade-2.0 >= $LIBGLADE_REQUIRED 
@@ -204,7 +217,6 @@ if test "x$enable_nothere" != "xno"; then
    [
       libpanelapplet-2.0 >= $LIBPANELAPPLET_REQUIRED
       glib-2.0 >= $GLIB_REQUIRED
-      gio-2.0 >= $GLIB_REQUIRED
       gtk+-2.0 >= $GTK_REQUIRED
       gconf-2.0 >= $GCONF_REQUIRED
       libglade-2.0 >= $LIBGLADE_REQUIRED 
@@ -256,7 +268,6 @@ if test "x$enable_python" != "xno"; then
    [
       pygtk-2.0,
       glib-2.0 >= $GLIB_REQUIRED
-      gio-2.0 >= $GLIB_REQUIRED
       gobject-2.0
       gconf-2.0 >= $GCONF_REQUIRED
       libxml-2.0