-AC_INIT(Empathy, 0.21.91, 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
# (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)
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_GLIB_REQUIRED=0.7.3
-MISSION_CONTROL_REQUIRED=4.53
+MISSION_CONTROL_REQUIRED=4.61
# 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])
-# AC_DEFINE(LIBTELEPATHY_DISABLE_DEPRECATED, 1, [Disable deprecated libtelepathy symbols])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
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
glib-2.0 >= $GLIB_REQUIRED
gobject-2.0
libxml-2.0
- libtelepathy >= $TELEPATHY_REQUIRED
telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
libmissioncontrol >= $MISSION_CONTROL_REQUIRED
])
[
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
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")
else
AC_ARG_ENABLE(nothere,
AS_HELP_STRING([--enable-nothere=@<:@no/yes/auto@:>@],
[build nothere applet]), ,
- enable_nothere=no)
+ enable_nothere=auto)
if test "x$enable_nothere" != "xno"; then
PKG_CHECK_MODULES(NOTHERE,
gtk+-2.0 >= $GTK_REQUIRED
gconf-2.0 >= $GCONF_REQUIRED
libglade-2.0 >= $LIBGLADE_REQUIRED
- libtelepathy >= $TELEPATHY_REQUIRED
libmissioncontrol >= $MISSION_CONTROL_REQUIRED
], have_nothere="yes", have_nothere="no")
else
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
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])
AM_CONDITIONAL(HAVE_VOIP, test "x$enable_voip" = "xyes")
-
-# -----------------------------------------------------------
-# Misc
-# -----------------------------------------------------------
-AC_DEFINE_UNQUOTED([UNINSTALLED_GLADE_DIR], ["`pwd`/libempathy-gtk"], [path to glade files])
-AC_DEFINE_UNQUOTED([UNINSTALLED_DTD_DIR], ["`pwd`/libempathy"], [path to dtd files])
-AC_DEFINE_UNQUOTED([UNINSTALLED_IRC_DIR], ["`pwd`/libempathy"], [path to IRC network file])
-
# -----------------------------------------------------------
AC_OUTPUT([
python/pyempathy/Makefile
python/pyempathygtk/Makefile
tests/Makefile
+ tests/xml/Makefile
tools/Makefile
])