Update gitignore

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5d6ee5817b92393eac972f1249a0030efd5f33eb..e604a8a8a3641e003f0670884ed79d994e289161 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(Empathy, 0.23.5, http://bugzilla.gnome.org/browse.cgi?product=empathy)
+AC_INIT(Empathy, 2.25.1, http://bugzilla.gnome.org/browse.cgi?product=empathy)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([
   Copyright (C) 2003-2007 Imendio AB
@@ -9,13 +9,13 @@ AC_COPYRIGHT([
 #   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)
 #   (Interfaces added:      CURRENT++, AGE++, REVISION=0)
 #   (No interfaces changed:                   REVISION++)
-LIBEMPATHY_CURRENT=15
-LIBEMPATHY_AGE=1
-LIBEMPATHY_REVISION=0
+LIBEMPATHY_CURRENT=16
+LIBEMPATHY_AGE=2
+LIBEMPATHY_REVISION=2
 
 LIBEMPATHY_GTK_CURRENT=15
 LIBEMPATHY_GTK_AGE=0
-LIBEMPATHY_GTK_REVISION=0
+LIBEMPATHY_GTK_REVISION=4
 
 AC_SUBST(LIBEMPATHY_CURRENT)
 AC_SUBST(LIBEMPATHY_AGE)
@@ -69,10 +69,7 @@ AC_CHECK_PROGS([XSLTPROC], [xsltproc])
 if test -z "$XSLTPROC"; then
   AC_MSG_ERROR([xsltproc (from libxslt) is required])
 fi
-AC_CHECK_PROGS([PYTHON], [python python2.3 python2.4 python2.5])
-if test -z "$PYTHON"; then
-  AC_MSG_ERROR([Python is required])
-fi
+AM_PATH_PYTHON([2.3])
 
 EMPATHY_ARG_VALGRIND
 
@@ -251,24 +248,20 @@ AC_ARG_ENABLE(python,
                              enable_python=auto)
 
 if test "x$enable_python" != "xno"; then
-   AM_PATH_PYTHON
-   if test -z "$PYTHON" ; then
-      have_python="no"
-   else
-      PKG_CHECK_MODULES(PYTHON_BINDING,
-      [
-         pygtk-2.0,
-         glib-2.0 >= $GLIB_REQUIRED
-         gobject-2.0
-         gconf-2.0 >= $GCONF_REQUIRED
-         libxml-2.0
-         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
+   PKG_CHECK_MODULES(PYTHON_BINDING,
+   [
+      pygtk-2.0,
+      glib-2.0 >= $GLIB_REQUIRED
+      gobject-2.0
+      gconf-2.0 >= $GCONF_REQUIRED
+      libxml-2.0
+      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")
+      AC_CHECK_PROGS([PYGOBJECTCODEGEN], [pygobject-codegen-2.0 pygtk-codegen-2.0])
    fi
 else
    have_python=no