Generate ChangeLog from svn commits. Copy generator from epiphany

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4e52101a21668f2d38c64fa5f0634ef3d7285a94..bd6df769da870de6646ab1d6c1d2cd56ec85e8db 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(Empathy, 0.15, http://bugzilla.gnome.org/browse.cgi?product=empathy)
+AC_INIT(Empathy, 0.21.4, http://bugzilla.gnome.org/browse.cgi?product=empathy)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([
   Copyright (C) 2003-2007 Imendio AB
@@ -18,12 +18,12 @@ AC_HEADER_STDC
 #   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)
 #   (Interfaces added:      CURRENT++, AGE++, REVISION=0)
 #   (No interfaces changed:                   REVISION++)
-LIBEMPATHY_CURRENT=4
-LIBEMPATHY_AGE=1
+LIBEMPATHY_CURRENT=7
+LIBEMPATHY_AGE=0
 LIBEMPATHY_REVISION=0
 
-LIBEMPATHY_GTK_CURRENT=5
-LIBEMPATHY_GTK_AGE=1
+LIBEMPATHY_GTK_CURRENT=7
+LIBEMPATHY_GTK_AGE=0
 LIBEMPATHY_GTK_REVISION=0
 
 AC_SUBST(LIBEMPATHY_CURRENT)
@@ -50,14 +50,28 @@ GTK_REQUIRED=2.12.0
 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
+TELEPATHY_REQUIRED=0.3.1
+TELEPATHY_GLIB_REQUIRED=0.7.0
+MISSION_CONTROL_REQUIRED=4.37
 
 IDT_COMPILE_WARNINGS
 
+dnl Uncomment that to build without deprecated symbols
+dnl AC_DEFINE(GTK_DISABLE_DEPRECATED, 1, [Disable deprecated GTK symbols])
+dnl AC_DEFINE(G_DISABLE_DEPRECATED, 1, [Disable deprecated GLib symbols])
+dnl AC_DEFINE(LIBTELEPATHY_DISABLE_DEPRECATED, 1, [Disable deprecated libtelepathy symbols])
+
 GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
 AC_SUBST(GLIB_GENMARSHAL)
 
+dnl -----------------------------------------------------------
+dnl SVN for ChangeLog generation
+dnl -----------------------------------------------------------
+
+AC_SUBST([SVN_ROOT],[http://svn.gnome.org/svn])
+AC_SUBST([SVN_MODULE],[empathy])
+AC_SUBST([SVN_BRANCH],["trunk"])
+
 dnl -----------------------------------------------------------
 dnl Language Support
 dnl -----------------------------------------------------------
@@ -79,6 +93,7 @@ PKG_CHECK_MODULES(LIBEMPATHY,
    gconf-2.0 >= $GCONF_REQUIRED
    libxml-2.0
    libtelepathy >= $TELEPATHY_REQUIRED
+   telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
    libmissioncontrol >= $MISSION_CONTROL_REQUIRED
 ])
 
@@ -88,10 +103,12 @@ PKG_CHECK_MODULES(EMPATHY,
    gobject-2.0
    gconf-2.0 >= $GCONF_REQUIRED
    libxml-2.0
-   gnome-vfs-2.0
    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
    libebook-1.2
 ])
@@ -270,12 +287,7 @@ 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
@@ -288,9 +300,11 @@ AC_OUTPUT([
    nothere/Makefile
    nothere/src/Makefile
    nothere/data/Makefile
-   doc/Makefile
-   doc/libempathy/Makefile
-   doc/libempathy-gtk/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