Empathy should not require python-config. Fixes bug #525562 (Frederic Peters).

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 91750dbdc38340873c441b3af7294f903e05e38b..ed8a826d8a9238e0c78718184dda81affb5f3f81 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(Empathy, 0.22.0, http://bugzilla.gnome.org/browse.cgi?product=empathy)
+AC_INIT(Empathy, 0.23.1, http://bugzilla.gnome.org/browse.cgi?product=empathy)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([
   Copyright (C) 2003-2007 Imendio AB
@@ -11,11 +11,11 @@ AC_COPYRIGHT([
 #   (No interfaces changed:                   REVISION++)
 LIBEMPATHY_CURRENT=11
 LIBEMPATHY_AGE=0
-LIBEMPATHY_REVISION=0
+LIBEMPATHY_REVISION=1
 
 LIBEMPATHY_GTK_CURRENT=11
 LIBEMPATHY_GTK_AGE=0
-LIBEMPATHY_GTK_REVISION=0
+LIBEMPATHY_GTK_REVISION=1
 
 AC_SUBST(LIBEMPATHY_CURRENT)
 AC_SUBST(LIBEMPATHY_AGE)
@@ -25,12 +25,12 @@ AC_SUBST(LIBEMPATHY_GTK_AGE)
 AC_SUBST(LIBEMPATHY_GTK_REVISION)
 
 # Minimal version required
-GLIB_REQUIRED=2.14.0
+GLIB_REQUIRED=2.15.5
 GTK_REQUIRED=2.12.0
 GCONF_REQUIRED=1.2.0
 LIBGLADE_REQUIRED=2.0.0
 LIBPANELAPPLET_REQUIRED=2.10.0
-TELEPATHY_REQUIRED=0.3.1
+TELEPATHY_REQUIRED=0.3.2
 TELEPATHY_GLIB_REQUIRED=0.7.3
 MISSION_CONTROL_REQUIRED=4.53
 
@@ -68,7 +68,7 @@ AC_CHECK_PROGS([XSLTPROC], [xsltproc])
 if test -z "$XSLTPROC"; then
   AC_MSG_ERROR([xsltproc (from libxslt) is required])
 fi
-AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python])
+AC_CHECK_PROGS([PYTHON], [python python2.3 python2.4 python2.5])
 if test -z "$PYTHON"; then
   AC_MSG_ERROR([Python is required])
 fi
@@ -93,11 +93,11 @@ PKG_CHECK_MODULES(EMPATHY,
 [
    glib-2.0 >= $GLIB_REQUIRED
    gobject-2.0
+   gio-2.0 >= $GLIB_REQUIRED
    gconf-2.0 >= $GCONF_REQUIRED
    libtelepathy >= $TELEPATHY_REQUIRED
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
    libmissioncontrol >= $MISSION_CONTROL_REQUIRED
-   gnome-vfs-2.0
    gtk+-2.0 >= $GTK_REQUIRED
    x11
    libglade-2.0 >= $LIBGLADE_REQUIRED
@@ -178,7 +178,6 @@ if test "x$enable_megaphone" != "xno"; then
       gtk+-2.0 >= $GTK_REQUIRED
       gconf-2.0 >= $GCONF_REQUIRED
       libglade-2.0 >= $LIBGLADE_REQUIRED 
-      gnome-vfs-2.0
       libtelepathy >= $TELEPATHY_REQUIRED
       libmissioncontrol >= $MISSION_CONTROL_REQUIRED
    ], have_megaphone="yes", have_megaphone="no")
@@ -264,12 +263,14 @@ if test "x$enable_python" != "xno"; then
          gobject-2.0
          gconf-2.0 >= $GCONF_REQUIRED
          libxml-2.0
-         gnome-vfs-2.0
          libtelepathy >= $TELEPATHY_REQUIRED
          libmissioncontrol >= $MISSION_CONTROL_REQUIRED
          gtk+-2.0 >= $GTK_REQUIRED
          libglade-2.0 >= $LIBGLADE_REQUIRED
       ], have_python="yes", have_python="no")
+      if test "x$have_python" = "xyes" ; then
+         AM_CHECK_PYTHON_HEADERS(,have_python="no")
+      fi
    fi
 else
    have_python=no
@@ -287,7 +288,7 @@ AM_CONDITIONAL(HAVE_PYTHON, test "x$have_python" = "xyes")
 AC_ARG_ENABLE(voip,
               AS_HELP_STRING([--enable-voip=@<:@no/yes@:>@],
                              [Add support for Voice and Video call]), ,
-                             enable_voip=no)
+                             enable_voip=yes)
 
 if test "x$enable_voip" = "xyes"; then
    AC_DEFINE(HAVE_VOIP, 1, [Define if we have voip])