Add x11 to build deps.

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f3fe4694560a705809f3f97d8940c07f1c967440..590d5442d139b30c3385aad70485ad8c77672031 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(Empathy, 0.14, http://bugzilla.gnome.org/browse.cgi?product=empathy)
+AC_INIT(Empathy, 0.21.3, http://bugzilla.gnome.org/browse.cgi?product=empathy)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([
   Copyright (C) 2003-2007 Imendio AB
@@ -18,13 +18,13 @@ AC_HEADER_STDC
 #   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)
 #   (Interfaces added:      CURRENT++, AGE++, REVISION=0)
 #   (No interfaces changed:                   REVISION++)
-LIBEMPATHY_CURRENT=3
+LIBEMPATHY_CURRENT=6
 LIBEMPATHY_AGE=0
 LIBEMPATHY_REVISION=0
 
-LIBEMPATHY_GTK_CURRENT=4
+LIBEMPATHY_GTK_CURRENT=6
 LIBEMPATHY_GTK_AGE=0
-LIBEMPATHY_GTK_REVISION=0
+LIBEMPATHY_GTK_REVISION=1
 
 AC_SUBST(LIBEMPATHY_CURRENT)
 AC_SUBST(LIBEMPATHY_AGE)
@@ -51,10 +51,14 @@ GCONF_REQUIRED=1.2.0
 LIBGLADE_REQUIRED=2.0.0
 LIBPANELAPPLET_REQUIRED=2.10.0
 TELEPATHY_REQUIRED=0.0.57
-MISSION_CONTROL_REQUIRED=4.33
+MISSION_CONTROL_REQUIRED=4.37
 
 IDT_COMPILE_WARNINGS
 
+dnl Uncomment that to build without deprecated GTK and GLib symbols
+dnl AC_DEFINE(GTK_DISABLE_DEPRECATED, 1, [Disable deprecated GTK symbols])
+dnl AC_DEFINE(G_DISABLE_DEPRECATED, 1, [Disable deprecated GLib symbols])
+
 GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
 AC_SUBST(GLIB_GENMARSHAL)
 
@@ -92,6 +96,7 @@ PKG_CHECK_MODULES(EMPATHY,
    libtelepathy >= $TELEPATHY_REQUIRED
    libmissioncontrol >= $MISSION_CONTROL_REQUIRED
    gtk+-2.0 >= $GTK_REQUIRED
+   x11
    libglade-2.0 >= $LIBGLADE_REQUIRED
    libebook-1.2
 ])
@@ -250,18 +255,27 @@ fi
 
 AM_CONDITIONAL(HAVE_PYTHON, test "x$have_python" = "xyes")
 
+dnl -----------------------------------------------------------
+dnl VoIP support
+dnl -----------------------------------------------------------
+AC_ARG_ENABLE(voip,
+              AS_HELP_STRING([--enable-voip=@<:@no/yes@:>@],
+                             [Add support for Voice and Video call]), ,
+                             enable_voip=no)
+
+if test "x$enable_voip" = "xyes"; then
+   AC_DEFINE(HAVE_VOIP, 1, [Define if we have voip])
+fi
+
+AM_CONDITIONAL(HAVE_VOIP, test "x$enable_voip" = "xyes")
+
 dnl -----------------------------------------------------------
 
 AC_OUTPUT([
    Makefile
    data/Makefile
    data/empathy.desktop.in
-   data/16x16/Makefile
-   data/22x22/Makefile
-   data/24x24/Makefile
-   data/32x32/Makefile
-   data/48x48/Makefile
-   data/scalable/Makefile
+   data/icons/Makefile
    po/Makefile.in
    libempathy/Makefile
    libempathy/libempathy.pc
@@ -273,9 +287,12 @@ AC_OUTPUT([
    megaphone/data/Makefile
    nothere/Makefile
    nothere/src/Makefile
-   nothere/data/Makefile   doc/Makefile
-   doc/libempathy/Makefile
-   doc/libempathy-gtk/Makefile
+   nothere/data/Makefile
+   docs/Makefile
+   docs/libempathy/Makefile
+   docs/libempathy/version.xml
+   docs/libempathy-gtk/Makefile
+   docs/libempathy-gtk/version.xml
    python/Makefile
    python/pyempathy/Makefile
    python/pyempathygtk/Makefile